Merge remote-tracking branch 'origin/support/2.7' into support/3.0

# Conflicts:
#	composer.lock
#	core/log.class.inc.php
#	datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
#	lib/composer/autoload_real.php
#	setup/licenses/community-licenses.xml
#	setup/setuputils.class.inc.php

CONTRIBUTING.md

@@ -111,9 +111,9 @@ Our tests are located in the `test/` directory, containing a PHPUnit config file
 * Use the present tense ("Add feature" not "Added feature")
 * Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
 * Limit the first line to 72 characters or less
-* Please start the commit message with an applicable emoji code (following the [Gitmoji guide](https://gitmoji.carloscuesta.me/)).  
+* Please start the commit message with an applicable emoji code (following the [Gitmoji guide](https://gitmoji.dev/)).  
- Beware to use the code (for example `:bug:`) and not the character (🐛) as Unicode support in git clients is very poor for now...  
+  Beware to use the code (for example `:bug:`) and not the character (🐛) as Unicode support in git clients is very poor for now...  
- Emoji examples :
+  Emoji examples :
     * 🌐 `:globe_with_meridians:` for translations
     * 🎨 `:art:` when improving the format/structure of the code
     * ⚡️ `:zap:` when improving performance

composer.json

@@ -1,6 +1,8 @@
 {
+  "name": "combodo/itop",
+  "description": "IT Operations Portal",
   "type": "project",
-  "license": "AGPLv3",
+  "license": "AGPL-3.0-or-later",
   "require": {
     "php": ">=7.1.3 <8.0.0",
     "ext-ctype": "*",

core/asynctask.class.inc.php

@@ -293,7 +293,7 @@ abstract class AsyncTask extends DBObject
 			$this->Set('remaining_retries', $this->GetMaxRetries($iErrorCode));
 		}
 
-		$this->Set('last_error', $sErrorMessage);
+		$this->SetTrim('last_error', $sErrorMessage);
 		$this->Set('last_error_code', $iErrorCode); // Note: can be ZERO !!!
 		$this->Set('last_attempt', time());
 

core/config.class.inc.php

@@ -530,7 +530,7 @@ class Config
 		],
 		'email_transport' => [
 			'type' => 'string',
-			'description' => 'Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocol)',
+			'description' => 'Mean to send emails: PHPMail (uses the function mail()), SMTP (implements the client protocol) or SMTP_OAuth (connect to the server using OAuth 2.0)',
 			'default' => "PHPMail",
 			'value' => "PHPMail",
 			'source_of_value' => '',

datamodels/2.x/itop-oauth-client/README.md

@@ -1,2 +1,5 @@
 # Extension OAuth 2.0 client
 
+## GMail
+
+If the account is in test, after 7 days the tokens are no longer valid, you have to renew the tokens manually.

datamodels/2.x/itop-oauth-client/ajax.php

@@ -17,8 +17,7 @@ if (version_compare(ITOP_DESIGN_LATEST_VERSION , '3.0') >= 0) {
 }
 
 $oUpdateController = new AjaxOauthClientController($sTemplates, 'itop-oauth-client');
-$oUpdateController->AllowOnlyAdmin();
+$oUpdateController->SetMenuId('OAuthClient');
-$oUpdateController->SetDefaultOperation('CreateMailbox');
 $oUpdateController->HandleOperation();
 
 

datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml

@@ -5,7 +5,7 @@
     <class id="OAuthClient" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
-        <category>cloud,searchable</category>
+        <category>grant_by_profile,application</category>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>priv_oauth_client</db_table>
@@ -119,22 +119,21 @@
           <access>public</access>
           <type>Overload-DBObject</type>
           <code><![CDATA[
-      public function DisplayBareHeader(WebPage $oPage, $bEditMode = false)
+  public function DisplayBareHeader(WebPage $oPage, $bEditMode = false)
-      {
+  {
-            parent::DisplayBareHeader($oPage, $bEditMode);
+        parent::DisplayBareHeader($oPage, $bEditMode);
-            if (!$bEditMode) {
+        if (!$bEditMode) {
-              $oConfig = utils::GetConfig();
+          $oConfig = utils::GetConfig();
-              $sScope = $this->Get('scope');
+          if ($this->Get('status') == 'inactive') {
-              if ($this->Get('status') == 'inactive') {
+            $oPage->p('<b>'.Dict::S('itop-oauth-client:Message:MissingToken').'</b>');
-                $oPage->p('<b>'.Dict::S('itop-oauth-client:Message:MissingToken').'</b>');
+          } elseif ($this->Get('used_for_smtp') == 'yes' && $oConfig->Get('email_transport_smtp.username') == $this->Get('name')) {
-              } elseif (($sScope == 'SMTP' || $sScope == 'EMail') && $oConfig->Get('email_transport_smtp.username') == $this->Get('name')) {
+            $sLabel = Dict::S('itop-oauth-client:UsedForSMTP');
-                $sLabel = Dict::S('itop-oauth-client:UsedForSMTP');
+            $sTestLabel = Dict::S('itop-oauth-client:TestSMTP');
-                $sTestLabel = Dict::S('itop-oauth-client:TestSMTP');
+            $sTestURL = utils::GetAbsoluteUrlAppRoot().'setup/email.test.php';
-                $sTestURL = utils::GetAbsoluteUrlAppRoot().'setup/email.test.php';
+            $oPage->p("<b>$sLabel</b>&nbsp;<a href='$sTestURL' target='_blank'>$sTestLabel</a>");
-                $oPage->p("<b>$sLabel</b>&nbsp;<a href='$sTestURL' target='_blank'>$sTestLabel</a>");
+          }
-              }
+        }
-            }
+   }
-       }
         ]]></code>
         </method>
         <method id="GetAttributeFlags">
@@ -142,14 +141,14 @@
           <access>public</access>
           <type>Overload-DBObject</type>
           <code><![CDATA[
-     	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+  public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-      {
+  {
-        if ($sAttCode == 'status') {
+    if ($sAttCode == 'status') {
-          return OPT_ATT_READONLY;
+      return OPT_ATT_READONLY;
-        }
+    }
 
-        return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
+    return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-      }
+  }
         ]]></code>
         </method>
         <method id="GetInitialStateAttributeFlags">
@@ -157,68 +156,68 @@
           <access>public</access>
           <type>Overload-DBObject</type>
           <code><![CDATA[
-      public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = array())
+  public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = array())
-      {
+  {
-        if ($sAttCode == 'status') {
+    if ($sAttCode == 'status') {
-          return OPT_ATT_READONLY;
+      return OPT_ATT_READONLY;
-        }
+    }
 
-        return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
+    return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
-      }
+  }
         ]]></code>
         </method>
         <method id="GetDefaultMailServer">
           <static>false</static>
           <access>public</access>
           <code><![CDATA[
-            public function GetDefaultMailServer()
+  public function GetDefaultMailServer()
-            {
+  {
-                return 'imap.'.$this->Get('provider').'.com';
+      return 'imap.'.$this->Get('provider').'.com';
-            }
+  }
             ]]></code>
         </method>
         <method id="GetDefaultMailServerPort">
           <static>false</static>
           <access>public</access>
           <code><![CDATA[
-            public function GetDefaultMailServerPort()
+  public function GetDefaultMailServerPort()
-            {
+  {
-                return 993;
+      return 993;
-            }
+  }
             ]]></code>
         </method>
         <method id="GetAccessToken">
           <static>false</static>
           <access>public</access>
           <code><![CDATA[
-            public function GetAccessToken()
+    public function GetAccessToken()
-            {
+    {
-                if ($this->Get('status') == 'active') {
+        if ($this->Get('status') == 'active') {
-                  return new \League\OAuth2\Client\Token\AccessToken([
+          return new \League\OAuth2\Client\Token\AccessToken([
-                    'access_token'  => $this->Get('token'),
+            'access_token'  => $this->Get('token'),
-                    'expires_in'    => date_format(new DateTime($this->Get('token_expiration')), 'U') - time(),
+            'expires_in'    => date_format(new DateTime($this->Get('token_expiration')), 'U') - time(),
-                    'refresh_token' => $this->Get('refresh_token'),
+            'refresh_token' => $this->Get('refresh_token'),
-                    'token_type'    => 'Bearer',
+            'token_type'    => 'Bearer',
-                  ]);
+          ]);
-                }
+        }
-                return null;
+        return null;
-            }
+    }
             ]]></code>
         </method>
         <method id="SetAccessToken">
           <static>false</static>
           <access>public</access>
           <code><![CDATA[
-            public function SetAccessToken(\League\OAuth2\Client\Token\AccessTokenInterface $oAccessToken)
+    public function SetAccessToken(\League\OAuth2\Client\Token\AccessTokenInterface $oAccessToken)
-            {
+    {
-                $this->Set('token', $oAccessToken->getToken());
+        $this->Set('token', $oAccessToken->getToken());
-                $this->Set('token_expiration', date(AttributeDateTime::GetSQLFormat(), $oAccessToken->getExpires()));
+        $this->Set('token_expiration', date(AttributeDateTime::GetSQLFormat(), $oAccessToken->getExpires()));
-                if (!empty($oAccessToken->getRefreshToken())) {
+        if (!empty($oAccessToken->getRefreshToken())) {
-                    $this->Set('refresh_token', $oAccessToken->getRefreshToken());
+            $this->Set('refresh_token', $oAccessToken->getRefreshToken());
-                }
+        }
-                $this->Set('status', 'active');
+        $this->Set('status', 'active');
-                $this->DBUpdate();
+        $this->DBUpdate();
-            }
+    }
             ]]></code>
         </method>
       </methods>
@@ -280,6 +279,606 @@
         </default_search>
       </presentation>
     </class>
+    <class id="OAuthClientAzure" _delta="define">
+      <parent>OAuthClient</parent>
+      <properties>
+        <category>grant_by_profile,application</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>priv_oauth_client_azure</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="provider"/>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <display_template/>
+        <icon/>
+        <reconciliation>
+          <attributes>
+            <attribute id="provider"/>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+        <uniqueness_rules>
+          <rule id="server">
+            <attributes>
+              <attribute id="provider"/>
+              <attribute id="client_id"/>
+              <attribute id="client_secret"/>
+            </attributes>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
+      </properties>
+      <fields>
+        <field id="scope" xsi:type="AttributeEnumSet">
+          <always_load_in_tables>true</always_load_in_tables>
+          <values>
+            <value id="SMTP">SMTP</value>
+            <value id="IMAP">IMAP</value>
+          </values>
+          <sql>scope</sql>
+          <default_value>SMTP,IMAP</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="advanced_scope" xsi:type="AttributeString">
+          <sql>advanced_scope</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="used_scope" xsi:type="AttributeEnum">
+          <always_load_in_tables>true</always_load_in_tables>
+          <values>
+            <value id="simple">simple</value>
+            <value id="advanced">advanced</value>
+          </values>
+          <sql>used_scope</sql>
+          <default_value>simple</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <dependencies>
+            <attribute id="scope"/>
+            <attribute id="advanced_scope"/>
+          </dependencies>
+        </field>
+        <field id="used_for_smtp" xsi:type="AttributeEnum">
+          <always_load_in_tables>true</always_load_in_tables>
+          <values>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
+          </values>
+          <sql>used_for_smtp</sql>
+          <default_value>no</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="col:col1">
+              <rank>10</rank>
+              <items>
+                <item id="fieldset:OAuthClient:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="status">
+                      <rank>20</rank>
+                    </item>
+                    <item id="description">
+                      <rank>30</rank>
+                    </item>
+                    <item id="provider">
+                      <rank>40</rank>
+                    </item>
+                    <item id="redirect_url">
+                      <rank>50</rank>
+                    </item>
+                    <item id="client_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="client_secret">
+                      <rank>70</rank>
+                    </item>
+                    <item id="mailbox_list">
+                      <rank>80</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <rank>20</rank>
+              <items>
+                <item id="fieldset:OAuthClient:scope">
+                  <rank>10</rank>
+                  <items>
+                    <item id="used_scope">
+                      <rank>10</rank>
+                    </item>
+                    <item id="scope">
+                      <rank>20</rank>
+                    </item>
+                    <item id="advanced_scope">
+                      <rank>30</rank>
+                    </item>
+                    <item id="used_for_smtp">
+                      <rank>40</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+          </items>
+        </details>
+        <list>
+          <items>
+            <item id="provider">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+        <standard_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="provider">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>10</rank>
+            </item>
+          </items>
+        </standard_search>
+      </presentation>
+      <methods>
+        <method id="PrefillCreationForm">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
+  public function PrefillCreationForm(&$aContextParam)
+  {
+    $this->Set('provider', 'Azure');
+    $this->Set('redirect_url', Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory::GetRedirectUri());
+    $this->Set('scope', 'SMTP, IMAP');
+
+    parent::PrefillCreationForm($aContextParam);
+  }
+            ]]></code>
+        </method>
+        <method id="DoCheckToWrite">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	public function DoCheckToWrite()
+	{
+		parent::DoCheckToWrite();
+
+		$aChanges = $this->ListChanges();
+		if (array_key_exists('name', $aChanges) || array_key_exists('used_for_smtp', $aChanges))
+		{
+			$sNewName = $this->Get('name');
+			$sNewUseForSMTP = $this->Get('used_for_smtp');
+			if ($sNewUseForSMTP == 'yes') {
+        $oSearch = DBObjectSearch::FromOQL_AllData("SELECT OAuthClientGoogle WHERE name = :newname AND used_for_smtp = :newuseforsmtp AND id != :id UNION SELECT OAuthClientAzure WHERE name = :newname AND used_for_smtp = :newuseforsmtp AND id != :id");
+        $oSet = new DBObjectSet($oSearch, array(), ['id' => $this->GetKey(), 'newname' => $sNewName, 'newuseforsmtp' => $sNewUseForSMTP]);
+        if ($oSet->Count() > 0)
+        {
+            $this->m_aCheckIssues[] = Dict::Format('OAuthClient:Name/UseForSMTPMustBeUnique', $sNewName, $sNewUseForSMTP);
+        }
+			}
+		}
+	}	]]></code>
+        </method>
+        <method id="ComputeValues">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
+  public function ComputeValues()
+  {
+    parent::ComputeValues();
+    if (empty($this->Get('provider'))) {
+      $this->Set('provider', 'Azure');
+    }
+    if (empty($this->Get('redirect_url'))) {
+      $this->Set('redirect_url', Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory::GetRedirectUri());
+    }
+    if (empty($this->Get('advanced_scope'))) {
+		    $this->Set('used_scope', 'simple');
+		    if (count($this->Get('scope')->GetValues()) == 0) {
+			      $this->Set('scope', 'SMTP, IMAP');
+		    }
+		} else {
+		    $this->Set('used_scope', 'advanced');
+		    $this->Set('scope', '');
+		}
+  }
+            ]]></code>
+        </method>
+        <method id="GetAttributeFlags">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
+  public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+  {
+    switch ($sAttCode) {
+        case 'provider':
+        case 'redirect_url':
+        case 'used_scope':
+            return OPT_ATT_READONLY;
+    }
+
+    return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
+  }
+            ]]></code>
+        </method>
+        <method id="GetInitialStateAttributeFlags">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
+  public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = array())
+  {
+    switch ($sAttCode) {
+        case 'provider':
+        case 'redirect_url':
+        case 'used_scope':
+            return OPT_ATT_READONLY;
+    }
+
+    return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
+  }
+            ]]></code>
+        </method>
+        <method id="GetDefaultMailServer">
+          <static>false</static>
+          <access>public</access>
+          <code><![CDATA[
+  public function GetDefaultMailServer()
+  {
+    return 'outlook.office365.com';
+  }
+            ]]></code>
+        </method>
+        <method id="GetScope">
+          <static>false</static>
+          <access>public</access>
+          <code><![CDATA[
+  public function GetScope()
+  {
+    if (!empty($this->Get('advanced_scope'))) {
+        return $this->Get('advanced_scope');
+    }
+    $aScopes = $this->Get('scope')->GetValues();
+    $aRawScopes = ['offline_access'];
+    foreach ($aScopes as $sScope) {
+        switch ($sScope) {
+            case 'SMTP':
+                $aRawScopes[] = 'https://outlook.office.com/SMTP.Send';
+                break;
+
+            case 'IMAP':
+                $aRawScopes[] = 'https://outlook.office.com/IMAP.AccessAsUser.All';
+                break;
+        }
+    }
+    return implode(' ', $aRawScopes);
+  }
+            ]]></code>
+        </method>
+      </methods>
+    </class>
+    <class id="OAuthClientGoogle" _delta="define">
+      <parent>OAuthClient</parent>
+      <properties>
+        <category>grant_by_profile,application</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>priv_oauth_client_google</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="provider"/>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <display_template/>
+        <icon/>
+        <reconciliation>
+          <attributes>
+            <attribute id="provider"/>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+        <uniqueness_rules>
+          <rule id="server">
+            <attributes>
+              <attribute id="provider"/>
+              <attribute id="client_id"/>
+              <attribute id="client_secret"/>
+            </attributes>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
+      </properties>
+      <fields>
+        <field id="scope" xsi:type="AttributeEnumSet">
+          <always_load_in_tables>true</always_load_in_tables>
+          <values>
+            <value id="SMTP">SMTP</value>
+            <value id="IMAP">IMAP</value>
+          </values>
+          <sql>scope</sql>
+          <default_value>SMTP,IMAP</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="advanced_scope" xsi:type="AttributeString">
+          <sql>advanced_scope</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="used_scope" xsi:type="AttributeEnum">
+          <always_load_in_tables>true</always_load_in_tables>
+          <values>
+            <value id="simple">simple</value>
+            <value id="advanced">advanced</value>
+          </values>
+          <sql>used_scope</sql>
+          <default_value>simple</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <dependencies>
+            <attribute id="scope"/>
+            <attribute id="advanced_scope"/>
+          </dependencies>
+        </field>
+        <field id="used_for_smtp" xsi:type="AttributeEnum">
+          <always_load_in_tables>true</always_load_in_tables>
+          <values>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
+          </values>
+          <sql>used_for_smtp</sql>
+          <default_value>no</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="col:col1">
+              <rank>10</rank>
+              <items>
+                <item id="fieldset:OAuthClient:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="status">
+                      <rank>20</rank>
+                    </item>
+                    <item id="description">
+                      <rank>30</rank>
+                    </item>
+                    <item id="provider">
+                      <rank>40</rank>
+                    </item>
+                    <item id="redirect_url">
+                      <rank>50</rank>
+                    </item>
+                    <item id="client_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="client_secret">
+                      <rank>70</rank>
+                    </item>
+                    <item id="mailbox_list">
+                      <rank>80</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <rank>20</rank>
+              <items>
+                <item id="fieldset:OAuthClient:scope">
+                  <rank>10</rank>
+                  <items>
+                    <item id="used_scope">
+                      <rank>10</rank>
+                    </item>
+                    <item id="scope">
+                      <rank>20</rank>
+                    </item>
+                    <item id="advanced_scope">
+                      <rank>30</rank>
+                    </item>
+                    <item id="used_for_smtp">
+                      <rank>40</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+          </items>
+        </details>
+        <list>
+          <items>
+            <item id="provider">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+        <standard_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="provider">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>10</rank>
+            </item>
+          </items>
+        </standard_search>
+      </presentation>
+      <methods>
+        <method id="PrefillCreationForm">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
+	public function PrefillCreationForm(&$aContextParam)
+	{
+		$this->Set('provider', 'Google');
+		$this->Set('redirect_url', Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory::GetRedirectUri());
+    $this->Set('scope', 'SMTP, IMAP');
+
+		parent::PrefillCreationForm($aContextParam);
+	}
+            ]]></code>
+        </method>
+        <method id="DoCheckToWrite">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	public function DoCheckToWrite()
+	{
+		parent::DoCheckToWrite();
+
+		$aChanges = $this->ListChanges();
+		if (array_key_exists('name', $aChanges) || array_key_exists('used_for_smtp', $aChanges))
+		{
+			$sNewName = $this->Get('name');
+			$sNewUseForSMTP = $this->Get('used_for_smtp');
+			if ($sNewUseForSMTP == 'yes') {
+        $oSearch = DBObjectSearch::FromOQL_AllData("SELECT OAuthClientGoogle WHERE name = :newname AND used_for_smtp = :newuseforsmtp AND id != :id UNION SELECT OAuthClientAzure WHERE name = :newname AND used_for_smtp = :newuseforsmtp AND id != :id");
+        $oSet = new DBObjectSet($oSearch, array(), ['id' => $this->GetKey(), 'newname' => $sNewName, 'newuseforsmtp' => $sNewUseForSMTP]);
+        if ($oSet->Count() > 0)
+        {
+            $this->m_aCheckIssues[] = Dict::Format('OAuthClient:Name/UseForSMTPMustBeUnique', $sNewName, $sNewUseForSMTP);
+        }
+			}
+		}
+	}	]]></code>
+        </method>
+        <method id="ComputeValues">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
+	public function ComputeValues()
+	{
+		parent::ComputeValues();
+		if (empty($this->Get('provider'))) {
+			$this->Set('provider', 'Google');
+		}
+		if (empty($this->Get('redirect_url'))) {
+			$this->Set('redirect_url', Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory::GetRedirectUri());
+		}
+		if (empty($this->Get('advanced_scope'))) {
+		    $this->Set('used_scope', 'simple');
+		    if (count($this->Get('scope')->GetValues()) == 0) {
+			      $this->Set('scope', 'SMTP, IMAP');
+		    }
+		} else {
+		    $this->Set('used_scope', 'advanced');
+		    $this->Set('scope', '');
+		}
+	}
+            ]]></code>
+        </method>
+        <method id="GetAttributeFlags">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
+	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	{
+    switch ($sAttCode) {
+        case 'provider':
+        case 'redirect_url':
+        case 'used_scope':
+            return OPT_ATT_READONLY;
+    }
+
+		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
+	}
+            ]]></code>
+        </method>
+        <method id="GetInitialStateAttributeFlags">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
+	public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = array())
+	{
+    switch ($sAttCode) {
+        case 'provider':
+        case 'redirect_url':
+        case 'used_scope':
+            return OPT_ATT_READONLY;
+    }
+
+		return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
+	}
+            ]]></code>
+        </method>
+        <method id="GetDefaultMailServer">
+          <static>false</static>
+          <access>public</access>
+          <code><![CDATA[
+	public function GetDefaultMailServer()
+	{
+		return 'imap.gmail.com';
+	}
+            ]]></code>
+        </method>
+        <method id="GetScope">
+          <static>false</static>
+          <access>public</access>
+          <code><![CDATA[
+  public function GetScope()
+  {
+    if (!empty($this->Get('advanced_scope'))) {
+        return $this->Get('advanced_scope');
+    }
+    $aScopes = $this->Get('scope')->GetValues();
+    $aRawScopes = [];
+    foreach ($aScopes as $sScope) {
+        switch ($sScope) {
+            case 'SMTP':
+                $aRawScopes['https://mail.google.com/'] = 'https://mail.google.com/';
+                break;
+
+            case 'IMAP':
+                $aRawScopes['https://mail.google.com/'] = 'https://mail.google.com/';
+                break;
+        }
+    }
+    return implode(' ', $aRawScopes);
+  }
+            ]]></code>
+        </method>
+      </methods>
+    </class>
   </classes>
   <menus>
     <menu id="OAuthClient" xsi:type="OQLMenuNode" _delta="define">
@@ -289,11 +888,16 @@
       <do_search>1</do_search>
       <enable_admin_only>0</enable_admin_only>
       <enable_class>OAuthClient</enable_class>
-      <enable_action>UR_ACTION_READ</enable_action>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
   </menus>
   <user_rights>
     <groups>
+      <group id="OauthConnection" _delta="define">
+        <classes>
+          <class id="OAuthClient"/>
+        </classes>
+      </group>
     </groups>
     <profiles>
     </profiles>

datamodels/2.x/itop-oauth-client/en.dict.itop-oauth-client.php

@@ -21,6 +21,11 @@ Dict::Add('EN US', 'English', 'English', [
 	'itop-oauth-client:Message:MissingToken' => 'Generate access token before using this OAuth client',
 	'itop-oauth-client:Message:TokenCreated' => 'Access token created',
 	'itop-oauth-client:Message:TokenRecreated' => 'Access token regenerated',
+
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'The combination Login (%1$s) and Use for SMTP (%2$s) has already be used for OAuth Client',
+
+	'OAuthClient:baseinfo' => 'Base Information',
+	'OAuthClient:scope' => 'Scope',
 ]);
 
 //
@@ -32,19 +37,17 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:OAuthClient/Attribute:provider' => 'Provider',
 	'Class:OAuthClient/Attribute:provider+' => '',
 	'Class:OAuthClient/Attribute:name' => 'Login',
