Merge branch 'release/1.3.1'

pluginsGLPI · Dec 13, 2021 · 177c956 · 177c956
2 parents 6315563 + bb1ed07
commit 177c956
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/inc/authorization.class.php b/inc/authorization.class.php
@@ -339,7 +339,7 @@ function prepareInputForAdd($input) {
    function prepareInputForUpdate($input) {
       // Unset encrypted fields input if corresponding to current value
       // (encryption produces a different value each time, so GLPI will consider them as updated on each form submit)
-      foreach (['code', 'token'] as $field_name) {
+      foreach (['code', 'token', 'refresh_token'] as $field_name) {
          if (array_key_exists($field_name, $input)
              && !empty($input[$field_name]) && $input[$field_name] !== 'NULL'
              && $input[$field_name] === Toolbox::sodiumDecrypt($this->fields[$field_name])) {
@@ -361,7 +361,7 @@ function prepareInputForUpdate($input) {
     * @return bool|array
     */
    private function prepareInput($input) {
-      foreach (['code', 'token'] as $field_name) {
+      foreach (['code', 'token', 'refresh_token'] as $field_name) {
          if (array_key_exists($field_name, $input)
              && !empty($input[$field_name]) && $input[$field_name] !== 'NULL') {
             $input[$field_name] = Toolbox::sodiumEncrypt($input[$field_name]);
@@ -454,14 +454,26 @@ public static function getAccessTokenForApplicationAndEmail($application_id, $em
 
       if ($token->hasExpired()) {
          // Token has expired, refresh it
+         $refresh_token = Toolbox::sodiumDecrypt($self->fields['refresh_token']);
+
          $provider = $application->getProvider();
          $token = $provider->getAccessToken(
             'refresh_token',
             [
-               'refresh_token' => $token->getRefreshToken(),
+               'refresh_token' => $refresh_token,
             ]
          );
-         $self->update(['id' => $self->fields['id'], 'token' => json_encode($token->jsonSerialize())]);
+
+         $input = [
+            'id' => $self->fields['id'],
+            'token' => json_encode($token->jsonSerialize())
+         ];
+         if (!empty($token->getRefreshToken()) && $token->getRefreshToken() !== $refresh_token) {
+            // Update refresh token if a new one has been received in response.
+            $input['refresh_token'] = $token->getRefreshToken();
+         }
+
+         $self->update($input);
       }
 
       return $token->getToken();
@@ -519,6 +531,7 @@ public static function install(Migration $migration) {
                       `$application_fkey` int(11) NOT NULL DEFAULT '0',
                       `code` text COLLATE utf8_unicode_ci,
                       `token` text COLLATE utf8_unicode_ci,
+                      `refresh_token` text COLLATE utf8_unicode_ci,
                       `email` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
                       `date_creation` timestamp NULL DEFAULT NULL,
                       `date_mod` timestamp NULL DEFAULT NULL,
@@ -529,6 +542,38 @@ public static function install(Migration $migration) {
                       UNIQUE KEY `unicity` (`$application_fkey`,`email`)
                       ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
          $DB->query($query) or die($DB->error());
+      } else {
+         if (!$DB->fieldExists($table, 'refresh_token')) {
+            // V1.3.1: add new refresh_token field
+            $migration->addField(
+               $table,
+               'refresh_token',
+               'text',
+               [
+                  'after'     => 'token',
+                  'nodefault' => true,
+               ]
+            );
+
+            $iterator = $DB->request(['FROM' => $table]);
+            foreach ($iterator as $row) {
+               $token_fields = json_decode(Toolbox::sodiumDecrypt($row['token']), true);
+               if (isset($token_fields['refresh_token'])) {
+                  $migration->addPostQuery(
+                     $DB->buildUpdate(
+                        $table,
+                        [
+                           'refresh_token' => Toolbox::sodiumEncrypt($token_fields['refresh_token']),
+                        ],
+                        [
+                           'id'            => $row['id']
+                        ]
+                     )
+                  );
+               }
+            }
+         }
+
       }
    }
 

diff --git a/oauthimap.xml b/oauthimap.xml
@@ -27,6 +27,11 @@ It permits emails fetching from G Suite and Azure AD mailboxes.
       <author>TECLIB'</author>
    </authors>
    <versions>
+      <version>
+          <num>1.3.1</num>
+          <compatibility>~9.5.0</compatibility>
+          <download_url>https://github.com/pluginsGLPI/oauthimap/releases/download/1.3.1/glpi-oauthimap-1.3.1.tar.bz2</download_url>
+      </version>
       <version>
           <num>1.3.0</num>
           <compatibility>~9.5.0</compatibility>

diff --git a/setup.php b/setup.php
@@ -24,7 +24,7 @@
  --------------------------------------------------------------------------
  */
 
-define('PLUGIN_OAUTHIMAP_VERSION', '1.3.0');
+define('PLUGIN_OAUTHIMAP_VERSION', '1.3.1');
 
 // Minimal GLPI version, inclusive
 define('PLUGIN_OAUTHIMAP_MIN_GLPI', '9.5');
@@ -55,8 +55,9 @@ function plugin_init_oauthimap() {
       // Secured fields that are encrypted
       $PLUGIN_HOOKS['secured_fields']['oauthimap'] = [
          PluginOauthimapApplication::getTableField('client_secret'),
-         PluginOauthimapApplication::getTableField('code'),
-         PluginOauthimapApplication::getTableField('token'),
+         PluginOauthimapAuthorization::getTableField('code'),
+         PluginOauthimapAuthorization::getTableField('token'),
+         PluginOauthimapAuthorization::getTableField('refresh_token'),
       ];
 
       // MailCollector hooks