';
- // looking for a token already stored in db
- //try {
- // $token = $storage->retrieveAccessToken('Google');
- // $old_token=1;
- //} catch (Exception $e) {
- // $old_token=0;
- //}
- //if ($old_token==1) {
- // print '| '.$langs->trans('OldTokenStored').' | |
';
- // print ''.print_r($token,true).' |
';
- //}
- //$refreshtoken = $token->getRefreshToken();
+ //print '';
// This was a callback request from service, get the token
try {
- $apiService->requestAccessToken($_GET['code'], $state);
+ //var_dump($_GET['code']);
+ //var_dump($state);
+ //var_dump($apiService); // OAuth\OAuth2\Service\Google
+ $token = $apiService->requestAccessToken($_GET['code'], $state);
+
+ setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');
} catch (Exception $e) {
print $e->getMessage();
}
- //print ''.print_r($apiService,true).'
';
- // retrieve new token in db
- try {
- $token = $storage->retrieveAccessToken('Google');
- $new_token=1;
- } catch (Exception $e) {
- $new_token=0;
- }
- $newrefreshtoken = $token->getRefreshToken();
- if (empty($newrefreshtoken) && ! empty($refreshtoken)) {
- $token->setRefreshToken($refreshtoken);
- $storage->storeAccessToken('Google', $token);
- }
- if ($new_token==1) {
- print '| '.$langs->trans('NewTokenStored').' | |
';
- print ''.print_r($token,true).' |
';
- }
- //print ''.print_r($token,true).' | ';
- //$apiService->refreshAccessToken($token);
- //print ''.print_r($apiService,true).'
';
- //$token = $storage->retrieveAccessToken('Google');
- //print ''.print_r($token,true).' | ';
- print 'Applications associées à votre compte | ';
- print '
';
-
- dol_fiche_end();
-} else {
+ $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+ unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+
+ header('Location: ' . $backtourl);
+ exit();
+}
+else
+{
+ $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
+
$url = $apiService->getAuthorizationUri();
// we go on google authorization page
header('Location: ' . $url);
exit();
}
-llxFooter();
+
+/*
+ * View
+ */
+
+// No view at all, just actions
$db->close();
+
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 7010ec7de78..aab1ae13bb6 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -87,6 +87,8 @@ class printing_printgcp extends PrintingDriver
$this->errors[] = $e->getMessage();
$token_ok = false;
}
+ //var_dump($this->errors);exit;
+
$expire = false;
// Is token expired or will token expire in the next 30 seconds
if ($token_ok) {
@@ -116,12 +118,12 @@ class printing_printgcp extends PrintingDriver
$refreshtoken = $token->getRefreshToken();
$this->conf[] = array('varname'=>'PRINTGCP_TOKEN_REFRESH', 'info'=>((! empty($refreshtoken))?'Yes':'No'), 'type'=>'info');
$this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRED', 'info'=>($expire?'Yes':'No'), 'type'=>'info');
- $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRE_AT', 'info'=>(date("Y-m-d H:i:s", $token->getEndOfLife())), 'type'=>'info');
+ $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRE_AT', 'info'=>(dol_print_date($token->getEndOfLife(), "dayhour")), 'type'=>'info');
}
if (!$storage->hasAccessToken('Google')) {
- $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php', 'type'=>'authlink');
+ $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
} else {
- $this->conf[] = array('varname'=>'PRINTGCP_DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete', 'type'=>'delete');
+ $this->conf[] = array('varname'=>'PRINTGCP_DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
}
} else {
$this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
diff --git a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
index 2e4b9c195a2..0ce3abf39c1 100644
--- a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
+++ b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
@@ -86,6 +86,10 @@ class DoliStorage implements TokenStorageInterface
*/
public function storeAccessToken($service, TokenInterface $token)
{
+ //var_dump("storeAccessToken");
+ //var_dump($token);
+ dol_syslog("storeAccessToken");
+
$serializedToken = serialize($token);
$this->tokens[$service] = $token;
@@ -95,6 +99,10 @@ class DoliStorage implements TokenStorageInterface
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_token";
$sql.= " WHERE service='".$service."' AND entity=1";
$resql = $this->db->query($sql);
+ if (! $resql)
+ {
+ dol_print_error($this->db);
+ }
$obj = $this->db->fetch_array($resql);
if ($obj) {
// update
@@ -108,7 +116,8 @@ class DoliStorage implements TokenStorageInterface
$sql.= " VALUES ('".$service."', '".$this->db->escape($serializedToken)."', 1)";
$resql = $this->db->query($sql);
}
-
+ //print $sql;
+
// allow chaining
return $this;
}
@@ -122,8 +131,13 @@ class DoliStorage implements TokenStorageInterface
$sql = "SELECT token FROM ".MAIN_DB_PREFIX."oauth_token";
$sql.= " WHERE service='".$service."'";
$resql = $this->db->query($sql);
+ if (! $resql)
+ {
+ dol_print_error($this->db);
+ }
$result = $this->db->fetch_array($resql);
- $token = unserialize($result[token]);
+ $token = unserialize($result['token']);
+
$this->tokens[$service] = $token;
return is_array($this->tokens)
@@ -194,6 +208,10 @@ class DoliStorage implements TokenStorageInterface
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_state";
$sql.= " WHERE service='".$service."' AND entity=1";
$resql = $this->db->query($sql);
+ if (! $resql)
+ {
+ dol_print_error($this->db);
+ }
$obj = $this->db->fetch_array($resql);
if ($obj) {
// update
diff --git a/htdocs/langs/en_US/oauth.lang b/htdocs/langs/en_US/oauth.lang
index ef58d605c49..4567af2a0b6 100644
--- a/htdocs/langs/en_US/oauth.lang
+++ b/htdocs/langs/en_US/oauth.lang
@@ -1,7 +1,11 @@
# Dolibarr language file - Source file is en_US - oauth
ConfigOAuth=Oauth Configuration
NoAccessToken=No token access saved.
+HasAccessToken=A token was generated and saved into database
+NewTokenStored=Token received ans saved
+TokenDeleted=Token deleted
UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
+ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules than need OAuth2 authentication.
OAUTH_AMAZON_NAME=Api Amazon
OAUTH_AMAZON_ID=Api Amazon Id
OAUTH_AMAZON_SECRET=Api Amazon Secret
diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index a4f9fe09e04..fa154976603 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -20,11 +20,13 @@ UserConf=Setup per user
PRINTGCP=Google Cloud Print
PRINTGCP_INFO=Google Api State
PRINTGCP_AUTHLINK=Authentication
-PRINTGCP_TOKEN_ACCESS=Google Cloud Print Token
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
PRINTGCP_TOKEN_REFRESH=Token Refresh Present
PRINTGCP_TOKEN_EXPIRED=Token Expired
PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-RequestAccess=Request Access
+PRINTGCP_DELETE_TOKEN=Delete saved token
+RequestAccess=Click here to request access and receive a token to save
+DeleteAccess=Click here to delete token
PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
PrintTestDescprintgcp=List of Printers for Google Cloud Print.
@@ -83,4 +85,4 @@ MEDIA_IPP_thermal=Thermal
IPP_COLOR_print-black=BW Printer
DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials found.
\ No newline at end of file
+GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
\ No newline at end of file
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index ac6f030ae16..ce87a5c7178 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -137,7 +137,8 @@ if ($mode == 'setup' && $user->admin)
$classname = 'printing_'.$driver;
$langs->load($driver);
$printer = new $classname($db);
- //print ''.print_r($printer, true).'
';
+ //var_dump($printer);
+
$i=0;
$submit_enabled=0;
foreach ($printer->conf as $key)
@@ -157,14 +158,14 @@ if ($mode == 'setup' && $user->admin)
case "authlink":
print '';
print '| '.$langs->trans($key['varname']).' | ';
- print ''.$langs->trans('RequestAccess').' | ';
+ print ''.$langs->trans('RequestAccess').' | ';
print ' | ';
print '
'."\n";
break;
case "delete":
print '';
print '| '.$langs->trans($key['varname']).' | ';
- print ''.$langs->trans('DeleteAccess').' | ';
+ print ''.$langs->trans('DeleteAccess').' | ';
print ' | ';
print '
'."\n";
break;