refactor: simplify bot sso (#943)

* refactor: simply bot sso * refactor: update * refactor: updat * refactor: update
OfficeDev · Jul 19, 2023 · d70dfc5 · d70dfc5
1 parent 7de40a9
commit d70dfc5
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 267 deletions.
diff --git a/bot-sso/adaptiveCards/learn.json b/bot-sso/adaptiveCards/learn.json
diff --git a/bot-sso/adaptiveCards/welcome.json b/bot-sso/adaptiveCards/welcome.json
diff --git a/bot-sso/appPackage/manifest.json b/bot-sso/appPackage/manifest.json
@@ -41,14 +41,6 @@
                         "groupchat"
                     ],
                     "commands": [
-                        {
-                            "title": "welcome",
-                            "description": "Resend welcome card of this Bot"
-                        },
-                        {
-                            "title": "learn",
-                            "description": "Learn about Adaptive Card and Bot Command"
-                        },
                         {
                             "title": "show",
                             "description": "Show user profile using Single Sign On feature"

diff --git a/bot-sso/commands/SSOCommand.ts b/bot-sso/commands/SSOCommand.ts
@@ -0,0 +1,8 @@
+import { TurnContext } from "botbuilder";
+
+export interface SSOCommand {
+  commandMessage: string;
+  operationWithSSOToken(
+    context: TurnContext, ssoToken: string
+  ): Promise<any> | undefined;
+}
diff --git a/bot-sso/commands/SSOCommandMap.ts b/bot-sso/commands/SSOCommandMap.ts
@@ -0,0 +1,11 @@
+import { SSOCommand } from "./SSOCommand";
+import { ShowUserProfile } from "./showUserProfile";
+
+
+export const SSOCommands: SSOCommand[] = [
+  new ShowUserProfile(),
+];
+
+export const SSOCommandMap: Map<string, SSOCommand> = new Map(
+  SSOCommands.map((command) => [command.commandMessage, command])
+);
diff --git a/bot-sso/commands/index.ts b/bot-sso/commands/index.ts
diff --git a/bot-sso/commands/learn.ts b/bot-sso/commands/learn.ts
diff --git a/bot-sso/commands/showUserProfile.ts b/bot-sso/commands/showUserProfile.ts
@@ -4,17 +4,13 @@ import {
   createMicrosoftGraphClientWithCredential,
   OnBehalfOfUserCredential,
 } from "@microsoft/teamsfx";
-import { SSOCommand } from "../helpers/botCommand";
+import { SSOCommand } from "./SSOCommand";
 import oboAuthConfig from "../authConfig";
 
-export class ShowUserProfile extends SSOCommand {
-  constructor() {
-    super();
-    this.commandMessage = 'show';
-    this.operationWithSSOToken = this.showUserInfo;
-  }
+export class ShowUserProfile implements SSOCommand {
+  commandMessage = 'show';
 
-  async showUserInfo(context: TurnContext, ssoToken: string) {
+  async operationWithSSOToken(context: TurnContext, ssoToken: string) {
     await context.sendActivity("Retrieving user information from Microsoft Graph ...");
 
     // Call Microsoft Graph half of user
@@ -25,8 +21,7 @@ export class ShowUserProfile extends SSOCommand {
     const me = await graphClient.api("/me").get();
     if (me) {
       await context.sendActivity(
-        `You're logged in as ${me.displayName} (${me.userPrincipalName})${
-          me.jobTitle ? `; your job title is: ${me.jobTitle}` : ""
+        `You're logged in as ${me.displayName} (${me.userPrincipalName})${me.jobTitle ? `; your job title is: ${me.jobTitle}` : ""
         }.`
       );
 
@@ -54,4 +49,5 @@ export class ShowUserProfile extends SSOCommand {
       );
     }
   }
+
 }
diff --git a/bot-sso/commands/welcome.ts b/bot-sso/commands/welcome.ts
diff --git a/bot-sso/helpers/botCommand.ts b/bot-sso/helpers/botCommand.ts
diff --git a/bot-sso/helpers/commandHelper.ts b/bot-sso/helpers/commandHelper.ts
diff --git a/bot-sso/helpers/utils.ts b/bot-sso/helpers/utils.ts
diff --git a/bot-sso/package.json b/bot-sso/package.json
@@ -24,8 +24,6 @@
     "@azure/msal-node": "^1.1.0",
     "@microsoft/microsoft-graph-client": "^3.0.1",
     "@microsoft/teamsfx": "^2.0.0",
-    "adaptive-expressions": "^4.15.0",
-    "adaptivecards-templating": "2.1.0",
     "botbuilder": "^4.18.0",
     "botbuilder-dialogs": "^4.18.0",
     "isomorphic-fetch": "^3.0.0",

diff --git a/bot-sso/helpers/ssoDialog.ts → bot-sso/ssoDialog.ts b/bot-sso/helpers/ssoDialog.ts → bot-sso/ssoDialog.ts
@@ -8,15 +8,16 @@ import {
 import {
   Activity,
   ActivityTypes,
+  StatePropertyAccessor,
   Storage,
   tokenExchangeOperationName,
   TurnContext,
 } from "botbuilder";
-import { TeamsBotSsoPrompt } from "@microsoft/teamsfx";
 import "isomorphic-fetch";
-import oboAuthConfig from "../authConfig";
-import config from "../config";
-import { SSOCommandMap } from "../commands";
+import { TeamsBotSsoPrompt } from "@microsoft/teamsfx";
+import oboAuthConfig from "./authConfig";
+import config from "./config";
+import { SSOCommandMap } from "./commands/SSOCommandMap";
 
 const DIALOG_NAME = "SSODialog";
 const MAIN_WATERFALL_DIALOG = "MainWaterfallDialog";
@@ -63,7 +64,7 @@ export class SSODialog extends ComponentDialog {
    * If no dialog is active, it will start the default dialog.
    * @param {*} dialogContext
    */
-  async run(context: TurnContext, dialogState: any) {
+  async run(context: TurnContext, dialogState: StatePropertyAccessor) {
     const dialogSet = new DialogSet(dialogState);
     dialogSet.add(this);
 
@@ -95,11 +96,11 @@ export class SSODialog extends ComponentDialog {
       throw new Error("There is an issue while trying to sign you in and run your command. Please try again.");
     }
     // Once got ssoToken, run operation that depends on ssoToken
-    const operationWithSSO = SSOCommandMap.get(stepContext.options.commandMessage);
-    if (!operationWithSSO) {
+    const SSOCommand = SSOCommandMap.get(stepContext.options.commandMessage);
+    if (!SSOCommand) {
       throw new Error("Can not get sso operation. Please try again.");
     }
-    await operationWithSSO(stepContext.context, tokenResponse.ssoToken);
+    await SSOCommand.operationWithSSOToken(stepContext.context, tokenResponse.ssoToken);
     return await stepContext.endDialog();
   }