Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 22:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try better fix for #28194

Browse Source
This commit is contained in:
Laurent Destailleur
2024-05-25 14:12:53 +02:00
parent 8359fbf4fe
commit ac4ce3d667
4 changed files with 378 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/core/lib/oauth.lib.php
View File

@@ -150,6 +150,11 @@ function getAllOauth2Array()
'OAUTH_MICROSOFT_ID',
'OAUTH_MICROSOFT_SECRET',
),
array(
'OAUTH_MICROSOFT2_NAME',
'OAUTH_MICROSOFT2_ID',
'OAUTH_MICROSOFT2_SECRET',
),
array(
'OAUTH_NEST_NAME',
'OAUTH_NEST_ID',
@@ -276,7 +281,7 @@ function getSupportedOauth2Array()
// Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
$supportedoauth2array = array(
'OAUTH_GOOGLE_NAME' => array(
'callbackfile' => 'google',
'callbackfile' => 'google', // used to generate the filename: google_oauthcallback.php
'picto' => 'google',
'urlforapp' => 'OAUTH_GOOGLE_DESC',
'name' => 'Google',
@@ -319,12 +324,22 @@ function getSupportedOauth2Array()
'callbackfile' => 'microsoft',
'picto' => 'microsoft',
'urlforapp' => 'OAUTH_MICROSOFT_DESC',
'name' => 'Microsoft',
'name' => 'Microsoft [outlook.office365]',
'urlforcredentials' => 'https://portal.azure.com/',
// User.Read is a microsoftgraph scope, if it's not working, do not select it
'availablescopes' => 'openid,offline_access,profile,email,User.Read,https://outlook.office365.com/IMAP.AccessAsUser.All,https://outlook.office365.com/SMTP.Send',
'returnurl' => '/core/modules/oauth/microsoft_oauthcallback.php'
);
$supportedoauth2array['OAUTH_MICROSOFT2_NAME'] = array(
'callbackfile' => 'microsoft2',
'picto' => 'microsoft',
'urlforapp' => 'OAUTH_MICROSOFT2_DESC',
'name' => 'Microsoft [outlook.office]',
'urlforcredentials' => 'https://portal.azure.com/',
// User.Read is a microsoftgraph scope, if it's not working, do not select it
'availablescopes' => 'openid,offline_access,profile,email,User.Read,https://outlook.office.com/.default',
'returnurl' => '/core/modules/oauth/microsoft_oauthcallback.php'
);
if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
$supportedoauth2array['OAUTH_OTHER_NAME'] = array(
'callbackfile' => 'generic',