-	'Class:OAuthClient/Attribute:name+' => '',
+	'Class:OAuthClient/Attribute:name+' => 'In general, this is your email address',
-	'Class:OAuthClient/Attribute:scope' => 'Scope',
-	'Class:OAuthClient/Attribute:scope+' => '',
 	'Class:OAuthClient/Attribute:status' => 'Status',
-	'Class:OAuthClient/Attribute:status+' => '',
+	'Class:OAuthClient/Attribute:status+' => 'After creation, use the action “Generate access token” to be able to use this OAuth client',
 	'Class:OAuthClient/Attribute:status/Value:active' => 'Access token generated',
 	'Class:OAuthClient/Attribute:status/Value:inactive' => 'No Access token',
 	'Class:OAuthClient/Attribute:description' => 'Description',
 	'Class:OAuthClient/Attribute:description+' => '',
 	'Class:OAuthClient/Attribute:client_id' => 'Client id',
-	'Class:OAuthClient/Attribute:client_id+' => '',
+	'Class:OAuthClient/Attribute:client_id+' => 'A long string of characters provided by your OAuth2 provider',
 	'Class:OAuthClient/Attribute:client_secret' => 'Client secret',
-	'Class:OAuthClient/Attribute:client_secret+' => '',
+	'Class:OAuthClient/Attribute:client_secret+' => 'Another long string of characters provided by your OAuth2 provider',
 	'Class:OAuthClient/Attribute:refresh_token' => 'Refresh token',
 	'Class:OAuthClient/Attribute:refresh_token+' => '',
 	'Class:OAuthClient/Attribute:refresh_token_expiration' => 'Refresh token expiration',
@@ -54,7 +57,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:OAuthClient/Attribute:token_expiration' => 'Access token expiration',
 	'Class:OAuthClient/Attribute:token_expiration+' => '',
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url',
-	'Class:OAuthClient/Attribute:redirect_url+' => '',
+	'Class:OAuthClient/Attribute:redirect_url+' => 'This url must be copied in the OAuth2 configuration of the provider',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list',
 	'Class:OAuthClient/Attribute:mailbox_list+' => '',
 ]);
