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

Transition to Outlook/pcke

This commit is contained in:
M66B 2022-11-10 22:30:38 +01:00
parent 0dc4544606
commit 2e5b3a9ea1
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/EntityAccount.java
View File

@ -178,7 +178,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
}
static boolean isOutlook(String id) {
return ("office365".equals(id) || "outlook".equals(id));
return ("office365".equals(id) || "office365pcke".equals(id) || "outlook".equals(id));
}
boolean isYahooJp() {

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

@ -107,6 +107,7 @@
<provider
name="Outlook"
description="Outlook/Office 365"
enabled="false"
id="office365"
link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
noop="true"
@ -142,6 +143,43 @@
<!-- 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"
description="Outlook/Office 365"
id="office365pcke"
link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
noop="true"
order="5"
partial="false"
useip="false">
<imap
host="outlook.office365.com"
port="993"
starttls="false" />
<smtp
host="smtp.office365.com"
port="587"
starttls="true" />
<!--pop
host="outlook.office365.com"
port="995"
starttls="false" /-->
<!-- https://outlook.office.com/POP.AccessAsUser.All -->
<oauth
askAccount="true"
authorizationEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/authorize"
clientId="3514cf2c-e7a3-45a2-80d4-6a3c3498eca0"
enabled="true"
privacy="https://privacy.microsoft.com/privacystatement"
prompt="login"
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"
description="Outlook"