Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
vtigercrm
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
Welcome to Vtiger Community. To gain access for account, please contact [ community @ vtiger.com ]
Show more breadcrumbs
Daniel Lennartz
vtigercrm
Commits
04ea3b64
Commit
04ea3b64
authored
7 years ago
by
Satish
Browse files
Options
Downloads
Patches
Plain Diff
Google sync throwing error to login
parent
2d7a178e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pkg/vtiger/modules/Google/modules/Google/connectors/Config.php
+11
-8
11 additions, 8 deletions
...tiger/modules/Google/modules/Google/connectors/Config.php
pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php
+8
-8
8 additions, 8 deletions
...tiger/modules/Google/modules/Google/connectors/Oauth2.php
with
19 additions
and
16 deletions
pkg/vtiger/modules/Google/modules/Google/connectors/Config.php
+
11
−
8
View file @
04ea3b64
<?php
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
/* +**********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.1
* ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
* ***********************************************************************************/
Class
Google_Config_Connector
{
static
$clientId
=
''
;
static
$clientSecret
=
''
;
static
$clientId
=
''
;
static
$clientSecret
=
''
;
static
$redirectUrl
=
''
;
}
This diff is collapsed.
Click to expand it.
pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php
+
8
−
8
View file @
04ea3b64
...
...
@@ -54,14 +54,14 @@ class Google_Oauth2_Connector {
const
OAUTH2_REVOKE_URI
=
'https://accounts.google.com/o/oauth2/revoke'
;
public
function
__construct
(
$module
,
$userId
=
false
)
{
global
$site_URL
;
$this
->
source_module
=
$module
;
if
(
$userId
)
$this
->
user_id
=
$userId
;
$this
->
service_name
=
$this
->
service_provider
.
$module
;
$this
->
client_id
=
Google_Config_Connector
::
$clientId
;
$this
->
client_secret
=
Google_Config_Connector
::
$clientSecret
;
$this
->
redirect_uri
=
rtrim
(
$site_URL
,
'/'
)
.
'/index.php?module=Google&view=List&operation=sync&sourcemodule='
.
$this
->
source_module
.
'&service='
.
$this
->
service_name
;
$this
->
scope
=
$this
->
scopes
[
$this
->
source_module
];
global
$site_URL
;
$this
->
source_module
=
$module
;
if
(
$userId
)
$this
->
user_id
=
$userId
;
$this
->
service_name
=
$this
->
service_provider
.
$module
;
$this
->
client_id
=
Google_Config_Connector
::
$clientId
;
$this
->
client_secret
=
Google_Config_Connector
::
$clientSecret
;
$this
->
redirect_uri
=
Google_Config_Connector
::
$redirectUrl
;
$this
->
scope
=
$this
->
scopes
[
$this
->
source_module
];
}
public
function
getClientId
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment