@microsoft/teamsfx-core 1.23.3 → 2.0.0-alpha.14ea2b310.0

package/build/component/driver/arm/deployImpl.js

@@ -4,6 +4,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArmDeployImpl = void 0;
 const tslib_1 = require("tslib");
+/**
+ * @author xzf0587 <zhaofengxu@microsoft.com>
+ */
 const constant_1 = require("./constant");
 const validator_1 = require("./validator");
 const util_1 = require("./util/util");
@@ -14,10 +17,11 @@ const common_1 = require("../../utils/common");
 const cpUtils_1 = require("../../../common/cpUtils");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const arm_resources_1 = require("@azure/arm-resources");
-const constants_2 = require("../../constants");
-const invalidParameterUserError_1 = require("../aad/error/invalidParameterUserError");
 const bicepChecker_1 = require("../../utils/depsChecker/bicepChecker");
 const arm_1 = require("../../arm");
+const common_2 = require("../../../error/common");
+const azure_1 = require("../../../error/azure");
+const arm_2 = require("../../../error/arm");
 const helpLink = "https://aka.ms/teamsfx-actions/arm-deploy";
 class ArmDeployImpl {
     constructor(args, context) {
@@ -43,7 +47,7 @@ class ArmDeployImpl {
     async validateArgs() {
         const invalidParameters = await validator_1.validateArgs(this.args);
         if (invalidParameters.length > 0) {
-            throw new invalidParameterUserError_1.InvalidParameterUserError(constant_1.Constants.actionName, invalidParameters, helpLink);
+            throw new common_2.InvalidActionInputError(constant_1.Constants.actionName, invalidParameters, helpLink);
         }
     }
     async ensureBicepCli() {
@@ -52,7 +56,7 @@ class ArmDeployImpl {
     async createClient() {
         const azureToken = await this.context.azureAccountProvider.getIdentityCredentialAsync();
         if (!azureToken) {
-            throw new teamsfx_api_1.SystemError(constants_1.PluginDisplayName.Solution, constants_2.SolutionError.FailedToGetAzureCredential, localizeUtils_1.getDefaultString("core.deployArmTemplates.InvalidAzureCredential"), localizeUtils_1.getLocalizedString("core.deployArmTemplates.InvalidAzureCredential"));
+            throw new azure_1.InvalidAzureCredentialError();
         }
         this.client = new arm_resources_1.ResourceManagementClient(azureToken, this.args.subscriptionId);
     }
@@ -81,7 +85,6 @@ class ArmDeployImpl {
             deploymentName: templateArg.deploymentName,
         };
         try {
-            const progressBar = await this.context.createProgressBar(`Deploy arm: ${templateArg.deploymentName}`, 1);
             const parameters = await this.getDeployParameters(templateArg.parameters);
             const template = await this.getDeployTemplate(templateArg.path);
             const deploymentParameters = {
@@ -92,15 +95,12 @@ class ArmDeployImpl {
                 },
             };
             const res = await this.executeDeployment(templateArg, deploymentParameters, deployCtx);
-            progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(res.isOk() ? true : false);
             return res;
         }
         catch (error) {
-            return teamsfx_api_1.err(new teamsfx_api_1.UserError({
-                error,
-                source: constants_2.SolutionSource,
-                name: constants_2.SolutionError.FailedToDeployArmTemplatesToAzure,
-            }));
+            if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError)
+                return teamsfx_api_1.err(error);
+            return teamsfx_api_1.err(new arm_2.DeployArmError(deployCtx.deploymentName, deployCtx.resourceGroupName, error));
         }
     }
     async executeDeployment(templateArg, deploymentParameters, deployCtx) {
@@ -145,7 +145,7 @@ class ArmDeployImpl {
             return JSON.parse(result);
         }
         catch (err) {
-            throw new Error(localizeUtils_1.getDefaultString("driver.arm.error.CompileBicepFailed", err.message));
+            throw new arm_2.CompileBicepError(filePath, err);
         }
     }
     setTelemetries() {

package/build/component/driver/arm/deployImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployImpl.js","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deployImpl.js","sourceRoot":"","sources":["../../../../src/component/driver/arm/deployImpl.ts"],"names":[],"mappings":"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"}

package/build/component/driver/arm/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/arm/util/util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG9D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,OAAO,CAQ9D;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMzD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAM/E"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/arm/util/util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI9D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,OAAO,CAQ9D;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMzD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAM/E"}

package/build/component/driver/arm/util/util.js

@@ -6,7 +6,7 @@ exports.convertOutputs = exports.getFileExtension = exports.hasBicepTemplate = v
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const constant_1 = require("../constant");
-const localizeUtils_1 = require("../../../../common/localizeUtils");
+const arm_1 = require("../../../../error/arm");
 function hasBicepTemplate(args) {
     for (const arg of args) {
         const templateType = getFileExtension(arg.path);
@@ -59,7 +59,7 @@ function convertOutput(output, map, prefix) {
         else {
             const mapKey = buildKey(key, prefix);
             if (map.get(mapKey)) {
-                throw new Error(localizeUtils_1.getLocalizedString("driver.arm.error.outputConversionFailed", mapKey));
+                throw new arm_1.ConvertArmOutputError(mapKey);
             }
             map.set(mapKey.toUpperCase(), value ? value.toString() : output[key].toString());
         }

package/build/component/driver/arm/util/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../src/component/driver/arm/util/util.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,mDAA6B;AAC7B,0CAA2C;AAE3C,oEAAsE;AAEtE,SAAgB,gBAAgB,CAAC,IAAoB;IACnD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,YAAY,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,YAAY,KAAK,uBAAY,CAAC,KAAK,EAAE;YACvC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AARD,4CAQC;AAED,SAAgB,gBAAgB,CAAC,QAAgB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,EAAE,CAAC;KACX;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IACjD,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACtC,CAAC;AAND,4CAMC;AAED,SAAgB,cAAc,CAAC,OAA2B;IACxD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;IACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KAC5B;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAND,wCAMC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAS,aAAa,CAAC,MAAwB,EAAE,GAAwB,EAAE,MAAe;IACxF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;QAChC,IAAI,KAAK,YAAY,MAAM,EAAE;YAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACxC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;SACtC;aAAM;YACL,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,kCAAkB,CAAC,yCAAyC,EAAE,MAAM,CAAC,CAAC,CAAC;aACxF;YACD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAClF;KACF;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAE,MAAe;IAC5C,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../src/component/driver/arm/util/util.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,mDAA6B;AAC7B,0CAA2C;AAG3C,+CAA8D;AAE9D,SAAgB,gBAAgB,CAAC,IAAoB;IACnD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,YAAY,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,YAAY,KAAK,uBAAY,CAAC,KAAK,EAAE;YACvC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AARD,4CAQC;AAED,SAAgB,gBAAgB,CAAC,QAAgB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,EAAE,CAAC;KACX;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IACjD,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACtC,CAAC;AAND,4CAMC;AAED,SAAgB,cAAc,CAAC,OAA2B;IACxD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;IACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KAC5B;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAND,wCAMC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAS,aAAa,CAAC,MAAwB,EAAE,GAAwB,EAAE,MAAe;IACxF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;QAChC,IAAI,KAAK,YAAY,MAAM,EAAE;YAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACxC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;SACtC;aAAM;YACL,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACnB,MAAM,IAAI,2BAAqB,CAAC,MAAM,CAAC,CAAC;aACzC;YACD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAClF;KACF;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAE,MAAe;IAC5C,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAC5C,CAAC"}

package/build/component/driver/botAadApp/create.d.ts

@@ -5,12 +5,11 @@ import { FxError, Result } from "@microsoft/teamsfx-api";
 export declare class CreateBotAadAppDriver implements StepDriver {
     readonly description?: string | undefined;
     run(args: CreateBotAadAppArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
-    execute(args: CreateBotAadAppArgs, ctx: DriverContext): Promise<ExecutionResult>;
-    handler(args: CreateBotAadAppArgs, context: DriverContext): Promise<{
+    execute(args: CreateBotAadAppArgs, ctx: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
+    handler(args: CreateBotAadAppArgs, context: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<{
         output: Map<string, string>;
         summaries: string[];
     }>;
     private validateArgs;
-    private loadCurrentState;
 }
 //# sourceMappingURL=create.d.ts.map

package/build/component/driver/botAadApp/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AA0BjF,qBACa,qBAAsB,YAAW,UAAU;IACtD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAEvC;IAEW,GAAG,CACd,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAAC,IAAI,EAAE,mBAAmB,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAahF,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAsFF,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;CAMzB"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAkCjF,qBACa,qBAAsB,YAAW,UAAU;IACtD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAEvC;IAEW,GAAG,CACd,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAWnC,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAad,OAAO,CAClB,IAAI,EAAE,mBAAmB,EACzB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAsFF,OAAO,CAAC,YAAY;CAUrB"}

package/build/component/driver/botAadApp/create.js

@@ -6,7 +6,7 @@ exports.CreateBotAadAppDriver = void 0;
 const tslib_1 = require("tslib");
 const typedi_1 = require("typedi");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const timer_1 = tslib_1.__importDefault(require("@dbpiper/timer"));
+const perf_hooks_1 = require("perf_hooks");
 const invalidParameterUserError_1 = require("./error/invalidParameterUserError");
 const unhandledError_1 = require("./error/unhandledError");
 const axios_1 = tslib_1.__importDefault(require("axios"));
@@ -17,6 +17,9 @@ const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry
 const constants_1 = require("./utility/constants");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const constants_2 = require("../../resource/botService/botRegistration/constants");
+const utils_1 = require("../util/utils");
+const updateProgress_1 = require("../middleware/updateProgress");
+const unexpectedEmptyBotPasswordError_1 = require("./error/unexpectedEmptyBotPasswordError");
 const actionName = "botAadApp/create"; // DO NOT MODIFY the name
 const helpLink = "https://aka.ms/teamsfx-actions/botaadapp-create";
 const successRegisterBotAad = `${actionName}/success`;
@@ -24,6 +27,10 @@ const propertyKeys = {
     reusingExistingBotAad: "reuse-existing-bot-aad",
     registerBotAadTime: "register-bot-aad-time",
 };
+const defaultOutputEnvVarNames = {
+    botId: "BOT_ID",
+    botPassword: "SECRET_BOT_PASSWORD",
+};
 let CreateBotAadAppDriver = class CreateBotAadAppDriver {
     constructor() {
         this.description = localizeUtils_1.getLocalizedString("driver.botAadApp.create.description");
@@ -34,10 +41,10 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
             return result.output;
         });
     }
-    async execute(args, ctx) {
+    async execute(args, ctx, outputEnvVarNames) {
         let summaries = [];
         const outputResult = await common_1.wrapRun(async () => {
-            const result = await this.handler(args, ctx);
+            const result = await this.handler(args, ctx, outputEnvVarNames);
             summaries = result.summaries;
             return result.output;
         });
@@ -46,55 +53,57 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
             summaries,
         };
     }
-    async handler(args, context) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        const progressHandler = (_a = context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(localizeUtils_1.getLocalizedString(constants_2.progressBarKeys.creatingBotAadApp), 1);
-        await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.start());
+    async handler(args, context, outputEnvVarNames) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         try {
-            (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.startExecuteDriver, actionName));
+            (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.startExecuteDriver, actionName));
             this.validateArgs(args);
-            const botAadAppState = this.loadCurrentState();
+            // TODO: Remove this logic when config manager forces schema validation
+            if (!outputEnvVarNames) {
+                outputEnvVarNames = new Map(Object.entries(defaultOutputEnvVarNames));
+            }
+            const botAadAppState = utils_1.loadStateFromEnv(outputEnvVarNames);
+            // If it's the case of a valid bot id with an empty bot password, then throw an error
+            if (botAadAppState.botId && !botAadAppState.botPassword) {
+                throw new unexpectedEmptyBotPasswordError_1.UnexpectedEmptyBotPasswordError(actionName, helpLink);
+            }
             const botConfig = {
-                botId: (_c = botAadAppState.BOT_ID) !== null && _c !== void 0 ? _c : "",
-                botPassword: (_d = botAadAppState.SECRET_BOT_PASSWORD) !== null && _d !== void 0 ? _d : "",
+                botId: (_b = botAadAppState.botId) !== null && _b !== void 0 ? _b : "",
+                botPassword: (_c = botAadAppState.botPassword) !== null && _c !== void 0 ? _c : "",
             };
             const botRegistration = new remoteBotRegistration_1.RemoteBotRegistration();
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString(constants_2.progressBarKeys.creatingBotAadApp)));
-            const timer = new timer_1.default();
-            timer.start();
+            const startTime = perf_hooks_1.performance.now();
             const createRes = await botRegistration.createBotRegistration(context.m365TokenProvider, args.name, args.name, botConfig, context.logProvider);
-            const timeResult = timer.stop();
+            const durationMilliSeconds = perf_hooks_1.performance.now() - startTime;
             if (createRes.isErr()) {
                 throw createRes.error;
             }
-            const isReusingExisting = botConfig.botId && botConfig.botPassword;
+            botAadAppState.botId = createRes.value.botId;
+            botAadAppState.botPassword = createRes.value.botPassword;
+            const outputs = utils_1.mapStateToEnv(botAadAppState, outputEnvVarNames);
+            const isReusingExisting = !(!botConfig.botId || !botConfig.botPassword);
             const successCreateBotAadLog = localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.successCreateBotAad, createRes.value.botId);
             const useExistingBotAadLog = localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.useExistingBotAad, botConfig.botId);
             const summary = isReusingExisting ? useExistingBotAadLog : successCreateBotAadLog;
-            (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.info(summary);
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(true));
-            (_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.successExecuteDriver, actionName));
+            (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.info(summary);
+            (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.successExecuteDriver, actionName));
             context.telemetryReporter.sendTelemetryEvent(successRegisterBotAad, {
-                [propertyKeys.reusingExistingBotAad]: isReusingExisting,
-                [propertyKeys.registerBotAadTime]: timeResult.milliseconds.toString(),
+                [propertyKeys.reusingExistingBotAad]: isReusingExisting.toString(),
+                [propertyKeys.registerBotAadTime]: durationMilliSeconds.toString(),
             });
             return {
-                output: new Map([
-                    ["BOT_ID", createRes.value.botId],
-                    ["SECRET_BOT_PASSWORD", createRes.value.botPassword],
-                ]),
+                output: outputs,
                 summaries: [summary],
             };
         }
         catch (error) {
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(false));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                (_g = context.logProvider) === null || _g === void 0 ? void 0 : _g.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
+                (_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
                 throw error;
             }
             if (axios_1.default.isAxiosError(error)) {
-                const message = JSON.stringify((_h = error.response) === null || _h === void 0 ? void 0 : _h.data);
-                (_j = context.logProvider) === null || _j === void 0 ? void 0 : _j.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
+                const message = JSON.stringify((_g = error.response) === null || _g === void 0 ? void 0 : _g.data);
+                (_h = context.logProvider) === null || _h === void 0 ? void 0 : _h.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
                 if (error.response.status >= 400 && error.response.status < 500) {
                     throw new unhandledError_1.UnhandledUserError(actionName, JSON.stringify(error.response.data), helpLink);
                 }
@@ -103,7 +112,7 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
                 }
             }
             const message = JSON.stringify(error);
-            (_k = context.logProvider) === null || _k === void 0 ? void 0 : _k.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
+            (_j = context.logProvider) === null || _j === void 0 ? void 0 : _j.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
             throw new unhandledError_1.UnhandledSystemError(actionName, JSON.stringify(error));
         }
     }
@@ -116,12 +125,6 @@ let CreateBotAadAppDriver = class CreateBotAadAppDriver {
             throw new invalidParameterUserError_1.InvalidParameterUserError(actionName, invalidParameters, helpLink);
         }
     }
-    loadCurrentState() {
-        return {
-            BOT_ID: process.env.BOT_ID,
-            SECRET_BOT_PASSWORD: process.env.SECRET_BOT_PASSWORD,
-        };
-    }
 };
 tslib_1.__decorate([
     lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
@@ -130,9 +133,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], CreateBotAadAppDriver.prototype, "run", null);
 tslib_1.__decorate([
-    lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
+    lib_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
+        updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString(constants_2.progressBarKeys.creatingBotAadApp)),
+    ]),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Map]),
     tslib_1.__metadata("design:returntype", Promise)
 ], CreateBotAadAppDriver.prototype, "execute", null);
 CreateBotAadAppDriver = tslib_1.__decorate([

package/build/component/driver/botAadApp/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/botAadApp/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,mCAAiC;AAGjC,wDAAiF;AACjF,2CAAyC;AACzC,iFAA8E;AAC9E,2DAAkF;AAClF,0DAA0B;AAC1B,+CAA6C;AAK7C,2GAAwG;AACxG,+CAA8C;AAC9C,mFAAgF;AAChF,mDAAqD;AACrD,iEAAmE;AACnE,mFAAsF;AACtF,yCAAgE;AAChE,iEAA8D;AAC9D,6FAA0F;AAE1F,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,yBAAyB;AAChE,MAAM,QAAQ,GAAG,iDAAiD,CAAC;AAEnE,MAAM,qBAAqB,GAAG,GAAG,UAAU,UAAU,CAAC;AACtD,MAAM,YAAY,GAAG;IACnB,qBAAqB,EAAE,wBAAwB;IAC/C,kBAAkB,EAAE,uBAAuB;CAC5C,CAAC;AAEF,MAAM,wBAAwB,GAAG;IAC/B,KAAK,EAAE,QAAQ;IACf,WAAW,EAAE,qBAAqB;CACnC,CAAC;AAGF,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QACW,gBAAW,GAAwB,kCAAkB,CAC5D,qCAAqC,CACtC,CAAC;IAwIJ,CAAC;IAtIQ,KAAK,CAAC,GAAG,CACd,IAAyB,EACzB,OAAsB;QAEtB,OAAO,gBAAO,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAMM,KAAK,CAAC,OAAO,CAClB,IAAyB,EACzB,GAAkB,EAClB,iBAAuC;QAEvC,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,gBAAO,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;YAChE,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YAC7B,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,SAAS;SACV,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,IAAyB,EACzB,OAAsB,EACtB,iBAAuC;;QAKvC,IAAI;YACF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,kCAAkB,CAAC,0BAAc,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,CAAC;YAC7F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,uEAAuE;YACvE,IAAI,CAAC,iBAAiB,EAAE;gBACtB,iBAAiB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC;aACvE;YACD,MAAM,cAAc,GAA0B,wBAAgB,CAAC,iBAAiB,CAAC,CAAC;YAElF,qFAAqF;YACrF,IAAI,cAAc,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE;gBACvD,MAAM,IAAI,iEAA+B,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;aACjE;YAED,MAAM,SAAS,GAAsB;gBACnC,KAAK,EAAE,MAAA,cAAc,CAAC,KAAK,mCAAI,EAAE;gBACjC,WAAW,EAAE,MAAA,cAAc,CAAC,WAAW,mCAAI,EAAE;aAC9C,CAAC;YACF,MAAM,eAAe,GAAoB,IAAI,6CAAqB,EAAE,CAAC;YAErE,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;YACpC,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,qBAAqB,CAC3D,OAAO,CAAC,iBAAiB,EACzB,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI,EACT,SAAS,EACT,OAAO,CAAC,WAAW,CACpB,CAAC;YACF,MAAM,oBAAoB,GAAG,wBAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;YAC3D,IAAI,SAAS,CAAC,KAAK,EAAE,EAAE;gBACrB,MAAM,SAAS,CAAC,KAAK,CAAC;aACvB;YACD,cAAc,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;YAC7C,cAAc,CAAC,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC;YACzD,MAAM,OAAO,GAAG,qBAAa,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;YACjE,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACxE,MAAM,sBAAsB,GAAG,kCAAkB,CAC/C,0BAAc,CAAC,mBAAmB,EAClC,SAAS,CAAC,KAAK,CAAC,KAAK,CACtB,CAAC;YACF,MAAM,oBAAoB,GAAG,kCAAkB,CAC7C,0BAAc,CAAC,iBAAiB,EAChC,SAAS,CAAC,KAAK,CAChB,CAAC;YACF,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,sBAAsB,CAAC;YAClF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CACvB,kCAAkB,CAAC,0BAAc,CAAC,oBAAoB,EAAE,UAAU,CAAC,CACpE,CAAC;YACF,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,qBAAqB,EAAE;gBAClE,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE;gBAClE,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,oBAAoB,CAAC,QAAQ,EAAE;aACnE,CAAC,CAAC;YACH,OAAO;gBACL,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE,CAAC,OAAO,CAAC;aACrB,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE;gBAC9D,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CACvF,CAAC;gBACF,MAAM,KAAK,CAAC;aACb;YAED,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;gBACrD,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;gBACF,IAAI,KAAK,CAAC,QAAS,CAAC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,QAAS,CAAC,MAAM,GAAG,GAAG,EAAE;oBACjE,MAAM,IAAI,mCAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;iBAC1F;qBAAM;oBACL,MAAM,IAAI,qCAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAS,CAAC,IAAI,CAAC,CAAC,CAAC;iBAClF;aACF;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;YACF,MAAM,IAAI,qCAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;SACnE;IACH,CAAC;IAEO,YAAY,CAAC,IAAyB;QAC5C,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAC/C,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,qDAAyB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC9E;IACH,CAAC;CACF,CAAA;AAtIC;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;;;gDASxD;AAMD;IAJC,WAAK,CAAC;QACL,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/C,+BAAc,CAAC,kCAAkB,CAAC,2BAAe,CAAC,iBAAiB,CAAC,CAAC;KACtE,CAAC;;6DAIoB,GAAG;;oDAYxB;AAlCU,qBAAqB;IADjC,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,qBAAqB,CA2IjC;AA3IY,sDAAqB"}

package/build/component/driver/botAadApp/error/invalidParameterUserError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invalidParameterUserError.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/invalidParameterUserError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM;CAevF"}
+{"version":3,"file":"invalidParameterUserError.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/invalidParameterUserError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAOnD,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM;CAevF"}

package/build/component/driver/botAadApp/error/invalidParameterUserError.js

@@ -6,6 +6,7 @@ exports.InvalidParameterUserError = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
 const errorCode = "InvalidParameter";
+// Reuse the messageKey from aadApp so a duplicated one won't be created.
 const messageKey = "driver.aadApp.error.invalidParameter";
 class InvalidParameterUserError extends teamsfx_api_1.UserError {
     constructor(actionName, invalidParameters, helpLink) {

package/build/component/driver/botAadApp/error/invalidParameterUserError.js.map

@@ -1 +1 @@
-{"version":3,"file":"invalidParameterUserError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/invalidParameterUserError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;AAExF,MAAM,SAAS,GAAG,kBAAkB,CAAC;AACrC,MAAM,UAAU,GAAG,sCAAsC,CAAC;AAE1D,MAAa,yBAA0B,SAAQ,uBAAS;IACtD,YAAY,UAAkB,EAAE,iBAAoC,EAAE,QAAgB;QACpF,IAAI,aAAa,CAAC;QAClB,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YACpC,aAAa,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC9C;aAAM;YACL,aAAa,GAAG,iBAAiB,CAAC;SACnC;QACD,KAAK,CAAC;YACJ,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC;YAChE,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC;YACzE,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;CACF;AAhBD,8DAgBC"}
+{"version":3,"file":"invalidParameterUserError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/invalidParameterUserError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;AAExF,MAAM,SAAS,GAAG,kBAAkB,CAAC;AACrC,yEAAyE;AACzE,MAAM,UAAU,GAAG,sCAAsC,CAAC;AAE1D,MAAa,yBAA0B,SAAQ,uBAAS;IACtD,YAAY,UAAkB,EAAE,iBAAoC,EAAE,QAAgB;QACpF,IAAI,aAAa,CAAC;QAClB,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YACpC,aAAa,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC9C;aAAM;YACL,aAAa,GAAG,iBAAiB,CAAC;SACnC;QACD,KAAK,CAAC;YACJ,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC;YAChE,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC;YACzE,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;CACF;AAhBD,8DAgBC"}

package/build/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.d.ts

@@ -0,0 +1,5 @@
+import { UserError } from "@microsoft/teamsfx-api";
+export declare class UnexpectedEmptyBotPasswordError extends UserError {
+    constructor(actionName: string, helpLink: string);
+}
+//# sourceMappingURL=unexpectedEmptyBotPasswordError.d.ts.map

package/build/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unexpectedEmptyBotPasswordError.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,qBAAa,+BAAgC,SAAQ,SAAS;gBAChD,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CASjD"}

package/build/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.js

@@ -0,0 +1,22 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnexpectedEmptyBotPasswordError = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const localizeUtils_1 = require("../../../../common/localizeUtils");
+const errorCode = "UnexpectedEmptyBotPassword";
+const messageKey = "driver.botAadApp.error.unexpectedEmptyBotPassword";
+class UnexpectedEmptyBotPasswordError extends teamsfx_api_1.UserError {
+    constructor(actionName, helpLink) {
+        super({
+            source: actionName,
+            name: errorCode,
+            message: localizeUtils_1.getDefaultString(messageKey, actionName),
+            displayMessage: localizeUtils_1.getLocalizedString(messageKey, actionName),
+            helpLink: helpLink,
+        });
+    }
+}
+exports.UnexpectedEmptyBotPasswordError = UnexpectedEmptyBotPasswordError;
+//# sourceMappingURL=unexpectedEmptyBotPasswordError.js.map

package/build/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unexpectedEmptyBotPasswordError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/unexpectedEmptyBotPasswordError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAmD;AACnD,oEAAwF;AAExF,MAAM,SAAS,GAAG,4BAA4B,CAAC;AAC/C,MAAM,UAAU,GAAG,mDAAmD,CAAC;AAEvE,MAAa,+BAAgC,SAAQ,uBAAS;IAC5D,YAAY,UAAkB,EAAE,QAAgB;QAC9C,KAAK,CAAC;YACJ,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,CAAC;YACjD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,CAAC;YAC1D,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;CACF;AAVD,0EAUC"}

package/build/component/driver/botAadApp/error/unhandledError.js

@@ -6,7 +6,7 @@ exports.UnhandledSystemError = exports.UnhandledUserError = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
 const errorCode = "UnhandledError";
-const messageKey = "driver.aadApp.error.unhandledError";
+const messageKey = "error.common.UnhandledError";
 class UnhandledUserError extends teamsfx_api_1.UserError {
     constructor(actionName, detail, helpLink) {
         const errorOptions = generateErrorOptions(actionName, detail);

package/build/component/driver/botAadApp/error/unhandledError.js.map

@@ -1 +1 @@
-{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAKgC;AAChC,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,oCAAoC,CAAC;AAExD,MAAa,kBAAmB,SAAQ,uBAAS;IAC/C,YAAY,UAAkB,EAAE,MAAc,EAAE,QAAgB;QAC9D,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAqB,CAAC;QAClF,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACjC,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAND,gDAMC;AAED,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAKgC;AAChC,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAEjD,MAAa,kBAAmB,SAAQ,uBAAS;IAC/C,YAAY,UAAkB,EAAE,MAAc,EAAE,QAAgB;QAC9D,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAqB,CAAC;QAClF,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACjC,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAND,gDAMC;AAED,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}

package/build/component/driver/botAadApp/interface/createBotAadAppOutput.d.ts

@@ -1,5 +1,5 @@
-export interface CreateBotAadAppOutput {
-    BOT_ID?: string;
-    SECRET_BOT_PASSWORD?: string;
-}
+export declare type CreateBotAadAppOutput = {
+    botId?: string;
+    botPassword?: string;
+};
 //# sourceMappingURL=createBotAadAppOutput.d.ts.map

package/build/component/driver/botAadApp/interface/createBotAadAppOutput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBotAadAppOutput.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/interface/createBotAadAppOutput.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B"}
+{"version":3,"file":"createBotAadAppOutput.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/botAadApp/interface/createBotAadAppOutput.ts"],"names":[],"mappings":"AAGA,oBAAY,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC"}

package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createOrUpdateBot.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAKjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAItE,OAAO,EACL,iCAAiC,EAElC,MAAM,+CAA+C,CAAC;AAavD,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAAyD;IAGvD,GAAG,CACd,IAAI,EAAE,iCAAiC,EACvC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAOnC,OAAO,CAClB,IAAI,EAAE,iCAAiC,EACvC,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAiFrB,OAAO,CAAC,YAAY;CAoDrB"}
+{"version":3,"file":"createOrUpdateBot.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAKjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAItE,OAAO,EACL,iCAAiC,EAElC,MAAM,+CAA+C,CAAC;AAcvD,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAAyD;IAMvD,GAAG,CACd,IAAI,EAAE,iCAAiC,EACvC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAWnC,OAAO,CAClB,IAAI,EAAE,iCAAiC,EACvC,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAmErB,OAAO,CAAC,YAAY;CAoDrB"}

package/build/component/driver/botFramework/createOrUpdateBot.js

@@ -11,10 +11,11 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
 const common_1 = require("../../utils/common");
 const constants_1 = require("../aad/utility/constants");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const invalidParameterUserError_1 = require("./error/invalidParameterUserError");
+const updateProgress_1 = require("../middleware/updateProgress");
 const unhandledError_1 = require("./error/unhandledError");
 const localBotRegistration_1 = require("../../resource/botService/botRegistration/localBotRegistration");
 const IBotRegistration_1 = require("../../resource/botService/appStudio/interfaces/IBotRegistration");
+const common_2 = require("../../../error/common");
 const actionName = "botFramework/create";
 const helpLink = "https://aka.ms/teamsfx-actions/botFramework-create";
 const botUrl = "https://dev.botframework.com/bots?id=";
@@ -41,12 +42,9 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
         };
     }
     async handler(args, context) {
-        var _a, _b, _c, _d, _e;
-        const progressHandler = (_a = context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(localizeUtils_1.getLocalizedString("driver.botFramework.progressBar.title"), 1);
+        var _a, _b, _c, _d;
         try {
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.start());
             this.validateArgs(args);
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("driver.botFramework.progressBar.createOrUpdateBot")));
             let callingEndpoint = undefined;
             let configuredChannels = undefined;
             if (args.channels) {
@@ -56,16 +54,16 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
                         callingEndpoint = channel.callingWebhook;
                         configuredChannels.push(IBotRegistration_1.BotChannelType.MicrosoftTeams);
                     }
-                    else if (channel.name === IBotRegistration_1.BotChannelType.Outlook) {
-                        configuredChannels.push(IBotRegistration_1.BotChannelType.Outlook);
+                    else if (channel.name === IBotRegistration_1.BotChannelType.M365Extensions) {
+                        configuredChannels.push(IBotRegistration_1.BotChannelType.M365Extensions);
                     }
                 }
             }
             const botRegistrationData = {
                 botId: args.botId,
                 name: args.name,
-                description: (_b = args.description) !== null && _b !== void 0 ? _b : "",
-                iconUrl: (_c = args.iconUrl) !== null && _c !== void 0 ? _c : "",
+                description: (_a = args.description) !== null && _a !== void 0 ? _a : "",
+                iconUrl: (_b = args.iconUrl) !== null && _b !== void 0 ? _b : "",
                 messagingEndpoint: args.messagingEndpoint,
                 callingEndpoint: callingEndpoint !== null && callingEndpoint !== void 0 ? callingEndpoint : "",
                 configuredChannels,
@@ -75,7 +73,6 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
             if (result.isErr()) {
                 throw result.error;
             }
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(true));
             return {
                 output: new Map(),
                 summaries: [
@@ -86,13 +83,12 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
             };
         }
         catch (error) {
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(false));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
+                (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
                 throw error;
             }
             const message = JSON.stringify(error);
-            (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
+            (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
             throw new unhandledError_1.UnhandledSystemError(actionName, message);
         }
     }
@@ -122,7 +118,7 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
                     if (!channel.name ||
                         typeof channel.name !== "string" ||
                         (channel.name !== IBotRegistration_1.BotChannelType.MicrosoftTeams &&
-                            channel.name !== IBotRegistration_1.BotChannelType.Outlook)) {
+                            channel.name !== IBotRegistration_1.BotChannelType.M365Extensions)) {
                         invalidParameters.push("channels");
                         break;
                     }
@@ -137,16 +133,28 @@ let CreateOrUpdateBotFrameworkBotDriver = class CreateOrUpdateBotFrameworkBotDri
             }
         }
         if (invalidParameters.length > 0) {
-            throw new invalidParameterUserError_1.InvalidParameterUserError(actionName, invalidParameters, helpLink);
+            throw new common_2.InvalidActionInputError(actionName, invalidParameters, helpLink);
         }
     }
 };
 tslib_1.__decorate([
-    lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
+    lib_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
+        updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.botFramework.progressBar.createOrUpdateBot")),
+    ]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], CreateOrUpdateBotFrameworkBotDriver.prototype, "run", null);
+tslib_1.__decorate([
+    lib_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
+        updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.botFramework.progressBar.createOrUpdateBot")),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], CreateOrUpdateBotFrameworkBotDriver.prototype, "execute", null);
 CreateOrUpdateBotFrameworkBotDriver = tslib_1.__decorate([
     typedi_1.Service(actionName) // DO NOT MODIFY the service name
 ], CreateOrUpdateBotFrameworkBotDriver);

package/build/component/driver/botFramework/createOrUpdateBot.js.map

@@ -1 +1 @@
-{"version":3,"file":"createOrUpdateBot.js","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createOrUpdateBot.js","sourceRoot":"","sources":["../../../../src/component/driver/botFramework/createOrUpdateBot.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,mCAAiC;AAEjC,+CAA8C;AAC9C,wDAAiF;AAEjF,iEAAmE;AACnE,+CAA6C;AAC7C,wDAA0D;AAG1D,mFAAgF;AAChF,iEAA8D;AAC9D,2DAA8D;AAM9D,yGAAsG;AACtG,sGAGyE;AACzE,kDAAgE;AAEhE,MAAM,UAAU,GAAG,qBAAqB,CAAC;AACzC,MAAM,QAAQ,GAAG,oDAAoD,CAAC;AAEtE,MAAM,MAAM,GAAG,uCAAuC,CAAC;AAGvD,IAAa,mCAAmC,GAAhD,MAAa,mCAAmC;IAAhD;QACE,gBAAW,GAAG,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;IA2JtE,CAAC;IArJQ,KAAK,CAAC,GAAG,CACd,IAAuC,EACvC,OAAsB;QAEtB,OAAO,gBAAO,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAMM,KAAK,CAAC,OAAO,CAClB,IAAuC,EACvC,GAAkB;QAElB,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,gBAAO,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC7C,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YAC7B,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,SAAS;SACV,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,IAAuC,EACvC,OAAsB;;QAKtB,IAAI;YACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAExB,IAAI,eAAe,GAAuB,SAAS,CAAC;YACpD,IAAI,kBAAkB,GAAiC,SAAS,CAAC;YACjE,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,kBAAkB,GAAG,EAAE,CAAC;gBACxB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;oBACnC,IAAI,OAAO,CAAC,IAAI,KAAK,iCAAc,CAAC,cAAc,EAAE;wBAClD,eAAe,GAAI,OAAyC,CAAC,cAAc,CAAC;wBAC5E,kBAAkB,CAAC,IAAI,CAAC,iCAAc,CAAC,cAAc,CAAC,CAAC;qBACxD;yBAAM,IAAI,OAAO,CAAC,IAAI,KAAK,iCAAc,CAAC,cAAc,EAAE;wBACzD,kBAAkB,CAAC,IAAI,CAAC,iCAAc,CAAC,cAAc,CAAC,CAAC;qBACxD;iBACF;aACF;YACD,MAAM,mBAAmB,GAAqB;gBAC5C,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,mCAAI,EAAE;gBACnC,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE;gBAC3B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,eAAe,EAAE,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE;gBACtC,kBAAkB;aACnB,CAAC;YAEF,MAAM,eAAe,GAAoB,IAAI,2CAAoB,EAAE,CAAC;YACpE,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,6BAA6B,CAChE,OAAO,CAAC,iBAAiB,EACzB,mBAAmB,CACpB,CAAC;YAEF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,MAAM,MAAM,CAAC,KAAK,CAAC;aACpB;YAED,OAAO;gBACL,MAAM,EAAE,IAAI,GAAG,EAAkB;gBACjC,SAAS,EAAE;oBACT,MAAM,CAAC,KAAK;wBACV,CAAC,CAAC,kCAAkB,CAAC,oCAAoC,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;wBACpF,CAAC,CAAC,kCAAkB,CAAC,oCAAoC,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;iBACvF;aACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE;gBAC9D,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CACvF,CAAC;gBACF,MAAM,KAAK,CAAC;aACb;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;YACF,MAAM,IAAI,qCAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SACrD;IACH,CAAC;IAEO,YAAY,CAAC,IAAuC;QAC1D,MAAM,iBAAiB,GAAa,EAAE,CAAC;QAEvC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE;YACjD,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACjC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC/C,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,OAAO,IAAI,CAAC,iBAAiB,KAAK,QAAQ,EAAE;YACzE,iBAAiB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC7C;QAED,IAAI,IAAI,CAAC,WAAW,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE;YAC5D,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACvC;QAED,IAAI,IAAI,CAAC,OAAO,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE;YACpD,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACnC;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBACjC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACpC;iBAAM;gBACL,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;oBACnC,IACE,CAAC,OAAO,CAAC,IAAI;wBACb,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;wBAChC,CAAC,OAAO,CAAC,IAAI,KAAK,iCAAc,CAAC,cAAc;4BAC7C,OAAO,CAAC,IAAI,KAAK,iCAAc,CAAC,cAAc,CAAC,EACjD;wBACA,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;wBACnC,MAAM;qBACP;oBACD,IAAI,OAAO,CAAC,IAAI,KAAK,iCAAc,CAAC,cAAc,EAAE;wBAClD,MAAM,cAAc,GAAI,OAAyC,CAAC,cAAc,CAAC;wBACjF,IAAI,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;4BACxD,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;4BACnC,MAAM;yBACP;qBACF;iBACF;aACF;SACF;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,gCAAuB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC5E;IACH,CAAC;CACF,CAAA;AArJC;IAJC,WAAK,CAAC;QACL,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/C,+BAAc,CAAC,kCAAkB,CAAC,mDAAmD,CAAC,CAAC;KACxF,CAAC;;;;8DASD;AAMD;IAJC,WAAK,CAAC;QACL,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/C,+BAAc,CAAC,kCAAkB,CAAC,mDAAmD,CAAC,CAAC;KACxF,CAAC;;;;kEAeD;AAnCU,mCAAmC;IAD/C,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,mCAAmC,CA4J/C;AA5JY,kFAAmC"}