@@ -62,17 +65,53 @@ Dict::Add('EN US', 'English', 'English', [
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('EN US', 'English', 'English', [
+
+Dict::Add('EN US', 'English', 'English', array(
 	'Class:OAuthClientAzure' => 'OAuth client for Microsoft Azure',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)',
-
+	'Class:OAuthClientAzure/Attribute:scope' => 'Scope',
-]);
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Usually default selection is appropriate',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Advanced scope',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Used scope',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Advanced',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Used for SMTP',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Yes',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'No',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('EN US', 'English', 'English', [
+
+Dict::Add('EN US', 'English', 'English', array(
 	'Class:OAuthClientGoogle' => 'OAuth client for Google',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)',
-]);
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Scope',
-
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Usually default selection is appropriate',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Advanced scope',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'As soon as you enter something here it takes precedence on the “Scope” selection which is then ignored',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Used scope',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Advanced',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Used for SMTP',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'At least one OAuth client must have this flag to “Yes”, if you want iTop to use it for sending mails',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Yes',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'No',
+));

datamodels/2.x/itop-oauth-client/fr.dict.itop-oauth-client.php

@@ -5,6 +5,7 @@
  * @copyright   Copyright (C) 2013 XXXXX
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
+
 Dict::Add('FR FR', 'French', 'Français', [
 	'Menu:CreateMailbox' => 'Créer une boite mail...',
 	'Menu:OAuthClient' => 'Client OAuth',
@@ -20,6 +21,11 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'itop-oauth-client:Message:MissingToken' => 'Générez le jeton d\'accès avant d\'utiliser ce client OAuth',
 	'itop-oauth-client:Message:TokenCreated' => 'Le jeton d\'accès à été créé',
 	'itop-oauth-client:Message:TokenRecreated' => 'Le jeton d\'accès à été renouvelé',
+
+	'OAuthClient:Name/UseForSMTPMustBeUnique' => 'La combinaison Login (%1$s) and Utilisé pour SMTP (%2$s) a déjà été utilisée pour OAuth Client',
+
+	'OAuthClient:baseinfo' => 'Information',
+	'OAuthClient:scope' => 'Scope',
 ]);
 
 //
@@ -31,15 +37,17 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:OAuthClient/Attribute:provider' => 'Fournisseur',
 	'Class:OAuthClient/Attribute:provider+' => '',
 	'Class:OAuthClient/Attribute:name' => 'Login',
-	'Class:OAuthClient/Attribute:name+' => '',
+	'Class:OAuthClient/Attribute:name+' => 'L\'adresse email à utiliser chez ce fournisseur',
-	'Class:OAuthClient/Attribute:scope' => 'Niveaux d\'accès',
+	'Class:OAuthClient/Attribute:status' => 'Statut',
-	'Class:OAuthClient/Attribute:scope+' => '',
+	'Class:OAuthClient/Attribute:status+' => 'Après la création, effectuer l\'action \'Créer un jeton d\'accès...\' pour activer ce client OAuth',
+	'Class:OAuthClient/Attribute:status/Value:active' => 'Jeton d\'accès créé',
+	'Class:OAuthClient/Attribute:status/Value:inactive' => 'Pas de jeton d\'accès',
 	'Class:OAuthClient/Attribute:description' => 'Description',
 	'Class:OAuthClient/Attribute:description+' => '',
 	'Class:OAuthClient/Attribute:client_id' => 'ID Client',
-	'Class:OAuthClient/Attribute:client_id+' => '',
+	'Class:OAuthClient/Attribute:client_id+' => 'Recopier la chaine fournie par votre fournisseur OAuth2',
 	'Class:OAuthClient/Attribute:client_secret' => 'Code secret du client',
-	'Class:OAuthClient/Attribute:client_secret+' => '',
+	'Class:OAuthClient/Attribute:client_secret+' => 'Recopier l\'information fournie par votre fournisseur OAuth2',
 	'Class:OAuthClient/Attribute:refresh_token' => 'Jeton de renouvellement',
 	'Class:OAuthClient/Attribute:refresh_token+' => '',
 	'Class:OAuthClient/Attribute:refresh_token_expiration' => 'Date d\'expiration du jeton de renouvellement',
@@ -49,7 +57,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:OAuthClient/Attribute:token_expiration' => 'Date d\'expiration du jeton d\'accès',
 	'Class:OAuthClient/Attribute:token_expiration+' => '',
 	'Class:OAuthClient/Attribute:redirect_url' => 'URL de redirection',
-	'Class:OAuthClient/Attribute:redirect_url+' => '',
+	'Class:OAuthClient/Attribute:redirect_url+' => 'Cet URL doit être recopié dans la configuration OAuth2 de votre fournisseur',
 	'Class:OAuthClient/Attribute:mailbox_list' => 'Mailbox list',
 	'Class:OAuthClient/Attribute:mailbox_list+' => '',
 ]);
@@ -57,22 +65,52 @@ Dict::Add('FR FR', 'French', 'Français', [
 //
 // Class: OAuthClientAzure
 //
-Dict::Add('FR FR', 'French', 'Français', [
+
+Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:OAuthClientAzure' => 'Client OAuth pour Microsoft Azure',
 	'Class:OAuthClientAzure/Name' => '%1$s (%2$s)',
-
+	'Class:OAuthClientAzure/Attribute:scope' => 'Niveaux d\'accès',
-]);
+	'Class:OAuthClientAzure/Attribute:scope+' => 'Les niveaux par défaut sont les plus souvent suffisants',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '',
+	'Class:OAuthClientAzure/Attribute:advanced_scope' => 'Niveaux d\'accès avancé',
+	'Class:OAuthClientAzure/Attribute:advanced_scope+' => 'A saisir, lorsque les niveaux prédéfinis ne suffisent pas',
+	'Class:OAuthClientAzure/Attribute:used_scope' => 'Niveaux d\'accès utilisés',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => 'Simple',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => 'Avancé',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => 'Utilisé pour SMTP',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => 'Le Client OAuth utilisé pour l\'envoi d\'emails doit être à \'Oui\'',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => 'Oui',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => 'Non',
+));
 
 //
 // Class: OAuthClientGoogle
 //
-Dict::Add('FR FR', 'French', 'Français', [
+
+Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:OAuthClientGoogle' => 'Client OAuth pour Google',
 	'Class:OAuthClientGoogle/Name' => '%1$s (%2$s)',
-]);
+	'Class:OAuthClientGoogle/Attribute:scope' => 'Niveaux d\'accès',
-
+	'Class:OAuthClientGoogle/Attribute:scope+' => 'Les niveaux par défaut sont les plus souvent suffisants',
-
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP',
-// Additional language entries not present in English dict
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '',
-Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP',
- 'Class:OAuthClient/Name' => '%1$s-%%2$~',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope' => 'Niveaux d\'accès avancé',
+	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => 'A saisir, lorsque les niveaux prédéfinis ne suffisent pas',
+	'Class:OAuthClientGoogle/Attribute:used_scope' => 'Niveaux d\'accès utilisés',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => 'Simple',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => 'Avancé',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => 'Utilisé pour SMTP',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => 'Le Client OAuth utilisé pour l\'envoi d\'emails doit être à \'Oui\'',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => 'Oui',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => 'Non',
 ));

datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php

@@ -25,9 +25,8 @@ SetupWebPage::AddModule(
 		'datamodel' => array(
 			'vendor/autoload.php',
 			'model.itop-oauth-client.php', // Contains the PHP code generated by the "compilation" of datamodel.remote-authent-oauth.xml
-			'src/Model/OAuthClientGoogle.php',
-			'src/Model/OAuthClientAzure.php',
 			'src/Service/PopupMenuExtension.php',
+			'src/Service/ApplicationUIExtension.php',
 		),
 		'webservice' => array(
 			

datamodels/2.x/itop-oauth-client/src/Model/OAuthClientAzure.php

@@ -1,128 +0,0 @@
-<?php
-/**
- * @copyright   Copyright (C) 2010-2022 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-use Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory;
-
-class OAuthClientAzure extends OAuthClient
-{
-	public static function Init()
-	{
-		$aParams = [
-			'category'            => 'cloud',
-			'key_type'            => 'autoincrement',
-			'name_attcode'        => ['name', 'scope'],
-			'state_attcode'       => '',
-			'reconc_keys'         => ['provider', 'name'],
-			'db_table'            => 'priv_oauth_client_azure',
-			'db_key_field'        => 'id',
-			'icon'                => utils::GetAbsoluteUrlModulesRoot().'itop-oauth-client/assets/img/icons8-azure.svg',
-			'db_finalclass_field' => '',
-			'uniqueness_rules'    => [
-				'Username for scope' =>
-					[
-						'attributes'  => ['name', 'scope'],
-						'filter'      => null,
-						'disabled'    => false,
-						'is_blocking' => true,
-					],
-				'OAuth Server' =>
-					[
-						'attributes'  => ['provider', 'scope', 'client_id', 'client_secret'],
-						'filter'      => null,
-						'disabled'    => false,
-						'is_blocking' => true,
-					],
-			],
-		];
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeEnum('scope', [
-			'allowed_values'        => new ValueSetEnum('EMail'),
-			'display_style'         => 'list',
-			'sql'                   => 'scope',
-			'default_value'         => 'EMail',
-			'is_null_allowed'       => false,
-			'depends_on'            => [],
-			'always_load_in_tables' => true,
-		]));
-
-		MetaModel::Init_SetZListItems('details', [
-			'name',
-			'status',
-			'description',
-			'provider',
-			'scope',
-			'redirect_url',
-			'client_id',
-			'client_secret',
-			'mailbox_list',
-		]);
-		MetaModel::Init_SetZListItems('standard_search', [
-			'name',
-			'provider',
-			'status',
-		]);
-		MetaModel::Init_SetZListItems('list', [
-			'status',
-			'provider',
-		]);
-	}
-
-	public function PrefillCreationForm(&$aContextParam)
-	{
-		$this->Set('provider', 'Azure');
-		$this->Set('redirect_url', OAuthClientProviderFactory::GetRedirectUri());
-
-		parent::PrefillCreationForm($aContextParam);
-	}
-
-	/**
-	 * Compute read-only values
-	 *
-	 * @return void
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 */
-	public function ComputeValues()
-	{
-		parent::ComputeValues();
-		if (empty($this->Get('provider'))) {
-			$this->Set('provider', 'Azure');
-		}
-		if (empty($this->Get('redirect_url'))) {
-			$this->Set('redirect_url', OAuthClientProviderFactory::GetRedirectUri());
-		}
-	}
-
-	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-	{
-		if ($sAttCode == 'provider' || $sAttCode == 'redirect_url') {
-			return OPT_ATT_READONLY;
-		}
-
-		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-	}
-
-	public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = array())
-	{
-		if ($sAttCode == 'provider' || $sAttCode == 'redirect_url') {
-			return OPT_ATT_READONLY;
-		}
-
-		return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
-	}
-
-	public function GetDefaultMailServer()
-	{
-		return 'outlook.office365.com';
-	}
-
-	public function GetScope()
-	{
-		return 'https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send offline_access';
-	}
-}

