extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP OAuth for mail:

Browse Source 
fixing some typos to test with Office365
This commit is contained in:
ralf 2022-12-25 15:19:14 -06:00
parent 14b6a9a5ab
commit 71aabaea73
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.admin_mail.inc.php
View File

@ -231,7 +231,7 @@ class admin_mail
// supported oauth providers // supported oauth providers
if (($oauth = OpenIDConnectClient::providerByDomain($content['acc_imap_username']))) if (($oauth = OpenIDConnectClient::providerByDomain($content['acc_imap_username'])))
{ {
$content['output'] = lang('Using IMAP:%1, SMTP:%2, OAUTH:%3:', $oauth['imap'], $oauth['smtp'], $oauth['provider'])."\n"; $content['output'] .= lang('Using IMAP:%1, SMTP:%2, OAUTH:%3:', $oauth['imap'], $oauth['smtp'], $oauth['provider'])."\n";
$hosts[$oauth['imap']] = true; $hosts[$oauth['imap']] = true;
$content['acc_smpt_host'] = $oauth['smtp']; $content['acc_smpt_host'] = $oauth['smtp'];
$content['acc_sieve_enabled'] = false; $content['acc_sieve_enabled'] = false;

4
admin/lang/egw_de.lang
View File

@ -975,8 +975,8 @@ users can define their own identities admin de Anwender können ihre eigenen Ide
users can define their own signatures admin de Anwender können ihre eigenen Signaturen definieren users can define their own signatures admin de Anwender können ihre eigenen Signaturen definieren
users can utilize these stationery templates admin de Benutzer können diese Briefpapiervorlagen verwenden users can utilize these stationery templates admin de Benutzer können diese Briefpapiervorlagen verwenden
users choice admin de Benutzerauswahl users choice admin de Benutzerauswahl
using data from mozilla ispdb for provider %1 admin de Benutzer Mozilla ISPDB für Provider %1 using data from mozilla ispdb for provider %1 admin de Benutze Mozilla ISPDB für Provider %1
using imap:%1, smtp:%2, oauth:%3: admin de Benutzer IMAP: %1, SMTP: %2, OAuth: %3: using imap:%1, smtp:%2, oauth:%3: admin de Benutze IMAP: %1, SMTP: %2, OAuth: %3:
vacation messages with start- and end-date require an admin account to be set admin de Abwesenheitsnotizen mit Start- und Enddatum benötigen einen gesetzten Administrator Benutzer! vacation messages with start- and end-date require an admin account to be set admin de Abwesenheitsnotizen mit Start- und Enddatum benötigen einen gesetzten Administrator Benutzer!
vacation notice admin de Abwesenheitsnotiz vacation notice admin de Abwesenheitsnotiz
value for column %1 is not unique! admin de Wert für die Spalte %1 ist nicht eindeutig! value for column %1 is not unique! admin de Wert für die Spalte %1 ist nicht eindeutig!

2
api/src/Auth/OpenIDConnectClient.php
View File

@ -51,7 +51,7 @@ class OpenIDConnectClient extends \Jumbojett\OpenIDConnectClient
* @var array[] email-regexp => [imap-host, smtp-host, oauth-provider, client-id, client-secret, scopes] pairs * @var array[] email-regexp => [imap-host, smtp-host, oauth-provider, client-id, client-secret, scopes] pairs
*/ */
public static $oauth_domain_regexps = [ public static $oauth_domain_regexps = [
'/(^|@)([^.]\.onmicrosoft\.com)$/i' => ['outlook.office365.com', 'smtp.office365.com', 'login.microsoftonline.com/$2', '/(^|@)([^.]+\.onmicrosoft\.com)$/i' => ['outlook.office365.com', 'smtp.office365.com', 'login.microsoftonline.com/$2',
'e09fe57b-ffc5-496e-9ef8-3e6c7d628c09', 'Hd18Q~t-8_-ImvPFXlh8DSFjWKYyvpUTqURRJc7i', 'e09fe57b-ffc5-496e-9ef8-3e6c7d628c09', 'Hd18Q~t-8_-ImvPFXlh8DSFjWKYyvpUTqURRJc7i',
'https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/POP.AccessAsUser.All https://outlook.office.com/SMTP.Send offline_access email', 'https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/POP.AccessAsUser.All https://outlook.office.com/SMTP.Send offline_access email',
[self::ADD_CLIENT_TO_WELL_KNOWN => 'appid']], [self::ADD_CLIENT_TO_WELL_KNOWN => 'appid']],