Added auth dialog but forbidden by google auth iframe policy

ringcentral · Apr 28, 2022 · 28068ff · 28068ff
1 parent 18b44ca
commit 28068ff
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 9 deletions.
diff --git a/src/server/adaptiveCardPayloads/authCard.json b/src/server/adaptiveCardPayloads/authCard.json
@@ -26,8 +26,13 @@
         {
             "type": "Image",
             "selectAction": {
-                "type": "Action.OpenUrl",
-                "url": "${link}"
+                "type": "Action.Submit",
+                "data": {
+                    "actionType": "auth",
+                    "returnDialog": "${returnDialog}",
+                    "botId": "${botId}",
+                    "authLink": "${authLink}"
+                }
             },
             "url": "https://raw.githubusercontent.com/ringcentral/ringcentral-google-drive-notification-add-in/master/staticResources/google-login-button.png"
         },

diff --git a/src/server/handlers/authorizationHandler.js b/src/server/handlers/authorizationHandler.js
@@ -123,7 +123,7 @@ async function oauthCallback(req, res) {
         res.send('Internal error.');
     }
     res.status(200);
-    res.send('<!doctype><html><body>Successfully authorized. You can close this page now.<script>window.close()</script></body></html>')
+    res.send('<!doctype><html><body>Successfully authorized. Please close this page.</body></html>')
 };
 
 async function checkUserFileAccess(googleUser, fileId) {

diff --git a/src/server/handlers/botHandler.js b/src/server/handlers/botHandler.js
@@ -58,7 +58,7 @@ const botHandler = async event => {
                             const authLink = `${oauthApp.code.getUri({
                                 state: `botId=${botForMessage.id}&rcUserId=${userId}`
                             })}&access_type=offline`;
-                            const authCard = cardBuilder.authCard(authLink);
+                            const authCard = cardBuilder.authCard(authLink, botForMessage.id);
                             await botForMessage.sendAdaptiveCard(createGroupResponse.id, authCard);
                         }
                         break;
@@ -228,7 +228,7 @@ async function checkMembersGoogleAccountAuth(bot, groupId) {
             const authLink = `${oauthApp.code.getUri({
                 state: `botId=${bot.id}&rcUserId=${userId}`
             })}&access_type=offline`;
-            const authCard = cardBuilder.authCard(authLink, 'Someone shared a file that requires logging in Google Account to access. Please log in with button below.');
+            const authCard = cardBuilder.authCard(authLink, bot.id, 'Someone shared a file that requires logging in Google Account to access. Please log in with button below.');
             if (rcUser) {
                 if (moment(nowDate).unix() > moment(rcUser.authReminderExpiryDateTime).unix()) {
                     await bot.sendAdaptiveCard(dmGroupId, authCard);

diff --git a/src/server/handlers/interactiveMessageHandler.js b/src/server/handlers/interactiveMessageHandler.js
@@ -4,6 +4,7 @@ const { GoogleUser } = require('../models/googleUserModel');
 const Bot = require('ringcentral-chatbot-core/dist/models/Bot').default;
 const { revokeToken, checkAndRefreshAccessToken } = require('../lib/oauth');
 const cardBuilder = require('../lib/cardBuilder');
+const dialogBuilder = require('../lib/dialogBuilder');
 const rcAPI = require('../lib/rcAPI');
 
 const subscriptionHandler = require('./subscriptionHandler');
@@ -51,13 +52,34 @@ async function interactiveMessages(req, res) {
         // Create/Find DM conversation to the RC user
         const createGroupResponse = await rcAPI.createConversation([rcUserId], bot.token.access_token);
 
-        if (!googleUser) {
+        if (!googleUser && body.data.actionType !== 'auth') {
             await bot.sendMessage(groupId, { text: `![:Person](${rcUserId}) Google Drive account not found. Please message me with \`login\` to login.` });
             res.status(200);
             res.json('OK')
             return;
         }
 
+        if (body.data.returnDialog) {
+            let dialogResponse = {
+                type: "dialog",
+                dialog: null
+            };
+            switch (body.data.actionType) {
+                case 'auth':
+                    const authDialogData = {
+                        title: 'Google Drive Account Login',
+                        iframeURL: body.data.authLink
+                    }
+                    const authDialog = dialogBuilder.getIframeDialog(authDialogData);
+                    dialogResponse.dialog = authDialog;
+                    break;
+            }
+
+            res.status(200);
+            res.send(dialogResponse);
+            return;
+        }
+
         switch (body.data.actionType) {
             case 'unAuthCard':
                 const unAuthCard = cardBuilder.unAuthCard(googleUser.email, rcUserId, bot.id);

diff --git a/src/server/lib/cardBuilder.js b/src/server/lib/cardBuilder.js
@@ -145,12 +145,14 @@ function fileInfoCard(botId, googleFile) {
     return card;
 }
 
-function authCard(authLink, additionalInfoText) {
+function authCard(authLink, botId, additionalInfoText) {
     const template = new Template(authCardTemplateJson);
     const cardData = {
-        link: authLink,
+        authLink,
         additionalInfoText,
-        showAdditionalInfo: additionalInfoText != null
+        showAdditionalInfo: additionalInfoText != null,
+        returnDialog: true,
+        botId
     }
     const card = template.expand({
         $root: cardData

diff --git a/src/server/lib/dialogBuilder.js b/src/server/lib/dialogBuilder.js
@@ -0,0 +1,11 @@
+function getIframeDialog({ title, size, iconURL, iframeURL }) {
+    const dialog = {
+        ...(size !== null && { size }),
+        ...(iconURL !== null && { iconURL }),
+        ...title, iframeURL
+    };
+
+    return dialog;
+}
+
+exports.getIframeDialog = getIframeDialog;