datamodels/2.x/itop-oauth-client/src/Model/OAuthClientGoogle.php

@@ -1,134 +0,0 @@
-<?php
-/**
- * @copyright   Copyright (C) 2010-2022 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-use Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory;
-
-class OAuthClientGoogle extends OAuthClient
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			'category'            => 'cloud',
-			'key_type'            => 'autoincrement',
-			'name_attcode'        => ['name', 'scope'],
-			'state_attcode'       => '',
-			'reconc_keys'         => ['provider', 'name'],
-			'db_table'            => 'priv_oauth_client_google',
-			'db_key_field'        => 'id',
-			'icon'                => utils::GetAbsoluteUrlModulesRoot().'itop-oauth-client/assets/img/icons8-google.svg',
-			'db_finalclass_field' => '',
-			'uniqueness_rules'    => [
-				'Username for scope' =>
-					[
-						'attributes'  => ['name', 'scope'],
-						'filter'      => null,
-						'disabled'    => false,
-						'is_blocking' => true,
-					],
-				'OAuth Server' =>
-					[
-						'attributes'  => ['provider', 'scope', 'client_id', 'client_secret'],
-						'filter'      => null,
-						'disabled'    => false,
-						'is_blocking' => true,
-					],
-			],
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeEnum('scope', [
-			'allowed_values'        => new ValueSetEnum('EMail'),
-			'display_style'         => 'list',
-			'sql'                   => 'scope',
-			'default_value'         => 'EMail',
-			'is_null_allowed'       => false,
-			'depends_on'            => [],
-			'always_load_in_tables' => true,
-		]));
-
-		MetaModel::Init_SetZListItems('details', [
-			'name',
-			'status',
-			'description',
-			'provider',
-			'scope',
-			'redirect_url',
-			'client_id',
-			'client_secret',
-			'mailbox_list',
-		]);
-		MetaModel::Init_SetZListItems('standard_search', [
-			'name',
-			'provider',
-			'status',
-		]);
-		MetaModel::Init_SetZListItems('list', [
-			'status',
-			'provider',
-		]);
-	}
-
-	public function PrefillCreationForm(&$aContextParam)
-	{
-		$this->Set('provider', 'Google');
-		$this->Set('scope', 'EMail');
-		$this->Set('redirect_url', OAuthClientProviderFactory::GetRedirectUri());
-
-		parent::PrefillCreationForm($aContextParam);
-	}
-
-	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-	{
-		if ($sAttCode == 'provider' || $sAttCode == 'scope' || $sAttCode == 'redirect_url') {
-			return OPT_ATT_READONLY;
-		}
-
-		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-	}
-
-	public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = array())
-	{
-		if ($sAttCode == 'provider' || $sAttCode == 'scope' || $sAttCode == 'redirect_url') {
-			return OPT_ATT_READONLY;
-		}
-
-		return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
-	}
-
-	/**
-	 * Compute read-only values
-	 *
-	 * @return void
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 */
-	public function ComputeValues()
-	{
-		parent::ComputeValues();
-		if (empty($this->Get('provider'))) {
-			$this->Set('provider', 'Google');
-		}
-		if (empty($this->Get('redirect_url'))) {
-			$this->Set('redirect_url', OAuthClientProviderFactory::GetRedirectUri());
-		}
-		if (empty($this->Get('scope'))) {
-			$this->Set('scope', 'EMail');
-		}
-	}
-
-
-	public function GetDefaultMailServer()
-	{
-		return 'imap.gmail.com';
-	}
-
-	public function GetScope()
-	{
-		return 'https://mail.google.com/';
-	}
-}

datamodels/2.x/itop-oauth-client/src/Service/ApplicationUIExtension.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2022 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace Combodo\iTop\OAuthClient\Service;
+
+use AbstractApplicationUIExtension;
+use OAuthClient;
+use utils;
+
+class ApplicationUIExtension extends AbstractApplicationUIExtension
+{
+
+	public function GetHilightClass($oObject)
+	{
+		if ($oObject instanceof OAuthClient) {
+			// Possible return values are:
+			// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
+			$oConfig = utils::GetConfig();
+			if ($oObject->Get('status') == 'inactive') {
+				return HILIGHT_CLASS_WARNING;
+			} elseif ($oObject->Get('used_for_smtp') == 'yes' && $oConfig->Get('email_transport_smtp.username') == $oObject->Get('name')) {
+				return HILIGHT_CLASS_OK;
+			}
+		}
+
+		return HILIGHT_CLASS_NONE;
+	}
+}

datamodels/2.x/itop-oauth-client/src/Service/PopupMenuExtension.php

