Skip to content

Commit

Permalink
Merge branch 'release/1.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Dec 14, 2021
2 parents 177c956 + 2092dce commit 824dfd0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion inc/application.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ public function redirectToAuthorizationUrl(?callable $callback_callable = null,
$options['prompt'] = 'login';
break;
case Google::class:
$options['prompt'] = 'select_account';
$options['prompt'] = 'consent select_account';
break;
}

Expand Down
1 change: 1 addition & 0 deletions inc/authorization.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ public function createFromCode(int $application_id, string $code): bool {
$application->getForeignKeyField() => $application_id,
'code' => $code,
'token' => json_encode($token->jsonSerialize()),
'refresh_token' => $token->getRefreshToken(),
'email' => $email,
];

Expand Down
5 changes: 5 additions & 0 deletions oauthimap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ It permits emails fetching from G Suite and Azure AD mailboxes.
<author>TECLIB'</author>
</authors>
<versions>
<version>
<num>1.3.2</num>
<compatibility>~9.5.0</compatibility>
<download_url>https://github.com/pluginsGLPI/oauthimap/releases/download/1.3.2/glpi-oauthimap-1.3.2.tar.bz2</download_url>
</version>
<version>
<num>1.3.1</num>
<compatibility>~9.5.0</compatibility>
Expand Down
2 changes: 1 addition & 1 deletion setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
--------------------------------------------------------------------------
*/

define('PLUGIN_OAUTHIMAP_VERSION', '1.3.1');
define('PLUGIN_OAUTHIMAP_VERSION', '1.3.2');

// Minimal GLPI version, inclusive
define('PLUGIN_OAUTHIMAP_MIN_GLPI', '9.5');
Expand Down

0 comments on commit 824dfd0

Please sign in to comment.