mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Debug: OAuth Outlook/Office 365 (alt)

This commit is contained in:
M66B 2022-12-29 10:23:47 +01:00
parent 6df0d39647
commit 67ade5cc9c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/EmailProvider.java
View File

@ -227,7 +227,12 @@ public class EmailProvider implements Parcelable {
provider.description = xml.getAttributeValue(null, "description");
if (provider.description == null)
provider.description = provider.name;
provider.enabled = getAttributeBooleanValue(xml, "enabled", true);
String enabled = xml.getAttributeValue(null, "enabled");
if ("debug".equals(enabled))
provider.enabled = BuildConfig.DEBUG;
else
provider.enabled = getAttributeBooleanValue(xml, "enabled", true);
String domain = xml.getAttributeValue(null, "domain");
if (domain != null)

11
app/src/main/res/xml/providers.xml
View File

@ -187,8 +187,8 @@
</provider>
<provider
name="Outlook"
description="Outlook"
enabled="false"
description="Outlook/Office 365 (alt)"
enabled="debug"
id="outlook"
link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
maxtls="1.2"
@ -204,11 +204,10 @@
host="smtp.office365.com"
port="587"
starttls="true" />
<!--pop
<pop
host="outlook.office365.com"
port="995"
starttls="false" /-->
<!-- https://outlook.office.com/POP.AccessAsUser.All -->
starttls="false" />
<oauth
askAccount="true"
authorizationEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/authorize"
@ -217,7 +216,7 @@
privacy="https://privacy.microsoft.com/privacystatement"
prompt="login"
redirectUri="msauth.eu.faircode.email://auth"
scopes="openid,email,offline_access,https://outlook.office.com/IMAP.AccessAsUser.All,https://outlook.office.com/SMTP.Send"
scopes="profile,openid,email,offline_access,https://outlook.office.com/IMAP.AccessAsUser.All,https://outlook.office.com/SMTP.Send,https://outlook.office.com/POP.AccessAsUser.All"
tokenEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token"
tokenScopes="true" />
</provider>