fix(oauth2-error): If OAuth2 app is failing then show an indication a…

…bout it on the account page
postalsys · Mar 19, 2024 · dd44cd5 · dd44cd5
1 parent 024a686
commit dd44cd5
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/lib/mailbox.js b/lib/mailbox.js
@@ -353,7 +353,7 @@ class Mailbox {
     }
 
     async select(skipIdle) {
-        let lock = await this.getMailboxLock(null, { description: `Select mailbox ${this.path}` });
+        let lock = await this.getMailboxLock(null, { description: `Select mailbox: ${this.path}` });
         // have to release the lock immediatelly, otherwise difficult to process 'exists' / 'expunge' events
         lock.release();
 
@@ -2075,7 +2075,7 @@ class Mailbox {
 
         let lock;
         if (!options.skipLock) {
-            lock = await this.getMailboxLock(connectionClient, { description: `Get text ${message.uid}` });
+            lock = await this.getMailboxLock(connectionClient, { description: `Get text: ${message.uid}` });
         }
 
         try {
@@ -2133,7 +2133,7 @@ class Mailbox {
         options = options || {};
         const connectionClient = await this.connection.getImapConnection(allowSecondary);
 
-        let lock = await this.getMailboxLock(connectionClient, { description: `Get attachment ${message.uid}:${part}` });
+        let lock = await this.getMailboxLock(connectionClient, { description: `Get attachment: ${message.uid}/${part}` });
 
         let streaming = false;
         let released = false;
@@ -2202,7 +2202,7 @@ class Mailbox {
         try {
             let lock;
             if (!options.skipLock) {
-                lock = await this.getMailboxLock(connectionClient, { description: `Get message ${message.uid}` });
+                lock = await this.getMailboxLock(connectionClient, { description: `Get message: ${message.uid}` });
             }
 
             try {
@@ -2365,7 +2365,7 @@ class Mailbox {
 
         const connectionClient = await this.connection.getImapConnection(allowSecondary);
 
-        let lock = await this.getMailboxLock(connectionClient, { description: `Update message ${message.uid}` });
+        let lock = await this.getMailboxLock(connectionClient, { description: `Update message: ${message.uid}` });
 
         try {
             let result = {};
@@ -2503,7 +2503,7 @@ class Mailbox {
 
         const connectionClient = await this.connection.getImapConnection(allowSecondary);
 
-        let lock = await this.getMailboxLock(connectionClient, { description: `Move message ${message.uid}` });
+        let lock = await this.getMailboxLock(connectionClient, { description: `Move message: ${message.uid} to: ${target.path}` });
 
         try {
             let result = {};
@@ -2532,7 +2532,7 @@ class Mailbox {
 
         const connectionClient = await this.connection.getImapConnection(allowSecondary);
 
-        let lock = await this.getMailboxLock(connectionClient, { description: `Move messages` });
+        let lock = await this.getMailboxLock(connectionClient, { description: `Move messages to: ${target.path}` });
 
         try {
             let result = {};
@@ -2561,7 +2561,7 @@ class Mailbox {
     async deleteMessage(message, force, allowSecondary) {
         const connectionClient = await this.connection.getImapConnection(allowSecondary);
 
-        let lock = await this.getMailboxLock(connectionClient, { description: `Delete message ${message.uid}` });
+        let lock = await this.getMailboxLock(connectionClient, { description: `Delete message: ${message.uid}` });
 
         try {
             let result = {};

diff --git a/lib/oauth/outlook.js b/lib/oauth/outlook.js
@@ -21,7 +21,8 @@ const checkForFlags = err => {
 
     if (error === 'invalid_client' && /AADSTS7000222/i.test(description)) {
         return {
-            message: 'OAuth Client Secret for Outlook is either expired or not yet valid'
+            message: 'OAuth Client Secret for Outlook is either expired or not yet valid',
+            description
         };
     }
 

diff --git a/views/accounts/account.hbs b/views/accounts/account.hbs
@@ -203,6 +203,18 @@
             <dd class="col-sm-9">
                 <a href="/admin/config/oauth/app/{{account.oauth2.app.id}}">{{account.type.comment}}</a>
                 (<em>{{account.oauth2.app.id}}</em>)
+
+                {{#if account.oauth2.app.meta.authFlag}}
+
+                <a href="#" tabindex="-1" role="button" data-toggle="popover" data-trigger="hover"
+                    style="dispaly: inline-block;" data-title="OAuth2 application failure"
+                    data-content="{{account.oauth2.app.meta.authFlag.message}}"><i
+                        class="fas fa-exclamation-triangle text-danger"></i></a>
+
+
+                {{/if}}
+
+
             </dd>
             {{else}}
             <dd class="col-sm-9">{{account.type.comment}}</dd>

diff --git a/views/config/oauth/app.hbs b/views/config/oauth/app.hbs
@@ -125,7 +125,16 @@
         {{/if}}
 
         {{#if app.meta.authFlag}}
-        <div class="alert alert-danger">{{app.meta.authFlag.message}}</div>
+        <div class="alert alert-danger">{{app.meta.authFlag.message}}
+
+            {{#if app.meta.authFlag.description}}
+            <hr>
+            <p class="mb-0">
+                <small>{{app.meta.authFlag.description}}</small>
+            </p>
+            {{/if}}
+
+        </div>
         <hr>
         {{/if}}