@@ -51,8 +51,8 @@ class PopupMenuExtension implements \iPopupMenuExtension
 					);
 
 					if ($bHasToken) {
-						$sScope = $oObj->Get('scope');
+						$aScopes = $oObj->Get('scope')->GetValues();
-						if ($sScope == 'EMail') {
+						if (in_array('IMAP', $aScopes)) {
 							$aParams = $oAppContext->GetAsHash();
 							$sMenu = 'Menu:CreateMailbox';
 							$sObjClass = get_class($oObj);

datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php

@@ -93,7 +93,7 @@ class ObjectFormManager extends FormManager
 	 * @since 2.7.6 3.0.0 N°4384 method creation : factorize as this is used twice now
 	 * @since 2.7.7 3.0.1 N°4867 now only used once, but we decided to keep this method anyway
 	 */
-	protected static function DecodeFormManagerData($formManagerData)
+	public static function DecodeFormManagerData($formManagerData)
 	{
 		if (is_array($formManagerData)) {
 			return $formManagerData;

datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php

@@ -452,7 +452,7 @@ class ObjectFormHandlerHelper
 	 * @throws \OQLException
 	 */
 	public function CheckReadFormDataAllowed($sFormManagerData){
-		$aJsonFromData = json_decode($sFormManagerData, true);
+		$aJsonFromData = ObjectFormManager::DecodeFormManagerData($sFormManagerData);
 		if(isset($aJsonFromData['formobject_class'])
 			&& isset($aJsonFromData['formobject_id'])
 			&& !$this->oSecurityHelper->IsActionAllowed(UR_ACTION_READ, $aJsonFromData['formobject_class'], $aJsonFromData['formobject_id'])){

datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml

@@ -1388,4 +1388,10 @@
 			</navigation_rules>
 		</module_design>
 	</module_designs>
+  <module_parameters>
+    <parameters id="itop-portal" _delta="define">
+      <lazy_loading_threshold>500</lazy_loading_threshold><!-- Will be placed in the conf/<env>/config-itop.php file under the itop-portal module's settings  -->
+      <enable_formmanager_content_check type="boolean">true</enable_formmanager_content_check>
+    </parameters>
+  </module_parameters>
 </itop_design>

lib/autoload.php

@@ -2,11 +2,6 @@
 
 // autoload.php @generated by Composer
 
-if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
-}
-
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit5e7efdfe4e8f9526eb41991410b96239::getLoader();

lib/composer/ClassLoader.php

@@ -149,7 +149,7 @@ class ClassLoader
 
     /**
      * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
+     * @psalm-var array<string, string>
      */
     public function getClassMap()
     {

lib/composer/autoload_classmap.php

@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

lib/composer/autoload_files.php

@@ -2,25 +2,25 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
+    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
     '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php',
-    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
+    '32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
+    '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
+    'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
     '7e9bd612cc444b3eed788ebbe46263a0' => $vendorDir . '/laminas/laminas-zendframework-bridge/src/autoload.php',
     'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
     '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
     'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
     '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
-    'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
     'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
     'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
-    '32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
     'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
-    '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
     '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
 );

lib/composer/autoload_namespaces.php

@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

lib/composer/autoload_psr4.php

@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

lib/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit5e7efdfe4e8f9526eb41991410b96239
+class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b
 {
     private static $loader;
 
@@ -24,39 +24,47 @@ class ComposerAutoloaderInit5e7efdfe4e8f9526eb41991410b96239
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit5e7efdfe4e8f9526eb41991410b96239', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit5e7efdfe4e8f9526eb41991410b96239', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths[] = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
-        require __DIR__ . '/autoload_static.php';
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        call_user_func(\Composer\Autoload\ComposerStaticInit5e7efdfe4e8f9526eb41991410b96239::getInitializer($loader));
+        if ($useStaticLoader) {
+            require __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInit0018331147de7601e7552f7da8e3bb8b::getInitializer($loader));
+        } else {
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit5e7efdfe4e8f9526eb41991410b96239::$files;
+        if ($useStaticLoader) {
+            $includeFiles = Composer\Autoload\ComposerStaticInit0018331147de7601e7552f7da8e3bb8b::$files;
+        } else {
+            $includeFiles = require __DIR__ . '/autoload_files.php';
+        }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire5e7efdfe4e8f9526eb41991410b96239($fileIdentifier, $file);
+            composerRequire0018331147de7601e7552f7da8e3bb8b($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-/**
+function composerRequire0018331147de7601e7552f7da8e3bb8b($fileIdentifier, $file)
- * @param string $fileIdentifier
- * @param string $file
- * @return void
- */
-function composerRequire5e7efdfe4e8f9526eb41991410b96239($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-
         require $file;
+
+        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
     }
 }

lib/composer/autoload_static.php

@@ -8,21 +8,21 @@ class ComposerStaticInit5e7efdfe4e8f9526eb41991410b96239
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
         '023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php',
-        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
+        '32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
+        '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
+        'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
         '7e9bd612cc444b3eed788ebbe46263a0' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/autoload.php',
         'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
         '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
-        'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
         'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
         'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
-        '32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
         'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php',
-        '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
         '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
     );
 

lib/composer/include_paths.php

@@ -2,7 +2,7 @@
 
 // include_paths.php @generated by Composer
 
-$vendorDir = dirname(__DIR__);
+$vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(

lib/composer/installed.php

@@ -1,40 +1,40 @@
 <?php return array(
     'root' => array(
+        'name' => 'combodo/itop',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
+        'reference' => 'd388c3fd3d2a11983b61d268b2323a4ff0d0dbcb',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'a0f28a9098796248f63a8e9141723724d019d082',
-        'name' => '__root__',
         'dev' => true,
     ),
     'versions' => array(
-        '__root__' => array(
+        'combodo/itop' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
+            'reference' => 'd388c3fd3d2a11983b61d268b2323a4ff0d0dbcb',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'a0f28a9098796248f63a8e9141723724d019d082',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
             'pretty_version' => '6.4.4',
             'version' => '6.4.4.0',
+            'reference' => '0e31c013ccd000aa6762e9186778aa6e259ac8e8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../combodo/tcpdf',
             'aliases' => array(),
-            'reference' => '0e31c013ccd000aa6762e9186778aa6e259ac8e8',
             'dev_requirement' => false,
         ),
         'container-interop/container-interop' => array(
             'pretty_version' => '1.2.0',
             'version' => '1.2.0.0',
+            'reference' => '79cbf1341c22ec75643d841642dd5d6acd83bdb8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../container-interop/container-interop',
             'aliases' => array(),
-            'reference' => '79cbf1341c22ec75643d841642dd5d6acd83bdb8',
             'dev_requirement' => false,
         ),
         'container-interop/container-interop-implementation' => array(
@@ -46,208 +46,208 @@
         'doctrine/lexer' => array(
             'pretty_version' => '1.0.2',
             'version' => '1.0.2.0',
+            'reference' => '1febd6c3ef84253d7c815bed85fc622ad207a9f8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../doctrine/lexer',
             'aliases' => array(),
-            'reference' => '1febd6c3ef84253d7c815bed85fc622ad207a9f8',
             'dev_requirement' => false,
         ),
         'egulias/email-validator' => array(
             'pretty_version' => '2.1.25',
             'version' => '2.1.25.0',
+            'reference' => '0dbf5d78455d4d6a41d186da50adc1122ec066f4',
             'type' => 'library',
             'install_path' => __DIR__ . '/../egulias/email-validator',
             'aliases' => array(),
-            'reference' => '0dbf5d78455d4d6a41d186da50adc1122ec066f4',
             'dev_requirement' => false,
         ),
         'firebase/php-jwt' => array(
             'pretty_version' => 'v5.5.1',
             'version' => '5.5.1.0',
+            'reference' => '83b609028194aa042ea33b5af2d41a7427de80e6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../firebase/php-jwt',
             'aliases' => array(),
-            'reference' => '83b609028194aa042ea33b5af2d41a7427de80e6',
             'dev_requirement' => false,
         ),
         'guzzlehttp/guzzle' => array(
             'pretty_version' => '6.5.8',
             'version' => '6.5.8.0',
+            'reference' => 'a52f0440530b54fa079ce76e8c5d196a42cad981',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/guzzle',
             'aliases' => array(),
-            'reference' => 'a52f0440530b54fa079ce76e8c5d196a42cad981',
             'dev_requirement' => false,
         ),
         'guzzlehttp/promises' => array(
             'pretty_version' => '1.5.1',
             'version' => '1.5.1.0',
+            'reference' => 'fe752aedc9fd8fcca3fe7ad05d419d32998a06da',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/promises',
             'aliases' => array(),
-            'reference' => 'fe752aedc9fd8fcca3fe7ad05d419d32998a06da',
             'dev_requirement' => false,
         ),
         'guzzlehttp/psr7' => array(
             'pretty_version' => '1.9.0',
             'version' => '1.9.0.0',
+            'reference' => 'e98e3e6d4f86621a9b75f623996e6bbdeb4b9318',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/psr7',
             'aliases' => array(),
-            'reference' => 'e98e3e6d4f86621a9b75f623996e6bbdeb4b9318',
             'dev_requirement' => false,
         ),
         'laminas/laminas-loader' => array(
             'pretty_version' => '2.6.1',
             'version' => '2.6.1.0',
+            'reference' => '5d01c2c237ae9e68bec262f339947e2ea18979bc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-loader',
             'aliases' => array(),
-            'reference' => '5d01c2c237ae9e68bec262f339947e2ea18979bc',
             'dev_requirement' => false,
         ),
         'laminas/laminas-mail' => array(
             'pretty_version' => '2.11.1',
             'version' => '2.11.1.0',
+            'reference' => '7f674afeb38100b1869ce8e56bf2ec3cba3c679c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-mail',
             'aliases' => array(),
-            'reference' => '7f674afeb38100b1869ce8e56bf2ec3cba3c679c',
             'dev_requirement' => false,
         ),
         'laminas/laminas-mime' => array(
             'pretty_version' => '2.7.4',
             'version' => '2.7.4.0',
+            'reference' => 'e45a7d856bf7b4a7b5bd00d6371f9961dc233add',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-mime',
             'aliases' => array(),
-            'reference' => 'e45a7d856bf7b4a7b5bd00d6371f9961dc233add',
             'dev_requirement' => false,
         ),
         'laminas/laminas-servicemanager' => array(
             'pretty_version' => '3.5.2',
             'version' => '3.5.2.0',
+            'reference' => '0669e1eec8d9f61e35a5bc5012796d49f418b259',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-servicemanager',
             'aliases' => array(),
-            'reference' => '0669e1eec8d9f61e35a5bc5012796d49f418b259',
             'dev_requirement' => false,
         ),
         'laminas/laminas-stdlib' => array(
             'pretty_version' => '3.2.1',
             'version' => '3.2.1.0',
+            'reference' => '2b18347625a2f06a1a485acfbc870f699dbe51c6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-stdlib',
             'aliases' => array(),
-            'reference' => '2b18347625a2f06a1a485acfbc870f699dbe51c6',
             'dev_requirement' => false,
         ),
         'laminas/laminas-validator' => array(
             'pretty_version' => '2.12.2',
             'version' => '2.12.2.0',
+            'reference' => '0813f234812d9fa9058b6da39eb13dedc90227db',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-validator',
             'aliases' => array(),
-            'reference' => '0813f234812d9fa9058b6da39eb13dedc90227db',
             'dev_requirement' => false,
         ),
         'laminas/laminas-zendframework-bridge' => array(
             'pretty_version' => '1.1.1',
             'version' => '1.1.1.0',
+            'reference' => '6ede70583e101030bcace4dcddd648f760ddf642',
             'type' => 'library',
             'install_path' => __DIR__ . '/../laminas/laminas-zendframework-bridge',
             'aliases' => array(),
-            'reference' => '6ede70583e101030bcace4dcddd648f760ddf642',
             'dev_requirement' => false,
         ),
         'league/oauth2-client' => array(
             'pretty_version' => '2.6.1',
             'version' => '2.6.1.0',
+            'reference' => '2334c249907190c132364f5dae0287ab8666aa19',
             'type' => 'library',
             'install_path' => __DIR__ . '/../league/oauth2-client',
             'aliases' => array(),
-            'reference' => '2334c249907190c132364f5dae0287ab8666aa19',
             'dev_requirement' => false,
         ),
         'league/oauth2-google' => array(
             'pretty_version' => '3.0.4',
             'version' => '3.0.4.0',
+            'reference' => '6b79441f244040760bed5fdcd092a2bda7cf34c6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../league/oauth2-google',
             'aliases' => array(),
-            'reference' => '6b79441f244040760bed5fdcd092a2bda7cf34c6',
             'dev_requirement' => false,
         ),
         'nikic/php-parser' => array(
             'pretty_version' => 'v4.13.2',
             'version' => '4.13.2.0',
+            'reference' => '210577fe3cf7badcc5814d99455df46564f3c077',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nikic/php-parser',
             'aliases' => array(),
-            'reference' => '210577fe3cf7badcc5814d99455df46564f3c077',
             'dev_requirement' => false,
         ),
         'paragonie/random_compat' => array(
             'pretty_version' => 'v2.0.18',
             'version' => '2.0.18.0',
+            'reference' => '0a58ef6e3146256cc3dc7cc393927bcc7d1b72db',
             'type' => 'library',
             'install_path' => __DIR__ . '/../paragonie/random_compat',
             'aliases' => array(),
-            'reference' => '0a58ef6e3146256cc3dc7cc393927bcc7d1b72db',
             'dev_requirement' => false,
         ),
         'pear/archive_tar' => array(
             'pretty_version' => '1.4.14',
             'version' => '1.4.14.0',
+            'reference' => '4d761c5334c790e45ef3245f0864b8955c562caa',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/archive_tar',
             'aliases' => array(),
-            'reference' => '4d761c5334c790e45ef3245f0864b8955c562caa',
             'dev_requirement' => false,
         ),
         'pear/console_getopt' => array(
             'pretty_version' => 'v1.4.3',
             'version' => '1.4.3.0',
+            'reference' => 'a41f8d3e668987609178c7c4a9fe48fecac53fa0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/console_getopt',
             'aliases' => array(),
-            'reference' => 'a41f8d3e668987609178c7c4a9fe48fecac53fa0',
             'dev_requirement' => false,
         ),
         'pear/pear-core-minimal' => array(
             'pretty_version' => 'v1.10.10',
             'version' => '1.10.10.0',
+            'reference' => '625a3c429d9b2c1546438679074cac1b089116a7',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/pear-core-minimal',
             'aliases' => array(),
-            'reference' => '625a3c429d9b2c1546438679074cac1b089116a7',
             'dev_requirement' => false,
         ),
         'pear/pear_exception' => array(
             'pretty_version' => 'v1.0.1',
             'version' => '1.0.1.0',
+            'reference' => 'dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7',
             'type' => 'class',
             'install_path' => __DIR__ . '/../pear/pear_exception',
             'aliases' => array(),
-            'reference' => 'dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7',
             'dev_requirement' => false,
         ),
         'pelago/emogrifier' => array(
             'pretty_version' => 'v3.1.0',
             'version' => '3.1.0.0',
+            'reference' => 'f6a5c7d44612d86c3901c93f1592f5440e6b2cd8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pelago/emogrifier',
             'aliases' => array(),
-            'reference' => 'f6a5c7d44612d86c3901c93f1592f5440e6b2cd8',
             'dev_requirement' => false,
         ),
         'psr/cache' => array(
             'pretty_version' => '1.0.1',
             'version' => '1.0.1.0',
+            'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/cache',
             'aliases' => array(),
-            'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8',
             'dev_requirement' => false,
         ),
         'psr/cache-implementation' => array(
@@ -259,10 +259,10 @@
         'psr/container' => array(
             'pretty_version' => '1.0.0',
             'version' => '1.0.0.0',
+            'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/container',
             'aliases' => array(),
-            'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f',
             'dev_requirement' => false,
         ),
         'psr/container-implementation' => array(
@@ -275,10 +275,10 @@
         'psr/http-message' => array(
             'pretty_version' => '1.0.1',
             'version' => '1.0.1.0',
+            'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-message',
             'aliases' => array(),
-            'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363',
             'dev_requirement' => false,
         ),
         'psr/http-message-implementation' => array(
@@ -290,10 +290,10 @@
         'psr/log' => array(
             'pretty_version' => '1.1.2',
             'version' => '1.1.2.0',
+            'reference' => '446d54b4cb6bf489fc9d75f55843658e6f25d801',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/log',
             'aliases' => array(),
-            'reference' => '446d54b4cb6bf489fc9d75f55843658e6f25d801',
             'dev_requirement' => false,
         ),
         'psr/log-implementation' => array(
@@ -305,10 +305,10 @@
         'psr/simple-cache' => array(
             'pretty_version' => '1.0.1',
             'version' => '1.0.1.0',
+            'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/simple-cache',
             'aliases' => array(),
-            'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b',
             'dev_requirement' => false,
         ),
         'psr/simple-cache-implementation' => array(
@@ -320,10 +320,10 @@
         'ralouphie/getallheaders' => array(
             'pretty_version' => '3.0.3',
             'version' => '3.0.3.0',
+            'reference' => '120b605dfeb996808c31b6477290a714d356e822',
             'type' => 'library',
             'install_path' => __DIR__ . '/../ralouphie/getallheaders',
             'aliases' => array(),
-            'reference' => '120b605dfeb996808c31b6477290a714d356e822',
             'dev_requirement' => false,
         ),
         'rsky/pear-core-min' => array(
@@ -335,298 +335,298 @@
         'scssphp/scssphp' => array(
             'pretty_version' => '1.0.6',
             'version' => '1.0.6.0',
+            'reference' => '5b3c9d704950d8f9637f5110c36c281ec47dc13c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../scssphp/scssphp',
             'aliases' => array(),
-            'reference' => '5b3c9d704950d8f9637f5110c36c281ec47dc13c',
             'dev_requirement' => false,
         ),
         'swiftmailer/swiftmailer' => array(
             'pretty_version' => 'v6.3.0',
             'version' => '6.3.0.0',
+            'reference' => '8a5d5072dca8f48460fce2f4131fcc495eec654c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../swiftmailer/swiftmailer',
             'aliases' => array(),
-            'reference' => '8a5d5072dca8f48460fce2f4131fcc495eec654c',
             'dev_requirement' => false,
         ),
         'symfony/cache' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'a7a14c4832760bd1fbd31be2859ffedc9b6ff813',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/cache',
             'aliases' => array(),
-            'reference' => 'a7a14c4832760bd1fbd31be2859ffedc9b6ff813',
             'dev_requirement' => false,
         ),
         'symfony/class-loader' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'a22265a9f3511c0212bf79f54910ca5a77c0e92c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/class-loader',
             'aliases' => array(),
-            'reference' => 'a22265a9f3511c0212bf79f54910ca5a77c0e92c',
             'dev_requirement' => false,
         ),
         'symfony/config' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/config',
             'aliases' => array(),
-            'reference' => 'bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f',
             'dev_requirement' => false,
         ),
         'symfony/console' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'a10b1da6fc93080c180bba7219b5ff5b7518fe81',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/console',
             'aliases' => array(),
-            'reference' => 'a10b1da6fc93080c180bba7219b5ff5b7518fe81',
             'dev_requirement' => false,
         ),
         'symfony/css-selector' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'da3d9da2ce0026771f5fe64cb332158f1bd2bc33',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/css-selector',
             'aliases' => array(),
-            'reference' => 'da3d9da2ce0026771f5fe64cb332158f1bd2bc33',
             'dev_requirement' => false,
         ),
         'symfony/debug' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'ab42889de57fdfcfcc0759ab102e2fd4ea72dcae',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/debug',
             'aliases' => array(),
-            'reference' => 'ab42889de57fdfcfcc0759ab102e2fd4ea72dcae',
             'dev_requirement' => false,
         ),
         'symfony/dependency-injection' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '51d2a2708c6ceadad84393f8581df1dcf9e5e84b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/dependency-injection',
             'aliases' => array(),
-            'reference' => '51d2a2708c6ceadad84393f8581df1dcf9e5e84b',
             'dev_requirement' => false,
         ),
         'symfony/dotenv' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '1022723ac4f56b001d99691d96c6025dbf1404f1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/dotenv',
             'aliases' => array(),
-            'reference' => '1022723ac4f56b001d99691d96c6025dbf1404f1',
             'dev_requirement' => false,
         ),
         'symfony/event-dispatcher' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '31fde73757b6bad247c54597beef974919ec6860',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/event-dispatcher',
             'aliases' => array(),
-            'reference' => '31fde73757b6bad247c54597beef974919ec6860',
             'dev_requirement' => false,
         ),
         'symfony/filesystem' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'e58d7841cddfed6e846829040dca2cca0ebbbbb3',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/filesystem',
             'aliases' => array(),
-            'reference' => 'e58d7841cddfed6e846829040dca2cca0ebbbbb3',
             'dev_requirement' => false,
         ),
         'symfony/finder' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'b6b6ad3db3edb1b4b1c1896b1975fb684994de6e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/finder',
             'aliases' => array(),
-            'reference' => 'b6b6ad3db3edb1b4b1c1896b1975fb684994de6e',
             'dev_requirement' => false,
         ),
         'symfony/framework-bundle' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '6c95e747b75ddd2af61152ce93bf87299d15710e',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/framework-bundle',
             'aliases' => array(),
-            'reference' => '6c95e747b75ddd2af61152ce93bf87299d15710e',
             'dev_requirement' => false,
         ),
         'symfony/http-foundation' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'b9885fcce6fe494201da4f70a9309770e9d13dc8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/http-foundation',
             'aliases' => array(),
-            'reference' => 'b9885fcce6fe494201da4f70a9309770e9d13dc8',
             'dev_requirement' => false,
         ),
         'symfony/http-kernel' => array(
             'pretty_version' => 'v3.4.49',
             'version' => '3.4.49.0',
+            'reference' => '5aa72405f5bd5583c36ed6e756acb17d3f98ac40',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/http-kernel',
             'aliases' => array(),
-            'reference' => '5aa72405f5bd5583c36ed6e756acb17d3f98ac40',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-apcu' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => 'b44b51e7814c23bfbd793a16ead5d7ce43ed23c5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-apcu',
             'aliases' => array(),
-            'reference' => 'b44b51e7814c23bfbd793a16ead5d7ce43ed23c5',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-ctype' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => 'aed596913b70fae57be53d86faa2e9ef85a2297b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
             'aliases' => array(),
-            'reference' => 'aed596913b70fae57be53d86faa2e9ef85a2297b',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-iconv' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => '085241787d52fa6f7a774fd034135fef0cfd5496',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-iconv',
             'aliases' => array(),
-            'reference' => '085241787d52fa6f7a774fd034135fef0cfd5496',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-idn' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => '4ad5115c0f5d5172a9fe8147675ec6de266d8826',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
             'aliases' => array(),
-            'reference' => '4ad5115c0f5d5172a9fe8147675ec6de266d8826',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-normalizer' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => '8db0ae7936b42feb370840cf24de1a144fb0ef27',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
             'aliases' => array(),
-            'reference' => '8db0ae7936b42feb370840cf24de1a144fb0ef27',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-mbstring' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => 'b5f7b932ee6fa802fc792eabd77c4c88084517ce',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
             'aliases' => array(),
-            'reference' => 'b5f7b932ee6fa802fc792eabd77c4c88084517ce',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php56' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => 'ea19621731cbd973a6702cfedef3419768bf3372',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php56',
             'aliases' => array(),
-            'reference' => 'ea19621731cbd973a6702cfedef3419768bf3372',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php70' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => '3fe414077251a81a1b15b1c709faf5c2fbae3d4e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php70',
             'aliases' => array(),
-            'reference' => '3fe414077251a81a1b15b1c709faf5c2fbae3d4e',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php72' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => 'beecef6b463b06954638f02378f52496cb84bacc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php72',
             'aliases' => array(),
-            'reference' => 'beecef6b463b06954638f02378f52496cb84bacc',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-util' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
+            'reference' => '8df0c3e6a4b85df9a5c6f3f2f46fba5c5c47058a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-util',
             'aliases' => array(),
-            'reference' => '8df0c3e6a4b85df9a5c6f3f2f46fba5c5c47058a',
             'dev_requirement' => false,
         ),
         'symfony/routing' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '3e522ac69cadffd8131cc2b22157fa7662331a6c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/routing',
             'aliases' => array(),
-            'reference' => '3e522ac69cadffd8131cc2b22157fa7662331a6c',
             'dev_requirement' => false,
         ),
         'symfony/stopwatch' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '298b81faad4ce60e94466226b2abbb8c9bca7462',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/stopwatch',
             'aliases' => array(),
-            'reference' => '298b81faad4ce60e94466226b2abbb8c9bca7462',
             'dev_requirement' => true,
         ),
         'symfony/twig-bridge' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '090d19d6f1ea5b9e1d79f372785aa5e5c9cd4042',
             'type' => 'symfony-bridge',
             'install_path' => __DIR__ . '/../symfony/twig-bridge',
             'aliases' => array(),
-            'reference' => '090d19d6f1ea5b9e1d79f372785aa5e5c9cd4042',
             'dev_requirement' => false,
         ),
         'symfony/twig-bundle' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '977b3096e2df96bc8a8d2329e83466cfc30c373d',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/twig-bundle',
             'aliases' => array(),
