From 67ade5cc9c5b6df6a8e07a4fecb38bc41d884d05 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 29 Dec 2022 10:23:47 +0100
Subject: [PATCH] Debug: OAuth Outlook/Office 365 (alt)

---
 .../main/java/eu/faircode/email/EmailProvider.java    |  7 ++++++-
 app/src/main/res/xml/providers.xml                    | 11 +++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index 03a25a3e2d..708526c0b7 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -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)
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index c5fad1a226..6ffff137e2 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -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>