Changed OAuth redirect URI

5 years ago · b6008091fb
parent a51c8bd6db
commit b6008091fb
4 changed files with 15 additions and 10 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -224,8 +224,7 @@
                <category android:name="android.intent.category.BROWSABLE" />

                <data
-                    android:host="email.faircode.eu"
-                    android:path="/oauth/"
+                    android:host="oauth.faircode.eu"
                    android:scheme="https" />
            </intent-filter>

--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@ -20,7 +20,7 @@
            clientId="803253368361-574lor1js3csqif9nogkhk5m7688af3c.apps.googleusercontent.com"
            clientSecret="9iyiDx1LEfpg3fpH6DqzoIcG"
            enabled="true"
-            redirectUri="https://email.faircode.eu/oauth/"
+            redirectUri="https://oauth.faircode.eu/"
            scopes="https://mail.google.com/"
            tokenEndpoint="https://oauth2.googleapis.com/token" />
        <!-- https://email.faircode.eu/.well-known/assetlinks.json -->
@ -45,7 +45,8 @@
            authorizationEndpoint="https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize"
            clientId="3514cf2c-e7a3-45a2-80d4-6a3c3498eca0"
            enabled="false"
-            redirectUri="https://email.faircode.eu/oauth/"
+            clientSecret="MZaRn@liyA0T98GwdRDK:m-cSWrUgA9:"
+            redirectUri="https://oauth.faircode.eu/"
            scopes="openid,offline_access,profile,email,User.Read,Mail.ReadWrite,Mail.Send,MailboxSettings.ReadWrite"
            tokenEndpoint="https://login.microsoftonline.com/organizations/oauth2/v2.0/token" />
    </provider>
@ -80,7 +81,7 @@
            clientId="dj0yJmk9eDZYbnFSMkVtMEdMJmQ9WVdrOVdXOUZabXBwTnpnbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWJm"
            clientSecret="927650c8ce98b653d7f88d0398a192dc44cedcd2"
            enabled="false"
-            redirectUri="https://email.faircode.eu/oauth/"
+            redirectUri="https://oauth.faircode.eu/"
            scopes="mail-w"
            tokenEndpoint="https://api.login.aol.com/oauth2/get_token" />
    </provider>
--- a/tools/assetlinks.json
+++ b/tools/assetlinks.json
@ -10,5 +10,5 @@
 },
 {
  "relation": ["delegate_permission/common.handle_all_urls"],
-  "target": { "namespace": "web", "site": "https://email.faircode.eu" }
+  "target": { "namespace": "web", "site": "https://oauth.faircode.eu" }
 }]
--- a/tools/oauth.html
+++ b/tools/oauth.html
@ -5,14 +5,19 @@
    <meta http-equiv="x-ua-compatible" content="ie=edge" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <title>FairEmail - OAuth</title>
-</head>
-<body>
-    <h1>FairEmail OAuth</h1>
    <script>
        function oauth() {
            document.location = 'eu.faircode.email://oauth' + window.location.search;
        }
    </script>
-    <button onclick="oauth()">Continue</button>
+</head>
+<body>
+    <h1>FairEmail</h1>
+    <p><img src="/ic_launcher-web.png" alt="FairEmail" height="72" width="72" /></p>
+    <h2>OAuth</h2>
+    <p><button onclick="oauth()">Continue</button></p>
+    <br />
+	<p><a href="https://email.faircode.eu/privacy/">Privacy policy</a></p>
+	<p>Copyright &copy; 2018-2019 M. Bokhorst (M66B)</p>
 </body>
 </html>