-            'reference' => '977b3096e2df96bc8a8d2329e83466cfc30c373d',
             'dev_requirement' => false,
         ),
         'symfony/var-dumper' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '0719f6cf4633a38b2c1585140998579ce23b4b7d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/var-dumper',
             'aliases' => array(),
-            'reference' => '0719f6cf4633a38b2c1585140998579ce23b4b7d',
             'dev_requirement' => true,
         ),
         'symfony/web-profiler-bundle' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => 'ccb83b3a508f4a683e44f571f127beebdc315ff9',
             'type' => 'symfony-bundle',
             'install_path' => __DIR__ . '/../symfony/web-profiler-bundle',
             'aliases' => array(),
-            'reference' => 'ccb83b3a508f4a683e44f571f127beebdc315ff9',
             'dev_requirement' => true,
         ),
         'symfony/yaml' => array(
             'pretty_version' => 'v3.4.47',
             'version' => '3.4.47.0',
+            'reference' => '88289caa3c166321883f67fe5130188ebbb47094',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/yaml',
             'aliases' => array(),
-            'reference' => '88289caa3c166321883f67fe5130188ebbb47094',
             'dev_requirement' => false,
         ),
         'tecnickcom/tcpdf' => array(
@@ -638,28 +638,28 @@
         'thenetworg/oauth2-azure' => array(
             'pretty_version' => 'v2.0.1',
             'version' => '2.0.1.0',
+            'reference' => '2649422a0dc74af32d21d9d738d37abcd5b03998',
             'type' => 'library',
             'install_path' => __DIR__ . '/../thenetworg/oauth2-azure',
             'aliases' => array(),
-            'reference' => '2649422a0dc74af32d21d9d738d37abcd5b03998',
             'dev_requirement' => false,
         ),
         'true/punycode' => array(
             'pretty_version' => 'v2.1.1',
             'version' => '2.1.1.0',
+            'reference' => 'a4d0c11a36dd7f4e7cd7096076cab6d3378a071e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../true/punycode',
             'aliases' => array(),
-            'reference' => 'a4d0c11a36dd7f4e7cd7096076cab6d3378a071e',
             'dev_requirement' => false,
         ),
         'twig/twig' => array(
             'pretty_version' => 'v1.42.5',
             'version' => '1.42.5.0',
+            'reference' => '87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../twig/twig',
             'aliases' => array(),
-            'reference' => '87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e',
             'dev_requirement' => false,
         ),
         'zendframework/zend-loader' => array(

setup/licenses/community-licenses.xml

@@ -1672,214 +1672,6 @@ Awesome, nor vice versa. **Please do not use brand logos for any purpose except
 to represent the company, product, or service to which they refer.**
 ]]></text>
   </license>
