feat: cli uninstall

packages/cli/.vscode/launch.json

@@ -113,6 +113,25 @@
         "${workspaceFolder}/../api/build/**/*.js"
       ],
       "console": "integratedTerminal"
+    },
+    {
+      "type": "pwa-node",
+      "request": "launch",
+      "name": "Launch uninstall command",
+      "skipFiles": ["<node_internals>/**"],
+      "program": "${workspaceFolder}/cli.js",
+      "args": ["uninstall"],
+      "outFiles": [
+        "${workspaceFolder}/lib/**/*.js",
+        "${workspaceFolder}/../fx-core/build/**/*.js",
+        "${workspaceFolder}/../api/build/**/*.js"
+      ],
+      "resolveSourceMapLocations": [
+        "${workspaceFolder}/lib/**/*.js",
+        "${workspaceFolder}/../fx-core/build/**/*.js",
+        "${workspaceFolder}/../api/build/**/*.js"
+      ],
+      "console": "integratedTerminal"
     }
   ]
 }

packages/cli/src/commands/models/m365Unacquire.ts

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-import { CLICommand, err, ok } from "@microsoft/teamsfx-api";
-import { PackageService } from "@microsoft/teamsfx-core";
+import { CLICommand, Platform, err, ok } from "@microsoft/teamsfx-api";
+import { PackageService, UninstallInputs } from "@microsoft/teamsfx-core";
 import { logger } from "../../commonlib/logger";
 import { MissingRequiredOptionError } from "../../error";
 import { commands } from "../../resource";
 import { TelemetryEvent } from "../../telemetry/cliTelemetryEvents";
 import { m365utils, sideloadingServiceEndpoint } from "./m365Sideloading";
+import { getFxCore } from "../../activate";
 
 export const m365UnacquireCommand: CLICommand = {
   name: "uninstall",
@@ -23,35 +24,37 @@
       description: commands.uninstall.options["manifest-id"],
       type: "string",
     },
+    {
+      name: "env",
+      description: commands.uninstall.options["env"],
+      type: "string",
+    },
   ],
   examples: [
     {
       command: `${process.env.TEAMSFX_CLI_BIN_NAME} uninstall --title-id U_xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`,
       description: "Remove the acquired M365 App by Title ID",
     },
     {
-      command: `${process.env.TEAMSFX_CLI_BIN_NAME} uninstall --manifest-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`,
+      command: `${process.env.TEAMSFX_CLI_BIN_NAME} uninstall --manifest-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx -i false --m365-app --app-refistration --bot-framework-registration`,
       description: "Remove the acquired M365 App by Manifest ID",
     },
+    {
+      command: `${process.env.TEAMSFX_CLI_BIN_NAME} uninstall --env xxx -i false --m365-app --app-refistration --bot-framework-registration`,
+      description: "Remove the acquired M365 App by local env",
+    },
   ],
   telemetry: {
     event: TelemetryEvent.M365Unacquire,
   },
-  defaultInteractiveOption: false,
+  defaultInteractiveOption: true,
   handler: async (ctx) => {
-    const packageService = new PackageService(sideloadingServiceEndpoint, logger);
-    let titleId = ctx.optionValues["title-id"] as string;
-    const manifestId = ctx.optionValues["manifest-id"] as string;
-    if (titleId === undefined && manifestId === undefined) {
-      return err(
-        new MissingRequiredOptionError(ctx.command.fullName, `--title-id or --manifest-id`)
-      );
-    }
-    const tokenAndUpn = await m365utils.getTokenAndUpn();
-    if (titleId === undefined) {
-      titleId = await packageService.retrieveTitleId(tokenAndUpn[0], manifestId);
+    const inputs = ctx.optionValues as UninstallInputs;
+    const core = getFxCore();
+    const res = await core.uninstall(inputs);
+    if (res.isErr()) {
+      return err(res.error);
     }
-    await packageService.unacquire(tokenAndUpn[0], titleId);
     return ok(undefined);
   },
 };

packages/cli/src/resource/commands.json

@@ -147,7 +147,8 @@
     "description": "Remove an acquired M365 App.",
     "options": {
       "title-id": "Title ID of the acquired M365 App.",
-      "manifest-id": "Manifest ID of the acquired M365 App."
+      "manifest-id": "Manifest ID of the acquired M365 App.",
+      "env": "Env of the acquired M365 App."
     }
   },
   "update": {

packages/fx-core/resource/package.nls.json

@@ -529,6 +529,30 @@
   "core.copilot.addAPI.success": "%s have(has) been successfully added to %s",
   "core.copilot.addAPI.InjectAPIKeyActionFailed": "Inject API key action to teamsapp.yaml file unsuccessful, make sure the file contains teamsApp/create action in provision section.",
   "core.copilot.addAPI.InjectOAuthActionFailed": "Inject OAuth action to teamsapp.yaml file unsuccessful, make sure the file contains teamsApp/create action in provision section.",
+  "core.uninstall.botNotFound": "Cannot find bot using the manifest ID %s",
+  "core.uninstall.confirm.tdp": "App registration of manifest ID: %s will be uninstalled. Please confirm.",
+  "core.uninstall.confirm.m365App": "M365 App of Title ID: %s will be uninstalled. Please confirm.",
+  "core.uninstall.confirm.bot": "Bot framework registration of bot ID: %s will be uninstalled. Please confirm.",
+  "core.uninstall.confirm.cancel.tdp": "App registration uninstallation cancelled.",
+  "core.uninstall.confirm.cancel.m365App": "M365 App uninstallation cancelled.",
+  "core.uninstall.confirm.cancel.bot": "Bot framework registration uninstallation cancelled.",
+  "core.uninstall.success.tdp": "App registration of manifest ID: %s has been successfully uninstalled.",
+  "core.uninstall.success.m365App": "M365 App of Title ID: %s has been successfully uninstalled.",
+  "core.uninstall.success.delayWarning": "The uninstallation of the M365 app might have some delay.",
+  "core.uninstall.success.bot": "Bot framework registration of bot ID: %s has been successfully uninstalled.",
+  "core.uninstall.failed.titleId": "Failed to find the Title ID. This app is probably not installed.",
+  "core.uninstallQuestion.manifestId": "Manifest ID",
+  "core.uninstallQuestion.env": "Env",
+  "core.uninstallQuestion.titleId": "Title ID",
+  "core.uninstallQuestion.chooseMode": "Choose uninstall mode",
+  "core.uninstallQuestion.manifestIdMode": "By Manfest ID",
+  "core.uninstallQuestion.envMode": "By Env",
+  "core.uninstallQuestion.titleIdMode": "By Title ID",
+  "core.uninstallQuestion.chooseOption": "Choose resources to uninstall",
+  "core.uninstallQuestion.m365Option": "M365 app",
+  "core.uninstallQuestion.tdpOption": "App registration",
+  "core.uninstallQuestion.botOption": "Bot framework registration",
+  "core.uninstallQuestion.projectPath": "Project path",
   "ui.select.LoadingOptionsPlaceholder": "Loading options ...",
   "ui.select.LoadingDefaultPlaceholder": "Loading default value ...",
   "error.aad.manifest.NameIsMissing": "name is missing\n",

packages/fx-core/src/client/teamsDevPortalClient.ts

@@ -274,7 +274,15 @@ export class TeamsDevPortalClient {
     }
     throw new Error(`Cannot get the app definition with app ID ${teamsAppId}`);
   }
-
+  @hooks([ErrorContextMW({ source: "Teams", component: "TeamsDevPortalClient" })])
+  async getBotId(token: string, teamsAppId: string): Promise<string | undefined> {
+    const app = await this.getApp(token, teamsAppId);
+    if (app?.bots?.length && app.bots.length > 0) {
+      return app.bots[0].botId;
+    }
+    TOOLS.logProvider?.error(`botId not found. Input: ${teamsAppId}`);
+    return undefined;
+  }
   @hooks([ErrorContextMW({ source: "Teams", component: "TeamsDevPortalClient" })])
   async getAppPackage(token: string, teamsAppId: string): Promise<any> {
     TOOLS.logProvider?.info("Downloading app package for app " + teamsAppId);