fix(outlook): Fixed Outlook OAuth2 connection

postalsys · Oct 14, 2024 · 920aa20 · 920aa20
1 parent e2e72f0
commit 920aa20
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/lib/account.js b/lib/account.js
@@ -339,10 +339,6 @@ class Account {
             result.path = '*';
         }
 
-        if (result.imap && !result.imapIndexer) {
-            result.imapIndexer = 'full';
-        }
-
         if (typeof result.account === 'undefined') {
             result.account = null;
         }
@@ -738,15 +734,18 @@ class Account {
             throw error;
         }
 
+        let oauth2App;
         if (accountData.oauth2 && accountData.oauth2.provider) {
             // check if this OAuth2 provider exists
-            let oauth2App = await oauth2Apps.get(accountData.oauth2.provider);
+            oauth2App = await oauth2Apps.get(accountData.oauth2.provider);
             if (!oauth2App) {
                 let message = 'Invalid or missing OAuth2 provider';
                 let error = Boom.boomify(new Error(message), { statusCode: 400 });
                 throw error;
             }
-        } else if (accountData.imap && !accountData.imapIndexer) {
+        }
+
+        if (!accountData.imapIndexer && (accountData.imap || (oauth2App && (!oauth2App.baseScopes || oauth2App.baseScopes === 'imap')))) {
             accountData.imapIndexer = (await settings.get('imapIndexer')) || 'full';
         }
 

diff --git a/lib/schemas.js b/lib/schemas.js
@@ -1201,6 +1201,7 @@ const accountSchemas = {
         .description(
             'Sets the account-specific IMAP indexing method. Choose "full" to build a complete index that tracks deleted and updated emails, or "fast" to only detect newly received emails. Defaults to global setting.'
         )
+        .label('IMAPIndexer')
 };
 
 const googleProjectIdSchema = Joi.string().trim().allow('', false, null).max(256).example('project-name-425411').description('Google Cloud Project ID');

diff --git a/workers/api.js b/workers/api.js
@@ -1945,7 +1945,7 @@ const init = async () => {
 
                         let profileRes;
                         try {
-                            profileRes = await oAuth2Client.request(r.access_token, `${oAuth2Client.apiBase}/me`);
+                            profileRes = await oAuth2Client.request(r.access_token, `${oAuth2Client.apiBase}/v1.0/me`);
                         } catch (err) {
                             let response = err.oauthRequest && err.oauthRequest.response;
                             if (response && response.error) {
@@ -3372,14 +3372,16 @@ const init = async () => {
                     result[key] = result[key] || null;
                 }
 
+                let oauth2App;
                 if (accountData.oauth2 && accountData.oauth2.provider) {
-                    let app = await oauth2Apps.get(accountData.oauth2.provider);
+                    oauth2App = await oauth2Apps.get(accountData.oauth2.provider);
 
-                    if (app) {
-                        result.type = app.provider;
-                        if (app.id !== app.provider) {
-                            result.app = app.id;
+                    if (oauth2App) {
+                        result.type = oauth2App.provider;
+                        if (oauth2App.id !== oauth2App.provider) {
+                            result.app = oauth2App.id;
                         }
+                        result.baseScopes = oauth2App.baseScope || 'imap';
                     } else {
                         result.type = 'oauth2';
                     }
@@ -3389,6 +3391,10 @@ const init = async () => {
                     result.type = 'sending';
                 }
 
+                if ((accountData.imap || (oauth2App && (!oauth2App.baseScopes || oauth2App.baseScopes === 'imap'))) && !result.imapIndexer) {
+                    result.imapIndexer = 'full';
+                }
+
                 if (accountData.sync) {
                     result.syncTime = accountData.sync;
                 }
@@ -3466,6 +3472,8 @@ const init = async () => {
 
                     path: accountPathSchema.example(['*']).label('AccountPath'),
 
+                    imapIndexer: accountSchemas.imapIndexer,
+
                     subconnections: accountSchemas.subconnections,
 
                     webhooks: Joi.string()
@@ -3513,6 +3521,12 @@ const init = async () => {
 
                     type: AccountTypeSchema,
                     app: Joi.string().max(256).example('AAABhaBPHscAAAAH').description('OAuth2 application ID'),
+                    baseScopes: Joi.string()
+                        .empty('')
+                        .trim()
+                        .valid(...['imap', 'api', 'pubsub'])
+                        .example('imap')
+                        .description('OAuth2 Base Scopes'),
 
                     counters: accountCountersSchema,