-  <license>
-          <product scope="datamodels">apereo/phpcas</product>
-          <author>Joachim Fritschi - Adam Franco</author>
-          <license_type>Apache-2.0</license_type>
-          <text><![CDATA[
-                                   Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  ]]></text>
-      </license>
   <license>
     <product scope="js">C3 js</product>
     <author>Masayuki Tanaka</author>

setup/setuputils.class.inc.php

@@ -684,6 +684,7 @@ class SetupUtils
 	 * Emulates sys_get_temp_dir if needed (PHP < 5.2.1)
 	 *
 	 * @return string Path to the system's temp directory
+	 * @uses \sys_get_temp_dir()
 	 */
 	public static function GetTmpDir() {
 		return realpath(sys_get_temp_dir());

sources/Core/Authentication/Client/OAuth/OAuthClientProviderAbstract.php

@@ -8,15 +8,8 @@ use OAuthClient;
 
 abstract class OAuthClientProviderAbstract implements IOAuthClientProvider
 {
-//	/** @var string */
+	/** @var string */
-//	static protected $sVendorName = '';
+	static protected $sVendorName = '';
-//	/** @var array */
-//	static protected $sVendorColors = ['', '', '', ''];
-//	/** @var string */
-//	static protected $sVendorIcon = '';
-//	static protected $sRequiredSMTPScope = '';
-//	static protected $sRequiredIMAPScope = '';
-//	static protected $sRequiredPOPScope = '';
 
 	/** @var \League\OAuth2\Client\Provider\GenericProvider */
 	protected $oVendorProvider;
@@ -69,4 +62,12 @@ abstract class OAuthClientProviderAbstract implements IOAuthClientProvider
 		return $this->oOauthClient->GetScope();
 	}
 
+	/**
+	 * @return string
+	 */
+	public static function GetVendorName()
+	{
+		return self::$sVendorName;
+	}
+
 }

sources/Core/Authentication/Client/OAuth/OAuthClientProviderAzure.php

@@ -6,16 +6,8 @@ use TheNetworg\OAuth2\Client\Provider\Azure;
 
 class OAuthClientProviderAzure extends OAuthClientProviderAbstract
 {
-//	/** @var string */
+	/** @var string */
-//	static protected $sVendorName = 'Azure';
+	static protected $sVendorName = 'Azure';
-//	/** @var array */
-//	static protected $sVendorColors = ['#0766b7', '#0d396b', '#2893df', '#3ccbf4'];
-//	/** @var string */
-//	static protected $sVendorIcon = '../images/icons/icons8-azure.svg';
-//	static protected $sRequiredSMTPScope = 'https://outlook.office.com/SMTP.Send offline_access';
-//	static protected $sRequiredIMAPScope = 'https://outlook.office.com/IMAP.AccessAsUser.All offline_access';
-//	static protected $sRequiredPOPScope = 'https://outlook.office.com/POP.AccessAsUser.All offline access';
-
 
 	public function __construct($oOAuthClient, array $collaborators = [])
 	{

sources/Core/Authentication/Client/OAuth/OAuthClientProviderFactory.php

@@ -43,8 +43,7 @@ class OAuthClientProviderFactory
 			throw new CoreException(Dict::Format('itop-oauth-client:MissingOAuthClient', $sUsername));
 		}
 		while ($oOAuthClient = $oSet->Fetch()) {
-			$sScope =  $oOAuthClient->Get('scope');
+			if ($oOAuthClient->Get('used_for_smtp') == 'yes') {
-			if ($sScope == 'EMail') {
 				return $oOAuthClient;
 			}
 		}

sources/Core/Authentication/Client/OAuth/OAuthClientProviderGoogle.php

@@ -6,16 +6,8 @@ use League\OAuth2\Client\Provider\Google;
 
 class OAuthClientProviderGoogle extends OAuthClientProviderAbstract
 {
-//	/** @var string */
+	/** @var string */
-//	static protected $sVendorName = 'Google';
+	static protected $sVendorName = 'Google';
-//	/** @var array */
-//	static protected $sVendorColors = ['#DB4437', '#F4B400', '#0F9D58', '#4285F4'];
-//	/** @var string */
-//	static protected $sVendorIcon = '../images/icons/icons8-google.svg';
-//
-//	static protected $sRequiredSMTPScope = 'https://mail.google.com/';
-//	static protected $sRequiredIMAPScope = 'https://mail.google.com/';
-//	static protected $sRequiredPOPScope = 'https://mail.google.com/';
 
 	public function __construct($oOAuthClient, array $collaborators = [])
 	{