From b6008091fbaf70fe94edd8cf79e44fb14085f1eb Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 22 Dec 2019 10:57:17 +0100 Subject: [PATCH] Changed OAuth redirect URI --- app/src/main/AndroidManifest.xml | 3 +-- app/src/main/res/xml/providers.xml | 7 ++++--- tools/assetlinks.json | 2 +- tools/oauth.html | 13 +++++++++---- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c2eaffa110..8834d0992d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -224,8 +224,7 @@ diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml index 3fccf7737b..e28240fce6 100644 --- 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" /> @@ -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" /> @@ -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" /> diff --git a/tools/assetlinks.json b/tools/assetlinks.json index ead6bb01db..b4b4eed76e 100644 --- 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" } }] diff --git a/tools/oauth.html b/tools/oauth.html index fcbbcead42..df7e5c3631 100644 --- a/tools/oauth.html +++ b/tools/oauth.html @@ -5,14 +5,19 @@ FairEmail - OAuth - - -

FairEmail OAuth

- + + +

FairEmail

+

FairEmail

+

OAuth

+

+
+

Privacy policy

+

Copyright © 2018-2019 M. Bokhorst (M66B)