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

Changed OAuth redirect URI

This commit is contained in:
M66B 2019-12-22 10:57:17 +01:00
parent a51c8bd6db
commit b6008091fb
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@ -224,8 +224,7 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data <data
android:host="email.faircode.eu" android:host="oauth.faircode.eu"
android:path="/oauth/"
android:scheme="https" /> android:scheme="https" />
</intent-filter> </intent-filter>

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

@ -20,7 +20,7 @@
clientId="803253368361-574lor1js3csqif9nogkhk5m7688af3c.apps.googleusercontent.com" clientId="803253368361-574lor1js3csqif9nogkhk5m7688af3c.apps.googleusercontent.com"
clientSecret="9iyiDx1LEfpg3fpH6DqzoIcG" clientSecret="9iyiDx1LEfpg3fpH6DqzoIcG"
enabled="true" enabled="true"
redirectUri="https://email.faircode.eu/oauth/" redirectUri="https://oauth.faircode.eu/"
scopes="https://mail.google.com/" scopes="https://mail.google.com/"
tokenEndpoint="https://oauth2.googleapis.com/token" /> tokenEndpoint="https://oauth2.googleapis.com/token" />
<!-- https://email.faircode.eu/.well-known/assetlinks.json --> <!-- https://email.faircode.eu/.well-known/assetlinks.json -->
@ -45,7 +45,8 @@
authorizationEndpoint="https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize" authorizationEndpoint="https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize"
clientId="3514cf2c-e7a3-45a2-80d4-6a3c3498eca0" clientId="3514cf2c-e7a3-45a2-80d4-6a3c3498eca0"
enabled="false" 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" scopes="openid,offline_access,profile,email,User.Read,Mail.ReadWrite,Mail.Send,MailboxSettings.ReadWrite"
tokenEndpoint="https://login.microsoftonline.com/organizations/oauth2/v2.0/token" /> tokenEndpoint="https://login.microsoftonline.com/organizations/oauth2/v2.0/token" />
</provider> </provider>
@ -80,7 +81,7 @@
clientId="dj0yJmk9eDZYbnFSMkVtMEdMJmQ9WVdrOVdXOUZabXBwTnpnbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWJm" clientId="dj0yJmk9eDZYbnFSMkVtMEdMJmQ9WVdrOVdXOUZabXBwTnpnbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWJm"
clientSecret="927650c8ce98b653d7f88d0398a192dc44cedcd2" clientSecret="927650c8ce98b653d7f88d0398a192dc44cedcd2"
enabled="false" enabled="false"
redirectUri="https://email.faircode.eu/oauth/" redirectUri="https://oauth.faircode.eu/"
scopes="mail-w" scopes="mail-w"
tokenEndpoint="https://api.login.aol.com/oauth2/get_token" /> tokenEndpoint="https://api.login.aol.com/oauth2/get_token" />
</provider> </provider>

2
tools/assetlinks.json
View File

@ -10,5 +10,5 @@
}, },
{ {
"relation": ["delegate_permission/common.handle_all_urls"], "relation": ["delegate_permission/common.handle_all_urls"],
"target": { "namespace": "web", "site": "https://email.faircode.eu" } "target": { "namespace": "web", "site": "https://oauth.faircode.eu" }
}] }]

13
tools/oauth.html
View File

@ -5,14 +5,19 @@
<meta http-equiv="x-ua-compatible" content="ie=edge" /> <meta http-equiv="x-ua-compatible" content="ie=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>FairEmail - OAuth</title> <title>FairEmail - OAuth</title>
</head>
<body>
<h1>FairEmail OAuth</h1>
<script> <script>
function oauth() { function oauth() {
document.location = 'eu.faircode.email://oauth' + window.location.search; document.location = 'eu.faircode.email://oauth' + window.location.search;
} }
</script> </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> </body>
</html> </html>