mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-29 03:05:31 +00:00
Code Issues Releases Wiki Activity

Outlook shared mailbox support

Browse source
This commit is contained in:
M66B 2021-08-19 21:00:14 +02:00
parent 73226df056
commit de5d621d81
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/java/eu/faircode/email/FragmentOAuth.java
View file

@ -490,18 +490,29 @@ public class FragmentOAuth extends FragmentBase {
String iprotocol = (provider.smtp.starttls ? "smtp" : "smtps"); String iprotocol = (provider.smtp.starttls ? "smtp" : "smtps");
int iencryption = (provider.smtp.starttls ? EmailService.ENCRYPTION_STARTTLS : EmailService.ENCRYPTION_SSL); int iencryption = (provider.smtp.starttls ? EmailService.ENCRYPTION_STARTTLS : EmailService.ENCRYPTION_SSL);
String username = address; /*
* Outlook shared mailbox
* Authenticate: main/shared account
* IMAP: shared account
* SMTP: main account
* https://docs.microsoft.com/en-us/exchange/client-developer/legacy-protocols/how-to-authenticate-an-imap-pop-smtp-application-by-using-oauth#sasl-xoauth2-authentication-for-shared-mailboxes-in-office-365
*/
String username;
String sharedname;
int backslash = address.indexOf('\\');
if (backslash > 0) {
username = address.substring(0, backslash);
sharedname = address.substring(backslash + 1);
} else {
username = address;
sharedname = null;
}
List<String> usernames = new ArrayList<>(); List<String> usernames = new ArrayList<>();
usernames.add(address); usernames.add(sharedname == null ? username : sharedname);
// Outlook shared mailbox if (token != null && sharedname == null) {
// https://docs.microsoft.com/en-us/exchange/client-developer/legacy-protocols/how-to-authenticate-an-imap-pop-smtp-application-by-using-oauth#sasl-xoauth2-authentication-for-shared-mailboxes-in-office-365
int backslash = address.indexOf('\\');
if (backslash > 0)
usernames.add(address.substring(backslash + 1));
if (token != null) {
// https://docs.microsoft.com/en-us/azure/active-directory/develop/access-tokens // https://docs.microsoft.com/en-us/azure/active-directory/develop/access-tokens
String[] segments = token.split("\\."); String[] segments = token.split("\\.");
if (segments.length > 1) if (segments.length > 1)
@ -532,7 +543,7 @@ public class FragmentOAuth extends FragmentBase {
} }
} }
if (jwt != null) { if (jwt != null && sharedname == null) {
// https://docs.microsoft.com/en-us/azure/active-directory/develop/id-tokens // https://docs.microsoft.com/en-us/azure/active-directory/develop/id-tokens
String[] segments = jwt.split("\\."); String[] segments = jwt.split("\\.");
if (segments.length > 1) if (segments.length > 1)
@ -617,7 +628,7 @@ public class FragmentOAuth extends FragmentBase {
List<Pair<String, String>> identities = new ArrayList<>(); List<Pair<String, String>> identities = new ArrayList<>();
if (askAccount) if (askAccount)
identities.add(new Pair<>(address, personal)); identities.add(new Pair<>(username, personal));
else if ("mailru".equals(id)) { else if ("mailru".equals(id)) {
URL url = new URL("https://oauth.mail.ru/userinfo?access_token=" + token); URL url = new URL("https://oauth.mail.ru/userinfo?access_token=" + token);
Log.i("GET " + url); Log.i("GET " + url);
@ -637,9 +648,8 @@ public class FragmentOAuth extends FragmentBase {
Log.i("json=" + json); Log.i("json=" + json);
JSONObject data = new JSONObject(json); JSONObject data = new JSONObject(json);
name = data.getString("name"); name = data.getString("name");
address = data.getString("email"); username = data.getString("email");
username = address; identities.add(new Pair<>(username, name));
identities.add(new Pair<>(address, name));
} finally { } finally {
connection.disconnect(); connection.disconnect();
} }
@ -665,7 +675,7 @@ public class FragmentOAuth extends FragmentBase {
aservice.connect( aservice.connect(
provider.imap.host, provider.imap.port, provider.imap.host, provider.imap.port,
AUTH_TYPE_OAUTH, provider.id, AUTH_TYPE_OAUTH, provider.id,
username, state, sharedname == null ? username : sharedname, state,
null, null); null, null);
folders = aservice.getFolders(); folders = aservice.getFolders();
@ -705,11 +715,11 @@ public class FragmentOAuth extends FragmentBase {
account.port = provider.imap.port; account.port = provider.imap.port;
account.auth_type = AUTH_TYPE_OAUTH; account.auth_type = AUTH_TYPE_OAUTH;
account.provider = provider.id; account.provider = provider.id;
account.user = username; account.user = (sharedname == null ? username : sharedname);
account.password = state; account.password = state;
int at = address.indexOf('@'); int at = account.user.indexOf('@');
String user = address.substring(0, at); String user = account.user.substring(0, at);
account.name = provider.name + "/" + user; account.name = provider.name + "/" + user;