Updated error message for Gmail Pub/Sub failures

postalsys · Feb 12, 2025 · 5c8d855 · 5c8d855
1 parent c32edf8
commit 5c8d855
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/lib/oauth2-apps.js b/lib/oauth2-apps.js
@@ -863,12 +863,22 @@ class OAuth2AppsHandler {
             switch (err?.oauthRequest?.response?.error?.code) {
                 case 403:
                     // no permissions
-                    this.setMeta(appData.id, {
-                        authFlag: {
-                            message:
-                                'Service client does not have permissions to view Pub/Sub topics. Make sure the role for the service user is "Pub/Sub Admin".'
-                        }
-                    });
+                    if (/Cloud Pub\/Sub API has not been used in project/.test(err?.oauthRequest?.response?.error?.message)) {
+                        this.setMeta(appData.id, {
+                            authFlag: {
+                                message:
+                                    'Enable the Cloud Pub/Sub API for your project before using the service client. Check the server response below for details.',
+                                description: err?.oauthRequest?.response?.error?.message
+                            }
+                        });
+                    } else {
+                        this.setMeta(appData.id, {
+                            authFlag: {
+                                message: 'Service client does not have permission to manage Pub/Sub topics. Grant the service user the "Pub/Sub Admin" role.'
+                            }
+                        });
+                    }
+
                     throw err;
                 case 404: {
                     // does not exist
@@ -898,7 +908,7 @@ class OAuth2AppsHandler {
                                 this.setMeta(appData.id, {
                                     authFlag: {
                                         message:
-                                            'Service client does not have permissions to modify Pub/Sub topics. Make sure the role for the service user is "Pub/Sub Admin".'
+                                            'Service client does not have permission to manage Pub/Sub topics. Grant the service user the "Pub/Sub Admin" role.'
                                     }
                                 });
                                 throw err;
@@ -932,8 +942,7 @@ class OAuth2AppsHandler {
                     // no permissions
                     this.setMeta(appData.id, {
                         authFlag: {
-                            message:
-                                'Service client does not have permissions to view Pub/Sub subscriptions. Make sure the role for the service user is "Pub/Sub Admin".'
+                            message: 'Service client does not have permission to view Pub/Sub topics. Grant the service user the "Pub/Sub Admin" role.'
                         }
                     });
                     throw err;
@@ -977,7 +986,7 @@ class OAuth2AppsHandler {
                                 this.setMeta(appData.id, {
                                     authFlag: {
                                         message:
-                                            'Service client does not have permissions to modify Pub/Sub subscriptions. Make sure the role for the service user is "Pub/Sub Admin".'
+                                            'Service client does not have permission to manage Pub/Sub topics. Grant the service user the "Pub/Sub Admin" role.'
                                     }
                                 });
                                 throw err;
@@ -1021,8 +1030,7 @@ class OAuth2AppsHandler {
                     // no permissions
                     this.setMeta(appData.id, {
                         authFlag: {
-                            message:
-                                'Service client does not have permissions to modify Pub/Sub policies. Make sure the role for the service user is "Pub/Sub Admin".'
+                            message: 'Service client does not have permission to view Pub/Sub topics. Grant the service user the "Pub/Sub Admin" role.'
                         }
                     });
                     throw err;
@@ -1065,8 +1073,7 @@ class OAuth2AppsHandler {
                         // no permissions
                         this.setMeta(appData.id, {
                             authFlag: {
-                                message:
-                                    'Service client does not have permissions to modify Pub/Sub policies. Make sure the role for the service user is "Pub/Sub Admin".'
+                                message: 'Service client does not have permission to manage Pub/Sub topics. Grant the service user the "Pub/Sub Admin" role.'
                             }
                         });
                         throw err;