From 179781956d36507930671466f0f69f3d9c9e6064 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 9 Nov 2022 14:22:09 +0100
Subject: [PATCH] Removed Microsoft client secret

---
 app/src/amazon/AndroidManifest.xml | 11 +++++++++++
 app/src/fdroid/AndroidManifest.xml | 11 +++++++++++
 app/src/github/AndroidManifest.xml | 11 +++++++++++
 app/src/main/AndroidManifest.xml   | 11 +++++++++++
 app/src/main/res/xml/providers.xml |  8 +++-----
 app/src/play/AndroidManifest.xml   | 11 +++++++++++
 6 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 3f86922c8e..3876275d1c 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -480,6 +480,17 @@
 
                 <data android:scheme="eu.faircode.email.debug" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="auth"
+                    android:scheme="msauth.eu.faircode.email" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 644e4fe7ff..0f84258174 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -486,6 +486,17 @@
 
                 <data android:scheme="eu.faircode.email.debug" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="auth"
+                    android:scheme="msauth.eu.faircode.email" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index d8b9597def..fc03c2a2bd 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -486,6 +486,17 @@
 
                 <data android:scheme="eu.faircode.email.debug" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="auth"
+                    android:scheme="msauth.eu.faircode.email" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d6a6cd9017..9bf5af6b78 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -478,6 +478,17 @@
 
                 <data android:scheme="eu.faircode.email.debug" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="auth"
+                    android:scheme="msauth.eu.faircode.email" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 2ccb2e5443..44b5794644 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -130,16 +130,16 @@
             askAccount="true"
             authorizationEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/authorize"
             clientId="3514cf2c-e7a3-45a2-80d4-6a3c3498eca0"
-            clientSecret="r=o4@SlzU:MA6MlXM6mPG[44i4gYPq[@"
             enabled="true"
             privacy="https://privacy.microsoft.com/privacystatement"
             prompt="login"
-            redirectUri="https://oauth.faircode.eu/"
+            redirectUri="msauth.eu.faircode.email://auth"
             scopes="profile,openid,email,offline_access,https://outlook.office.com/IMAP.AccessAsUser.All,https://outlook.office.com/SMTP.Send"
             tokenEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token"
             tokenScopes="true" />
         <!-- https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow -->
         <!-- https://docs.microsoft.com/en-us/exchange/client-developer/legacy-protocols/how-to-authenticate-an-imap-pop-smtp-application-by-using-oauth -->
+        <!-- https://learn.microsoft.com/en-us/azure/active-directory/develop/redirect-uris-ios -->
     </provider>
     <provider
         name="Outlook"
@@ -167,15 +167,13 @@
             askAccount="true"
             authorizationEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/authorize"
             clientId="17e57eca-a59b-4574-ac91-b343004898a6"
-            clientSecret="k847Q~ZKtIBNp~ls_riKEbFDsvOQEdUA.YDNt"
             enabled="false"
             privacy="https://privacy.microsoft.com/privacystatement"
             prompt="login"
-            redirectUri="https://oauth.faircode.eu/"
+            redirectUri="msauth.eu.faircode.email://auth"
             scopes="openid,email,offline_access,https://outlook.office.com/IMAP.AccessAsUser.All,https://outlook.office.com/SMTP.Send"
             tokenEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token"
             tokenScopes="true" />
-        <!-- https://docs.microsoft.com/en-us/exchange/client-developer/legacy-protocols/how-to-authenticate-an-imap-pop-smtp-application-by-using-oauth -->
     </provider>
     <!-- needs subscription -->
     <provider
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index c053aa18c9..3729359786 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -480,6 +480,17 @@
 
                 <data android:scheme="eu.faircode.email.debug" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="auth"
+                    android:scheme="msauth.eu.faircode.email" />
+            </intent-filter>
         </activity>
 
         <activity