npm - @microsoft/teamsfx-core - Versions diffs - 1.3.0 → 1.3.1-alpha.9b895e2a.0 - Mend

@microsoft/teamsfx-core 1.3.0 → 1.3.1-alpha.9b895e2a.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (696) hide show

package/build/common/local/constants.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,UAAU;IAClC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,SAAS;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,iBAAiB,2BAA2B,CAAC;AAE1D,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;EAS/B,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;EAGxC,CAAC;AAEH,~~eAAO,MAAM,yBAAyB;;;EAGpC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;EAWhC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;EAQpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;;;;EAOnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;EAQ/B,CAAC;AAEH,~~qBAAa,qBAAqB;IAChC,gBAAuB,YAAY,EAAE,MAAM,CAAmB;IAC9D,gBAAuB,WAAW,EAAE,MAAM,CAAmB;IAC7D,gBAAuB,YAAY,EAAE,MAAM,CAAqC;CACjF"}
1	+ {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,UAAU;IAClC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,SAAS;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,iBAAiB,2BAA2B,CAAC;AAE1D,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;EAS/B,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;EAGxC,CAAC;AAEH,qBAAa,qBAAqB;IAChC,gBAAuB,YAAY,EAAE,MAAM,CAAmB;IAC9D,gBAAuB,WAAW,EAAE,MAAM,CAAmB;IAC7D,gBAAuB,YAAY,EAAE,MAAM,CAAqC;CACjF"}

package/build/common/local/constants.js CHANGED Viewed

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalDebugCertificate = exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = exports.LocalEnvBotKeysMigratedFromV1 = exports.LocalEnvFrontendKeys = exports.LocalEnvCertKeys = exports.LocalEnvBotKeys = exports.LocalEnvBackendKeys = exports.LocalEnvAuthKeys = exports.npmInstallCommand = exports.ProgrammingLanguage = exports.FolderName = void 0;
+exports.LocalDebugCertificate = exports.LocalEnvBotKeysMigratedFromV1 = exports.LocalEnvFrontendKeys = exports.LocalEnvCertKeys = exports.LocalEnvBotKeys = exports.LocalEnvBackendKeys = exports.LocalEnvAuthKeys = exports.npmInstallCommand = exports.ProgrammingLanguage = exports.FolderName = void 0;
 class FolderName {
 }
 exports.FolderName = FolderName;
@@ -77,48 +77,6 @@ exports.LocalEnvBotKeysMigratedFromV1 = Object.freeze({
     BotId: "BOT_BotId",
     BotPassword: "BOT_BotPassword",
 });
-exports.LocalSettingsTeamsAppKeys = Object.freeze({
-    TenantId: "tenantId",
-    TeamsAppId: "teamsAppId",
-});
-exports.LocalSettingsAuthKeys = Object.freeze({
-    ClientId: "clientId",
-    ClientSecret: "clientSecret",
-    ObjectId: "objectId",
-    Oauth2PermissionScopeId: "oauth2PermissionScopeId",
-    OauthAuthority: "oauthAuthority",
-    OauthHost: "oauthHost",
-    ApplicationIdUris: "applicationIdUris",
-    SimpleAuthFilePath: "simpleAuthFilePath",
-    SimpleAuthEnvironmentVariableParams: "SimpleAuthEnvironmentVariableParams",
-    SimpleAuthServiceEndpoint: "AuthServiceEndpoint",
-});
-exports.LocalSettingsFrontendKeys = Object.freeze({
-    TabDomain: "tabDomain",
-    TabEndpoint: "tabEndpoint",
-    Browser: "browser",
-    Https: "https",
-    TrustDevCert: "trustDevCert",
-    SslCertFile: "sslCertFile",
-    SslKeyFile: "sslKeyFile",
-});
-exports.LocalSettingsBackendKeys = Object.freeze({
-    FunctionEndpoint: "functionEndpoint",
-    FunctionName: "functionName",
-    SqlEndpoint: "sqlEndpoint",
-    SqlDatabaseName: "sqlDatabaseName",
-    SqlUserName: "sqlUserName",
-    SqlPassword: "sqlPassword",
-});
-exports.LocalSettingsBotKeys = Object.freeze({
-    SkipNgrok: "skipNgrok",
-    BotId: "botId",
-    BotPassword: "botPassword",
-    BotAadObjectId: "botAadObjectId",
-    BotRedirectUri: "botRedirectUri",
-    BotDomain: "botDomain",
-    BotEndpoint: "botEndpoint",
-});
 class LocalDebugCertificate {
 }
 exports.LocalDebugCertificate = LocalDebugCertificate;

package/build/common/local/constants.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,MAAa,UAAU;;AAAvB,gCAKC;AAJiB,mBAAQ,GAAG,MAAM,CAAC;AAClB,cAAG,GAAG,KAAK,CAAC;AACZ,mBAAQ,GAAG,KAAK,CAAC;AACjB,eAAI,GAAG,MAAM,CAAC;AAGhC,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAG9B;AAEY,QAAA,iBAAiB,GAAG,wBAAwB,CAAC;AAE7C,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,QAAQ,EAAE,gBAAgB;IAC1B,YAAY,EAAE,oBAAoB;IAClC,aAAa,EAAE,qBAAqB;IACpC,kBAAkB,EAAE,2BAA2B;IAC/C,cAAc,EAAE,sBAAsB;IACtC,WAAW,EAAE,uBAAuB;IACpC,aAAa,EAAE,sBAAsB;IACrC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,mBAAmB;CACjC,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,cAAc,EAAE,6BAA6B;IAC7C,iBAAiB,EAAE,kCAAkC;IACrD,aAAa,EAAE,6BAA6B;IAC5C,QAAQ,EAAE,wBAAwB;IAClC,QAAQ,EAAE,wBAAwB;IAClC,YAAY,EAAE,4BAA4B;IAC1C,WAAW,EAAE,sBAAsB;IACnC,SAAS,EAAE,2BAA2B;IACtC,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,sBAAsB;IACnC,UAAU,EAAE,qBAAqB;IACjC,WAAW,EAAE,sBAAsB;IACnC,gBAAgB,EAAE,iCAAiC;IACnD,aAAa,EAAE,yBAAyB;CACzC,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3C,KAAK,EAAE,YAAY;IACnB,WAAW,EAAE,kBAAkB;IAC/B,QAAQ,EAAE,oBAAoB;IAC9B,YAAY,EAAE,wBAAwB;IACtC,QAAQ,EAAE,oBAAoB;IAC9B,cAAc,EAAE,yBAAyB;IACzC,aAAa,EAAE,6BAA6B;IAC5C,WAAW,EAAE,kBAAkB;IAC/B,SAAS,EAAE,uBAAuB;IAClC,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE,kBAAkB;IAC/B,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,kBAAkB;IAC/B,gBAAgB,EAAE,6BAA6B;CAChD,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,UAAU,EAAE,uBAAuB;IACnC,UAAU,EAAE,uBAAuB;CACpC,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,OAAO,EAAE,kBAAkB;IAC3B,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,eAAe;IACrB,eAAe,EAAE,qCAAqC;IACtD,QAAQ,EAAE,yCAAyC;IACnD,YAAY,EAAE,kCAAkC;IAChD,QAAQ,EAAE,8BAA8B;IACxC,QAAQ,EAAE,8BAA8B;CACzC,CAAC,CAAC;AAEU,QAAA,6BAA6B,GAAG,MAAM,CAAC,MAAM,CAAC;IACzD,KAAK,EAAE,WAAW;IAClB,WAAW,EAAE,iBAAiB;CAC/B,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC;IACjD,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,QAAQ,EAAE,UAAU;IACpB,uBAAuB,EAAE,yBAAyB;IAClD,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;IACtC,kBAAkB,EAAE,oBAAoB;IACxC,mCAAmC,EAAE,qCAAqC;IAC1E,yBAAyB,EAAE,qBAAqB;CACjD,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;IAC1B,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,iBAAiB;IAClC,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;IAC1B,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEH,MAAa,qBAAqB;;AAAlC,sDAIC;AAHwB,kCAAY,GAAW,eAAe,CAAC;AACvC,iCAAW,GAAW,eAAe,CAAC;AACtC,kCAAY,GAAW,iCAAiC,CAAC"}
1	+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,MAAa,UAAU;;AAAvB,gCAKC;AAJiB,mBAAQ,GAAG,MAAM,CAAC;AAClB,cAAG,GAAG,KAAK,CAAC;AACZ,mBAAQ,GAAG,KAAK,CAAC;AACjB,eAAI,GAAG,MAAM,CAAC;AAGhC,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAG9B;AAEY,QAAA,iBAAiB,GAAG,wBAAwB,CAAC;AAE7C,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,QAAQ,EAAE,gBAAgB;IAC1B,YAAY,EAAE,oBAAoB;IAClC,aAAa,EAAE,qBAAqB;IACpC,kBAAkB,EAAE,2BAA2B;IAC/C,cAAc,EAAE,sBAAsB;IACtC,WAAW,EAAE,uBAAuB;IACpC,aAAa,EAAE,sBAAsB;IACrC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,mBAAmB;CACjC,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,cAAc,EAAE,6BAA6B;IAC7C,iBAAiB,EAAE,kCAAkC;IACrD,aAAa,EAAE,6BAA6B;IAC5C,QAAQ,EAAE,wBAAwB;IAClC,QAAQ,EAAE,wBAAwB;IAClC,YAAY,EAAE,4BAA4B;IAC1C,WAAW,EAAE,sBAAsB;IACnC,SAAS,EAAE,2BAA2B;IACtC,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,sBAAsB;IACnC,UAAU,EAAE,qBAAqB;IACjC,WAAW,EAAE,sBAAsB;IACnC,gBAAgB,EAAE,iCAAiC;IACnD,aAAa,EAAE,yBAAyB;CACzC,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3C,KAAK,EAAE,YAAY;IACnB,WAAW,EAAE,kBAAkB;IAC/B,QAAQ,EAAE,oBAAoB;IAC9B,YAAY,EAAE,wBAAwB;IACtC,QAAQ,EAAE,oBAAoB;IAC9B,cAAc,EAAE,yBAAyB;IACzC,aAAa,EAAE,6BAA6B;IAC5C,WAAW,EAAE,kBAAkB;IAC/B,SAAS,EAAE,uBAAuB;IAClC,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE,kBAAkB;IAC/B,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,kBAAkB;IAC/B,gBAAgB,EAAE,6BAA6B;CAChD,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,UAAU,EAAE,uBAAuB;IACnC,UAAU,EAAE,uBAAuB;CACpC,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,OAAO,EAAE,kBAAkB;IAC3B,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,eAAe;IACrB,eAAe,EAAE,qCAAqC;IACtD,QAAQ,EAAE,yCAAyC;IACnD,YAAY,EAAE,kCAAkC;IAChD,QAAQ,EAAE,8BAA8B;IACxC,QAAQ,EAAE,8BAA8B;CACzC,CAAC,CAAC;AAEU,QAAA,6BAA6B,GAAG,MAAM,CAAC,MAAM,CAAC;IACzD,KAAK,EAAE,WAAW;IAClB,WAAW,EAAE,iBAAiB;CAC/B,CAAC,CAAC;AAEH,MAAa,qBAAqB;;AAAlC,sDAIC;AAHwB,kCAAY,GAAW,eAAe,CAAC;AACvC,iCAAW,GAAW,eAAe,CAAC;AACtC,kCAAY,GAAW,iCAAiC,CAAC"}

package/build/common/local/localCertificateManager.d.ts CHANGED Viewed

@@ -1,8 +1,9 @@
-import { LogProvider, UserInteraction } from "@microsoft/teamsfx-api";
+import { LogProvider, UserInteraction, FxError } from "@microsoft/teamsfx-api";
 export interface LocalCertificate {
     certPath: string;
     keyPath: string;
     isTrusted?: boolean;
+    error?: FxError;
 }
 export declare class LocalCertificateManager {
     private readonly ui?;

package/build/common/local/localCertificateManager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"localCertificateManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"AAKA,OAAO,~~EAAoB~~,WAAW,~~EAAE~~,eAAe,~~EAAE~~,MAAM,wBAAwB,CAAC;~~AAoBxF~~,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;~~CACrB~~;AAED,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAkB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,EAAE,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW;IAMtD;;;;;;;OAOG;IACU,gBAAgB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;~~YAgD9D~~,mBAAmB;~~IAgEjC~~,OAAO,CAAC,wBAAwB;YAsFlB,wBAAwB;YAgCxB,gBAAgB;~~YAuChB~~,kBAAkB;CAsBjC"}
1	+ {"version":3,"file":"localCertificateManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,WAAW,EACX,eAAe,EACf,OAAO,EAER,MAAM,wBAAwB,CAAC;AA6BhC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAkB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,EAAE,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW;IAMtD;;;;;;;OAOG;IACU,gBAAgB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;YA+C9D,mBAAmB;IA+DjC,OAAO,CAAC,wBAAwB;YAsFlB,wBAAwB;YAgCxB,gBAAgB;YAkDhB,kBAAkB;CAsBjC"}

package/build/common/local/localCertificateManager.js CHANGED Viewed

@@ -11,6 +11,7 @@ const os = tslib_1.__importStar(require("os"));
 const uuid_1 = require("uuid");
 const constants_1 = require("./constants");
 const ps = tslib_1.__importStar(require("./process"));
+const error_1 = require("../../core/error");
 const installText = "Install";
 const learnMoreText = "Learn More";
 const learnMoreUrl = "https://aka.ms/teamsfx-ca-certificate";
@@ -20,6 +21,7 @@ const warningMessage = 'To debug applications in Teams, your localhost server mu
  For more information "https://aka.ms/teamsfx-ca-certificate".';
 const confirmMessage = warningMessage +
     " You may be asked for your account credentials when installing the certificate.";
+const trustCertificateCancelError = teamsfx_api_1.returnUserError(new Error("User canceled. For Teams to trust the self-signed SSL certificate used by the toolkit, a self-signed certificate must be added to your certificate store."), error_1.CoreSource, "TrustCertificateCancelError", learnMoreUrl);
 class LocalCertificateManager {
     constructor(ui, logger) {
         this.ui = ui;
@@ -35,7 +37,7 @@ class LocalCertificateManager {
      * - Add to cert store if not trusted (friendly name as well)
      */
     async setupCertificate(needTrust) {
-        var _a, _b;
+        var _a;
         const certFilePath = `${this.certFolder}/${constants_1.LocalDebugCertificate.CertFileName}`;
         const keyFilePath = `${this.certFolder}/${constants_1.LocalDebugCertificate.KeyFileName}`;
         const localCert = {
@@ -45,7 +47,6 @@ class LocalCertificateManager {
         try {
             let certThumbprint = undefined;
             await fs.ensureDir(this.certFolder);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info("Detecting/Verifying local certificate.");
             if ((await fs.pathExists(certFilePath)) && (await fs.pathExists(keyFilePath))) {
                 const certContent = await fs.readFile(certFilePath, { encoding: "utf8" });
                 const keyContent = await fs.readFile(keyFilePath, { encoding: "utf8" });
@@ -64,20 +65,20 @@ class LocalCertificateManager {
                     localCert.isTrusted = true;
                 }
                 else {
-                    localCert.isTrusted = await this.trustCertificate(localCert.certPath, certThumbprint, constants_1.LocalDebugCertificate.FriendlyName);
+                    await this.trustCertificate(localCert, certThumbprint, constants_1.LocalDebugCertificate.FriendlyName);
                 }
             }
         }
         catch (error) {
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.warning(`Failed to setup certificate. Error: ${error}`);
+            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.warning(`Failed to setup certificate. Error: ${error}`);
             localCert.isTrusted = false;
+            localCert.error = teamsfx_api_1.returnUserError(error, error_1.CoreSource, "SetupCertificateError", learnMoreUrl);
         }
         finally {
             return localCert;
         }
     }
     async generateCertificate(certFile, keyFile) {
-        var _a;
         // prepare attributes and extensions
         const now = new Date();
         const expiry = new Date();
@@ -132,7 +133,6 @@ class LocalCertificateManager {
         const keyContent = node_forge_1.pki.privateKeyToPem(keys.privateKey);
         await fs.writeFile(certFile, certContent, { encoding: "utf8" });
         await fs.writeFile(keyFile, keyContent, { encoding: "utf8" });
-        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info(`Local certificate generated to ${certFile}`);
         return thumbprint;
     }
     verifyCertificateContent(certContent, keyContent) {
@@ -228,35 +228,44 @@ class LocalCertificateManager {
             return false;
         }
     }
-    async trustCertificate(certPath, thumbprint, friendlyName) {
+    async trustCertificate(localCert, thumbprint, friendlyName) {
         var _a;
         try {
             if (os.type() === "Windows_NT") {
                 if (!(await this.waitForUserConfirm())) {
-                    return false;
+                    localCert.isTrusted = false;
+                    localCert.error = trustCertificateCancelError;
+                    return;
                 }
-                const installCertCommand = `(Import-Certificate -FilePath '${certPath}' -CertStoreLocation Cert:\\CurrentUser\\Root)[0].Thumbprint`;
+                const installCertCommand = `(Import-Certificate -FilePath '${localCert.certPath}' -CertStoreLocation Cert:\\CurrentUser\\Root)[0].Thumbprint`;
                 const thumbprint = (await ps.execPowerShell(installCertCommand)).trim();
                 const friendlyNameCommand = `(Get-ChildItem -Path Cert:\\CurrentUser\\Root\\${thumbprint}).FriendlyName='${friendlyName}'`;
                 await ps.execPowerShell(friendlyNameCommand);
-                return true;
+                localCert.isTrusted = true;
+                return;
             }
             else if (os.type() === "Darwin") {
                 if (!(await this.waitForUserConfirm())) {
-                    return false;
+                    localCert.isTrusted = false;
+                    localCert.error = trustCertificateCancelError;
+                    return;
                 }
-                await ps.execShell(`security add-trusted-cert -p ssl -k "${os.homedir()}/Library/Keychains/login.keychain-db" "${certPath}"`);
-                return true;
+                await ps.execShell(`security add-trusted-cert -p ssl -k "${os.homedir()}/Library/Keychains/login.keychain-db" "${localCert.certPath}"`);
+                localCert.isTrusted = true;
+                return;
             }
             else {
                 // TODO: Linux
-                return undefined;
+                localCert.isTrusted = undefined;
+                return;
             }
         }
         catch (error) {
             // treat any error as install failure, to not block the main progress
             (_a = this.logger) === null || _a === void 0 ? void 0 : _a.warning(`Failed to install certificate. Error: ${error}`);
-            return false;
+            localCert.isTrusted = false;
+            localCert.error = teamsfx_api_1.returnUserError(error, error_1.CoreSource, "TrustCertificateError", learnMoreUrl);
+            return;
         }
     }
     async waitForUserConfirm() {

package/build/common/local/localCertificateManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"localCertificateManager.js","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,qDAA+B;AAC/B,~~wDAAwF~~;~~AACxF~~,2CAA2C;AAC3C,+CAAyB;AACzB,+BAAoC;AAEpC,2CAAoD;AACpD,sDAAgC;~~AAEhC~~,MAAM,WAAW,GAAG,SAAS,CAAC;AAC9B,MAAM,aAAa,GAAG,YAAY,CAAC;AACnC,MAAM,YAAY,GAAG,uCAAuC,CAAC;AAC7D,MAAM,cAAc,GAClB;;;+DAG6D,CAAC;AAChE,MAAM,cAAc,GAClB,cAAc;IACd,iFAAiF,CAAC;~~AAQpF~~,MAAa,uBAAuB;IAKlC,YAAY,EAAoB,EAAE,MAAoB;QACpD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC,OAAO,EAAE,KAAK,8BAAgB,cAAc,CAAC;IACvE,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,gBAAgB,CAAC,SAAkB;;QAC9C,MAAM,YAAY,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,iCAAqB,CAAC,YAAY,EAAE,CAAC;QAChF,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,iCAAqB,CAAC,WAAW,EAAE,CAAC;QAC9E,MAAM,SAAS,GAAqB;YAClC,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,WAAW;SACrB,CAAC;QAEF,IAAI;YACF,IAAI,cAAc,GAAuB,SAAS,CAAC;YACnD,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEpC,~~MAAA,~~IAAI,CAAC,MAAM,~~0CAAE,IAAI,CAAC,wCAAwC,CAAC,CAAC;YAE5D,IAAI,CAAC,MAAM,~~EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE;gBAC7E,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC1E,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBACxE,MAAM,SAAS,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;gBACzE,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE;oBAChB,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;iBAC/B;aACF;YAED,IAAI,CAAC,cAAc,EAAE;gBACnB,wBAAwB;gBACxB,cAAc,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;aAC5E;YAED,IAAI,SAAS,EAAE;gBACb,IAAI,cAAc,IAAI,CAAC,MAAM,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC,EAAE;oBAC3E,kBAAkB;oBAClB,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC;iBAC5B;qBAAM;oBACL,~~SAAS,CAAC,SAAS,GAAG,~~MAAM,IAAI,CAAC,gBAAgB,~~CAC/C~~,SAAS,~~CAAC~~,~~QAAQ,EAClB,~~cAAc,EACd,iCAAqB,CAAC,YAAY,CACnC,CAAC;iBACH;aACF;SACF;QAAC,OAAO,KAAU,EAAE;YACnB,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;YACrE,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC;~~SAC7B~~;gBAAS;YACR,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,QAAgB,EAAE,OAAe;;QACjE,oCAAoC;QACpC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QAC1B,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;QAE7C,MAAM,YAAY,GAAG,SAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG;YACZ;gBACE,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,WAAW;aACnB;SACF,CAAC;QACF,MAAM,IAAI,GAAG;YACX;gBACE,IAAI,EAAE,kBAAkB;gBACxB,EAAE,EAAE,KAAK;aACV;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE,IAAI;aACjB;YACD;gBACE,IAAI,EAAE,gBAAgB;gBACtB,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAE,CAAC;wBACP,KAAK,EAAE,WAAW;qBACnB;iBACF;aACF;SACF,CAAC;QAEF,wBAAwB;QACxB,MAAM,IAAI,GAAG,gBAAG,CAAC,GAAG,CAAC,eAAe,CAAC;YACnC,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,gBAAG,CAAC,iBAAiB,EAAE,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/C,iBAAiB;QACjB,MAAM,GAAG,GAAG,iBAAI,CAAC,KAAK,CAAC,gBAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC/D,MAAM,CAAC,GAAG,eAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3B,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;QAEtC,SAAS;QACT,MAAM,WAAW,GAAG,gBAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,gBAAG,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAE9D,~~MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,kCAAkC,QAAQ,EAAE,CAAC,CAAC;QAChE,~~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~~QAAgB~~,~~EAChB~~,UAAkB,EAClB,YAAoB;;QAEpB,IAAI;YACF,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,YAAY,EAAE;gBAC9B,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,EAAE;oBACtC,~~OAAO~~,KAAK,CAAC;~~iBACd~~;gBAED,MAAM,kBAAkB,GAAG,kCAAkC,QAAQ,8DAA8D,CAAC;~~gBACpI~~,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAExE,MAAM,mBAAmB,GAAG,kDAAkD,UAAU,mBAAmB,YAAY,GAAG,CAAC;gBAC3H,MAAM,EAAE,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;gBAE7C,~~OAAO~~,IAAI,CAAC;~~aACb~~;iBAAM,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,QAAQ,EAAE;gBACjC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,EAAE;oBACtC,~~OAAO~~,KAAK,CAAC;~~iBACd~~;gBAED,MAAM,EAAE,CAAC,SAAS,CAChB,wCAAwC,EAAE,CAAC,OAAO,EAAE,~~0CAA0C~~,~~QAAQ~~,GAAG,~~CAC1G~~,CAAC;gBAEF,~~OAAO~~,IAAI,CAAC;~~aACb~~;iBAAM;gBACL,cAAc;gBACd,~~OAAO~~,SAAS,CAAC;~~aAClB~~;SACF;QAAC,OAAO,~~KAAK~~,EAAE;~~YACd~~,qEAAqE;YACrE,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAC,yCAAyC,KAAK,EAAE,CAAC,CAAC;YACvE,~~OAAO~~,KAAK,CAAC;~~SACd~~;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC9B,IAAI,IAAI,CAAC,EAAE,EAAE;YACX,IAAI,YAAgC,CAAC;YACrC,GAAG;gBACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CACnC,MAAM,EACN,cAAc,EACd,IAAI,EACJ,aAAa,EACb,WAAW,CACZ,CAAC;gBACF,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBAClD,IAAI,YAAY,KAAK,aAAa,EAAE;oBAClC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;iBAC/B;aACF,QAAQ,YAAY,KAAK,aAAa,EAAE;YACzC,OAAO,YAAY,KAAK,WAAW,CAAC;SACrC;QAED,iCAAiC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;CACF;~~AAtTD~~,~~0DAsTC~~"}
1	+ {"version":3,"file":"localCertificateManager.js","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"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"}

package/build/common/local/localEnvManager.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { Json, LogProvider, ProjectSettings, TelemetryReporter, UserInteraction } from "@microsoft/teamsfx-api";
 import { NpmInstallLogInfo } from "./npmLogHelper";
 import { DepsType } from "../deps-checker/depsChecker";
+import { LocalCertificate } from "./localCertificateManager";
 export declare class LocalEnvManager {
     private readonly logger;
     private readonly telemetry;
@@ -14,7 +15,7 @@ export declare class LocalEnvManager {
         projectId: string;
     }): Promise<Json | undefined>;
     getProjectSettings(projectPath: string): Promise<ProjectSettings>;
-    resolveLocalCertificate(trustDevCert: boolean): Promise<boolean | undefined>;
+    resolveLocalCertificate(trustDevCert: boolean): Promise<LocalCertificate>;
     private retry;
 }
 //# sourceMappingURL=localEnvManager.d.ts.map

package/build/common/local/localEnvManager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"localEnvManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EACJ,WAAW,EACX,eAAe,EAEf,iBAAiB,EAEjB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAwB,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAKzE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;~~AAIvD~~,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgC;IAC1D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA8B;gBAErC,MAAM,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,iBAAiB,EAAE,EAAE,CAAC,EAAE,eAAe;IAM9E,qBAAqB,CAAC,eAAe,EAAE,eAAe,GAAG,QAAQ,EAAE;IAmC7D,iBAAiB,CAC5B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,IAAI,GAAG,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAIrB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAI9D,aAAa,CACxB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,EAAE,CAAC;IAIP,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,GACnC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAQf,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAyBjE,uBAAuB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,~~OAAO~~,~~GAAG,SAAS,~~CAAC;~~YAO3E~~,KAAK;CAiBpB"}
1	+ {"version":3,"file":"localEnvManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EACJ,WAAW,EACX,eAAe,EAEf,iBAAiB,EAEjB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAwB,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAKzE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,2BAA2B,CAAC;AAGtF,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgC;IAC1D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA8B;gBAErC,MAAM,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,iBAAiB,EAAE,EAAE,CAAC,EAAE,eAAe;IAM9E,qBAAqB,CAAC,eAAe,EAAE,eAAe,GAAG,QAAQ,EAAE;IAmC7D,iBAAiB,CAC5B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,IAAI,GAAG,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAIrB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAI9D,aAAa,CACxB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,EAAE,CAAC;IAIP,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,GACnC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAQf,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAyBjE,uBAAuB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAQxE,KAAK;CAiBpB"}

package/build/common/local/localEnvManager.js CHANGED Viewed

@@ -17,6 +17,7 @@ const error_1 = require("../../core/error");
 const depsChecker_1 = require("../deps-checker/depsChecker");
 const projectSettingsHelper_1 = require("./projectSettingsHelper");
 const localCertificateManager_1 = require("./localCertificateManager");
+const depsManager_1 = require("../deps-checker/depsManager");
 class LocalEnvManager {
     constructor(logger, telemetry, ui) {
         this.logger = logger;
@@ -52,7 +53,7 @@ class LocalEnvManager {
         if (includeBot) {
             depsTypes.push(depsChecker_1.DepsType.Ngrok);
         }
-        return depsTypes;
+        return depsManager_1.DepsManager.sortBySequence(depsTypes);
     }
     async getLocalDebugEnvs(projectPath, projectSettings, localSettings) {
         return await localSettingsHelper_1.convertToLocalEnvs(projectPath, projectSettings, localSettings, this.logger);
@@ -61,7 +62,7 @@ class LocalEnvManager {
         return await npmLogHelper_1.getNpmInstallLogInfo();
     }
     async getPortsInUse(projectPath, projectSettings) {
-        return await portChecker_1.getPortsInUse(projectPath, projectSettings);
+        return await portChecker_1.getPortsInUse(projectPath, projectSettings, false, this.logger);
     }
     async getLocalSettings(projectPath, cryptoOption) {
         const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(projectPath);
@@ -85,9 +86,10 @@ class LocalEnvManager {
         });
     }
     async resolveLocalCertificate(trustDevCert) {
-        const certManager = new localCertificateManager_1.LocalCertificateManager(this.ui, this.logger);
-        const localCert = await certManager.setupCertificate(trustDevCert);
-        return localCert.isTrusted;
+        // Do not print any log in LocalCertificateManager, use the error message returned instead.
+        const certManager = new localCertificateManager_1.LocalCertificateManager(this.ui);
+        const res = await certManager.setupCertificate(trustDevCert);
+        return res;
     }
     // Retry logic when reading project config files in case of read-write conflict
     async retry(func) {

package/build/common/local/localEnvManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,wDAUgC;AAChC,qDAA+B;AAC/B,mDAA6B;AAE7B,+DAA2D;AAC3D,oEAAiE;AACjE,iDAAyE;AACzE,+CAA8C;AAC9C,oCAAuC;AACvC,8CAAgD;AAChD,4CAA6D;AAC7D,6DAAuD;AACvD,mEAAgE;AAChE,~~uEAAoE~~;~~AAEpE~~,MAAa,eAAe;IAK1B,YAAY,MAAoB,EAAE,SAA6B,EAAE,EAAoB;QACnF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAEM,qBAAqB,CAAC,eAAgC;QAC3D,MAAM,SAAS,GAAe,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,6CAAqB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QAC/E,MAAM,iBAAiB,GAAG,6CAAqB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACnF,MAAM,cAAc,GAAG,6CAAqB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAG,6CAAqB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAErE,SAAS;QACT,IAAI,MAAM,EAAE;YACV,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,QAAQ,CAAC,CAAC;SACnC;aAAM,IAAI,cAAc,EAAE;YACzB,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,YAAY,CAAC,CAAC;SACvC;aAAM;YACL,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,SAAS,CAAC,CAAC;SACpC;QAED,SAAS;QACT,IAAI,CAAC,eAAe,IAAI,iBAAiB,CAAC,IAAI,cAAc,EAAE;YAC5D,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,MAAM,CAAC,CAAC;SACjC;QAED,qBAAqB;QACrB,IAAI,cAAc,EAAE;YAClB,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,aAAa,CAAC,CAAC;SACxC;QAED,QAAQ;QACR,IAAI,UAAU,EAAE;YACd,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,KAAK,CAAC,CAAC;SAChC;QAED,OAAO,SAAS,CAAC;~~IACnB~~,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,WAAmB,EACnB,eAAgC,EAChC,aAA+B;QAE/B,OAAO,MAAM,wCAAkB,CAAC,WAAW,EAAE,eAAe,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5F,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,OAAO,MAAM,mCAAoB,EAAE,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,WAAmB,EACnB,eAAgC;QAEhC,OAAO,MAAM,2BAAa,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;~~IAC3D~~,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,WAAmB,EACnB,YAAoC;QAEpC,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,oBAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAChG,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;YACjC,OAAO,MAAM,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,WAAmB;QACjD,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;YACjC,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CACtC,WAAW,EACX,IAAI,8BAAgB,EAAE,EACtB,oCAAsB,EACtB,qCAAuB,CACxB,CAAC;YAEF,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,EAAE;gBAC/C,MAAM,IAAI,uBAAS,CACjB,mBAAmB,EACnB,yCAAyC,mBAAmB,EAAE,EAC9D,kBAAU,CACX,CAAC;aACH;YAED,IAAI;gBACF,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;aAC/C;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,qBAAa,CAAC,KAAK,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAAC,YAAqB;QACxD,MAAM,WAAW,GAAG,IAAI,iDAAuB,CAAC,IAAI,CAAC,EAAE,~~EAAE,IAAI,~~CAAC,~~MAAM,~~CAAC~~,CAAC~~;~~QACtE~~,MAAM,~~SAAS~~,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;~~QACnE~~,OAAO,~~SAAS~~,CAAC~~,SAAS,CAAC~~;~~IAC7B~~,CAAC;IAED,+EAA+E;IACvE,KAAK,CAAC,KAAK,CAAI,IAAuC;QAC5D,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,IAAI,KAAK,GAAG,SAAS,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,EAAE;YACb,IAAI,CAAC,KAAK,CAAC,EAAE;gBACX,MAAM,mBAAW,CAAC,CAAC,CAAC,CAAC;aACtB;YAED,IAAI;gBACF,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;aACtB;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,GAAG,CAAC,CAAC;gBACV,EAAE,CAAC,CAAC;aACL;SACF;QACD,MAAM,KAAK,CAAC;IACd,CAAC;CACF;~~AA7HD~~,~~0CA6HC~~"}
1	+ {"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"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"}

package/build/common/local/localEnvProvider.js CHANGED Viewed

@@ -12,7 +12,7 @@ const constants_1 = require("./constants");
 exports.EnvKeysFrontend = Object.freeze({
     Browser: "BROWSER",
     Https: "HTTPS",
-    Port: "Port",
+    Port: "PORT",
     SslCrtFile: "SSL_CRT_FILE",
     SslKeyFile: "SSL_KEY_FILE",
     TeamsFxEndpoint: "REACT_APP_TEAMSFX_ENDPOINT",

package/build/common/local/localSettingsHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"localSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EACJ,WAAW,EACX,eAAe,EAChB,MAAM,wBAAwB,CAAC;~~AAuChC~~,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,IAAI,GAAG,SAAS,EAC/B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8IjC"}
1	+ {"version":3,"file":"localSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EACJ,WAAW,EACX,eAAe,EAChB,MAAM,wBAAwB,CAAC;AA0ChC,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,IAAI,GAAG,SAAS,EAC/B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8IjC"}

package/build/common/local/localSettingsHelper.js CHANGED Viewed

@@ -6,6 +6,7 @@ exports.convertToLocalEnvs = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const os = tslib_1.__importStar(require("os"));
+const localSettingsConstants_1 = require("../localSettingsConstants");
 const tools_1 = require("../tools");
 const constants_1 = require("./constants");
 const localEnvProvider_1 = require("./localEnvProvider");
@@ -38,17 +39,17 @@ async function convertToLocalEnvs(projectPath, projectSettings, localSettings, l
     const frontendConfigs = teamsfx_api_1.ConfigMap.fromJSON(localSettings === null || localSettings === void 0 ? void 0 : localSettings.frontend);
     const teamsAppConfigs = teamsfx_api_1.ConfigMap.fromJSON(localSettings === null || localSettings === void 0 ? void 0 : localSettings.teamsApp);
     // get config for local debug
-    const clientId = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.ClientId);
-    const clientSecret = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.ClientSecret);
-    const applicationIdUri = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.ApplicationIdUris);
-    const teamsAppTenantId = teamsAppConfigs === null || teamsAppConfigs === void 0 ? void 0 : teamsAppConfigs.get(constants_1.LocalSettingsTeamsAppKeys.TenantId);
-    const localAuthEndpoint = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.SimpleAuthServiceEndpoint);
-    const localTabEndpoint = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.TabEndpoint);
-    const localFuncEndpoint = backendConfigs === null || backendConfigs === void 0 ? void 0 : backendConfigs.get(constants_1.LocalSettingsBackendKeys.FunctionEndpoint);
+    const clientId = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(localSettingsConstants_1.LocalSettingsAuthKeys.ClientId);
+    const clientSecret = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(localSettingsConstants_1.LocalSettingsAuthKeys.ClientSecret);
+    const applicationIdUri = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(localSettingsConstants_1.LocalSettingsAuthKeys.ApplicationIdUris);
+    const teamsAppTenantId = teamsAppConfigs === null || teamsAppConfigs === void 0 ? void 0 : teamsAppConfigs.get(localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId);
+    const localAuthEndpoint = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(localSettingsConstants_1.LocalSettingsSimpleAuthKeys.SimpleAuthServiceEndpoint);
+    const localTabEndpoint = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.TabEndpoint);
+    const localFuncEndpoint = backendConfigs === null || backendConfigs === void 0 ? void 0 : backendConfigs.get(localSettingsConstants_1.LocalSettingsBackendKeys.FunctionEndpoint);
     const localEnvs = {};
     if (includeFrontend) {
-        localEnvs[constants_1.LocalEnvFrontendKeys.Browser] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.Browser);
-        localEnvs[constants_1.LocalEnvFrontendKeys.Https] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.Https);
+        localEnvs[constants_1.LocalEnvFrontendKeys.Browser] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.Browser);
+        localEnvs[constants_1.LocalEnvFrontendKeys.Https] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.Https);
         if (!isMigrateFromV1) {
             localEnvs[constants_1.LocalEnvFrontendKeys.Port] = "53000";
         }
@@ -84,23 +85,23 @@ async function convertToLocalEnvs(projectPath, projectSettings, localSettings, l
             localEnvs[constants_1.LocalEnvBackendKeys.ApplicationIdUri] = applicationIdUri;
             localEnvs[constants_1.LocalEnvBackendKeys.AllowedAppIds] = tools_1.getAllowedAppIds().join(";");
         }
-        localEnvs[constants_1.LocalEnvCertKeys.SslCrtFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.SslCertFile);
-        localEnvs[constants_1.LocalEnvCertKeys.SslKeyFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.SslKeyFile);
+        localEnvs[constants_1.LocalEnvCertKeys.SslCrtFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.SslCertFile);
+        localEnvs[constants_1.LocalEnvCertKeys.SslKeyFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.SslKeyFile);
     }
     if (includeBot) {
         // bot local env
         if (projectSettingsHelper_1.ProjectSettingsHelper.isMigrateFromV1(projectSettings)) {
-            localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotId);
-            localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotPassword);
+            localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotId);
+            localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotPassword);
         }
         else {
-            localEnvs[constants_1.LocalEnvBotKeys.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotId);
-            localEnvs[constants_1.LocalEnvBotKeys.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotPassword);
+            localEnvs[constants_1.LocalEnvBotKeys.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotId);
+            localEnvs[constants_1.LocalEnvBotKeys.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotPassword);
             localEnvs[constants_1.LocalEnvBotKeys.ClientId] = clientId;
             localEnvs[constants_1.LocalEnvBotKeys.ClientSecret] = clientSecret;
             localEnvs[constants_1.LocalEnvBotKeys.TenantID] = teamsAppTenantId;
             localEnvs[constants_1.LocalEnvBotKeys.OauthAuthority] = "https://login.microsoftonline.com";
-            localEnvs[constants_1.LocalEnvBotKeys.LoginEndpoint] = `${botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotEndpoint)}/auth-start.html`;
+            localEnvs[constants_1.LocalEnvBotKeys.LoginEndpoint] = `${botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotEndpoint)}/auth-start.html`;
             localEnvs[constants_1.LocalEnvBotKeys.ApplicationIdUri] = applicationIdUri;
         }
         if (includeBackend) {

package/build/common/local/localSettingsHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"localSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,wDAMgC;AAChC,+CAAyB;AACzB,oCAA4C;AAC5C,~~2CAYqB~~;AACrB,yDAAsD;AACtD,mEAAgE;AAEhE,SAAS,oBAAoB;IAC3B,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,KAAK,8BAAgB,YAAY,CAAC;AAC1D,CAAC;AAED,SAAS,mBAAmB,CAC1B,MAAiC,EACjC,MAAiC,EACjC,MAAc;IAEd,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACrC,MAAM,SAAS,GAAG,GAAG,MAAM,GAAG,GAAG,EAAE,CAAC;QACpC,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE;YAC/D,kCAAkC;YAClC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;SACjC;KACF;AACH,CAAC;AAED,kGAAkG;AAClG,kEAAkE;AAC3D,KAAK,UAAU,kBAAkB,CACtC,WAAmB,EACnB,eAAgC,EAChC,aAA+B,EAC/B,MAAoB;IAEpB,MAAM,eAAe,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IAC/E,MAAM,cAAc,GAAG,6CAAqB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,6CAAqB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACrE,MAAM,UAAU,GAAG,6CAAqB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACrE,MAAM,iBAAiB,GAAG,6CAAqB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IACnF,MAAM,eAAe,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IAE/E,sBAAsB;IACtB,MAAM,WAAW,GAAG,uBAAS,CAAC,QAAQ,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,CAAC;IAC5D,MAAM,cAAc,GAAG,uBAAS,CAAC,QAAQ,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,CAAC;IAClE,MAAM,UAAU,GAAG,uBAAS,CAAC,QAAQ,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,uBAAS,CAAC,QAAQ,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,uBAAS,CAAC,QAAQ,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,CAAC;IAEpE,6BAA6B;IAC7B,MAAM,QAAQ,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,~~iCAAqB~~,CAAC,QAAQ,CAAW,CAAC;IAC5E,MAAM,YAAY,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,~~iCAAqB~~,CAAC,YAAY,CAAW,CAAC;IACpF,MAAM,gBAAgB,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,~~iCAAqB~~,CAAC,iBAAiB,CAAW,CAAC;IAC7F,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,~~qCAAyB~~,CAAC,QAAQ,CAAW,CAAC;IAE5F,MAAM,iBAAiB,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CACxC,~~iCAAqB~~,CAAC,yBAAyB,~~CACtC~~,CAAC;IACZ,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,~~qCAAyB~~,CAAC,WAAW,CAAW,CAAC;IAC/F,MAAM,iBAAiB,GAAG,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,GAAG,CAC3C,~~oCAAwB~~,CAAC,gBAAgB,CAChC,CAAC;IAEZ,MAAM,SAAS,GAA8B,EAAE,CAAC;IAChD,IAAI,eAAe,EAAE;QACnB,SAAS,CAAC,gCAAoB,CAAC,OAAO,CAAC,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAC5D,~~qCAAyB~~,CAAC,OAAO,CACxB,CAAC;QACZ,SAAS,CAAC,gCAAoB,CAAC,KAAK,CAAC,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAC1D,~~qCAAyB~~,CAAC,KAAK,CACtB,CAAC;QACZ,IAAI,CAAC,eAAe,EAAE;YACpB,SAAS,CAAC,gCAAoB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;SAChD;QAED,IAAI,UAAU,EAAE;YACd,sBAAsB;YACtB,SAAS,CAAC,gCAAoB,CAAC,QAAQ,CAAC,GAAG,GAAG,gBAAgB,kBAAkB,CAAC;YACjF,SAAS,CAAC,gCAAoB,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;SACrD;QAED,IAAI,iBAAiB,EAAE;YACrB,sBAAsB;YACtB,SAAS,CAAC,gCAAoB,CAAC,eAAe,CAAC,GAAG,iBAAiB,CAAC;YAEpE,sDAAsD;YACtD,SAAS,CAAC,4BAAgB,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC;YACrD,SAAS,CAAC,4BAAgB,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;YAChD,SAAS,CAAC,4BAAgB,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;YACxD,SAAS,CAAC,4BAAgB,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC;YAC7D,SAAS,CACP,4BAAgB,CAAC,kBAAkB,CACpC,GAAG,qCAAqC,gBAAgB,wCAAwC,CAAC;YAClG,SAAS,CACP,4BAAgB,CAAC,cAAc,CAChC,GAAG,qCAAqC,gBAAgB,EAAE,CAAC;YAC5D,SAAS,CAAC,4BAAgB,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC;YAC3D,SAAS,CAAC,4BAAgB,CAAC,aAAa,CAAC,GAAG,wBAAgB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzE,SAAS,CAAC,4BAAgB,CAAC,WAAW,CAAC,GAAG,oBAAoB,EAAE,CAAC;SAClE;QAED,IAAI,cAAc,EAAE;YAClB,SAAS,CAAC,gCAAoB,CAAC,YAAY,CAAC,GAAG,iBAAiB,CAAC;YACjE,SAAS,CAAC,gCAAoB,CAAC,QAAQ,CAAC,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,mBAA6B,CAAC;YAC1F,SAAS,CAAC,+BAAmB,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;YAE1D,sBAAsB;YACtB,SAAS,CAAC,+BAAmB,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;YACnD,SAAS,CAAC,+BAAmB,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;YAC3D,SAAS,CAAC,+BAAmB,CAAC,aAAa,CAAC,GAAG,mCAAmC,CAAC;YACnF,SAAS,CAAC,+BAAmB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC;YAC3D,SAAS,CAAC,+BAAmB,CAAC,WAAW,CAAC,GAAG,iBAAiB,CAAC;YAC/D,SAAS,CAAC,+BAAmB,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAAC;YACnE,SAAS,CAAC,+BAAmB,CAAC,aAAa,CAAC,GAAG,wBAAgB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC7E;QAED,SAAS,CAAC,4BAAgB,CAAC,UAAU,CAAC,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAC3D,~~qCAAyB~~,CAAC,WAAW,CACtC,CAAC;QACF,SAAS,CAAC,4BAAgB,CAAC,UAAU,CAAC,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAC3D,~~qCAAyB~~,CAAC,UAAU,CACrC,CAAC;KACH;IAED,IAAI,UAAU,EAAE;QACd,gBAAgB;QAChB,IAAI,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE;YAC1D,SAAS,CAAC,yCAA6B,CAAC,KAAK,CAAC,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAC9D,~~gCAAoB~~,CAAC,KAAK,CACjB,CAAC;YACZ,SAAS,CAAC,yCAA6B,CAAC,WAAW,CAAC,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CACpE,~~gCAAoB~~,CAAC,WAAW,CACvB,CAAC;SACb;aAAM;YACL,SAAS,CAAC,2BAAe,CAAC,KAAK,CAAC,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,~~gCAAoB~~,CAAC,KAAK,CAAW,CAAC;YACzF,SAAS,CAAC,2BAAe,CAAC,WAAW,CAAC,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CACtD,~~gCAAoB~~,CAAC,WAAW,CACvB,CAAC;YACZ,SAAS,CAAC,2BAAe,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;YAC/C,SAAS,CAAC,2BAAe,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;YACvD,SAAS,CAAC,2BAAe,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC;YACvD,SAAS,CAAC,2BAAe,CAAC,cAAc,CAAC,GAAG,mCAAmC,CAAC;YAChF,SAAS,CAAC,2BAAe,CAAC,aAAa,CAAC,GAAG,GACzC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,~~gCAAoB~~,CAAC,WAAW,CAClD,kBAAkB,CAAC;YACnB,SAAS,CAAC,2BAAe,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAAC;SAChE;QAED,IAAI,cAAc,EAAE;YAClB,SAAS,CAAC,+BAAmB,CAAC,WAAW,CAAC,GAAG,iBAAiB,CAAC;SAChE;KACF;IAED,sHAAsH;IACtH,IAAI;QACF,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,eAAe,EAAE;YACnB,MAAM,UAAU,GAAG,CACjB,MAAM,gBAAgB,CAAC,qBAAqB,CAAC,cAAc,EAAE,UAAU,EAAE,eAAe,CAAC,CAC1F,CAAC,mBAAmB,CAAC;YACtB,mBAAmB,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;SACzD;QACD,IAAI,cAAc,EAAE;YAClB,MAAM,UAAU,GAAG,CAAC,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,CAAC,CAAC,mBAAmB,CAAC;YACvF,mBAAmB,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;SACxD;QACD,IAAI,UAAU,EAAE;YACd,MAAM,UAAU,GAAG,CAAC,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;iBAC1E,mBAAmB,CAAC;YACvB,mBAAmB,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;SACpD;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,mCAAmC,KAAK,EAAE,CAAC,CAAC;KAC3D;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAnJD,gDAmJC"}
1	+ {"version":3,"file":"localSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.ts"],"names":[],"mappings":"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"}

package/build/common/local/portChecker.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import { ProjectSettings } from "@microsoft/teamsfx-api";
-export declare function getPortsInUse(projectPath: string, projectSettings: ProjectSettings, ignoreDebugPort?: boolean): Promise<number[]>;
+import { LogProvider, ProjectSettings } from "@microsoft/teamsfx-api";
+export declare function getPortsInUse(projectPath: string, projectSettings: ProjectSettings, ignoreDebugPort?: boolean, logger?: LogProvider): Promise<number[]>;
 //# sourceMappingURL=portChecker.d.ts.map

package/build/common/local/portChecker.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,~~eAAe~~,EAAE,MAAM,wBAAwB,CAAC;~~AA6BzD~~,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,~~GACxB~~,OAAO,CAAC,MAAM,EAAE,CAAC,~~CA4CnB~~"}
1	+ {"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAmB,MAAM,wBAAwB,CAAC;AA+CvF,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CA+CnB"}

package/build/common/local/portChecker.js CHANGED Viewed

@@ -4,11 +4,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPortsInUse = void 0;
 const tslib_1 = require("tslib");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const path = tslib_1.__importStar(require("path"));
 const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const constants_1 = require("./constants");
 const packageJsonHelper_1 = require("./packageJsonHelper");
 const projectSettingsHelper_1 = require("./projectSettingsHelper");
+const error_1 = require("../../core/error");
+const telemetry_1 = require("../telemetry");
 const frontendPortsV1 = [3000];
 const frontendPorts = [53000];
 const simpleAuthPorts = [55000];
@@ -19,28 +22,38 @@ const backendServicePorts = [7071];
 const botDebugPortRegex = /--inspect[\s]*=[\s"']*9239/im;
 const botDebugPorts = [9239];
 const botServicePorts = [3978];
-async function detectPortListening(port) {
+async function detectPortListening(port, logger) {
     try {
+        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DetectPortStart, { port: port.toString() });
         const portChosen = await detect_port_1.default(port);
+        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DetectPort, {
+            portChosen: portChosen.toString(),
+            port: port.toString(),
+        });
         return portChosen !== port;
     }
-    catch (_a) {
+    catch (error) {
         // ignore any error to not block debugging
+        telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DetectPort, teamsfx_api_1.returnUserError(error, error_1.CoreSource, "DetectPortError"));
+        logger === null || logger === void 0 ? void 0 : logger.warning(`Failed to detect port. ${error === null || error === void 0 ? void 0 : error.message} `);
         return false;
     }
 }
-async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
+async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort, logger) {
     const ports = [];
     const includeFrontend = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
     if (includeFrontend) {
         const migrateFromV1 = projectSettingsHelper_1.ProjectSettingsHelper.isMigrateFromV1(projectSettings);
         if (!migrateFromV1) {
             ports.push(...frontendPorts);
-            ports.push(...simpleAuthPorts);
         }
         else {
             ports.push(...frontendPortsV1);
         }
+        const includeSimpleAuth = projectSettingsHelper_1.ProjectSettingsHelper.includeSimpleAuth(projectSettings);
+        if (includeSimpleAuth) {
+            ports.push(...simpleAuthPorts);
+        }
     }
     const includeBackend = projectSettingsHelper_1.ProjectSettingsHelper.includeBackend(projectSettings);
     if (includeBackend) {
@@ -64,7 +77,7 @@ async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
     }
     const portsInUse = [];
     for (const port of ports) {
-        if (await detectPortListening(port)) {
+        if (await detectPortListening(port, logger)) {
             portsInUse.push(port);
         }
     }

package/build/common/local/portChecker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;~~AAGb~~,mDAA6B;AAC7B,sEAAqC;AAErC,2CAAyC;AACzC,2DAA2D;AAC3D,mEAAgE;~~AAEhE~~,MAAM,eAAe,GAAG,CAAC,IAAI,CAAC,CAAC;AAC/B,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,CAAC;AAC9B,MAAM,eAAe,GAAG,CAAC,KAAK,CAAC,CAAC;AAChC,MAAM,qBAAqB,GAAG,8BAA8B,CAAC;AAC7D,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,CAAC;AACjC,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,mBAAmB,GAAG,CAAC,IAAI,CAAC,CAAC;AACnC,MAAM,iBAAiB,GAAG,8BAA8B,CAAC;AACzD,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,CAAC;AAC7B,MAAM,eAAe,GAAG,CAAC,IAAI,CAAC,CAAC;AAE/B,KAAK,UAAU,mBAAmB,CAAC,IAAY;~~IAC7C~~,IAAI;QACF,MAAM,UAAU,GAAG,MAAM,qBAAU,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,UAAU,KAAK,IAAI,CAAC;KAC5B;IAAC,~~WAAM~~;~~QACN~~,0CAA0C;QAC1C,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAmB,EACnB,eAAgC,EAChC,eAAyB;~~IAEzB~~,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,MAAM,eAAe,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IAC/E,IAAI,eAAe,EAAE;QACnB,MAAM,aAAa,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QAC7E,IAAI,CAAC,aAAa,EAAE;YAClB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;~~YAC7B~~,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;SAChC;~~aAAM~~;~~YACL~~,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;SAChC;KACF;IAED,MAAM,cAAc,GAAG,6CAAqB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAC7E,IAAI,cAAc,EAAE;QAClB,KAAK,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,eAAe,KAAK,IAAI,CAAC,EAAE;YAC/B,MAAM,gBAAgB,GAAG,MAAM,wCAAoB,CACjD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,QAAQ,CAAC,CAC5C,CAAC;YACF,IAAI,gBAAgB,KAAK,SAAS,IAAI,qBAAqB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBAClF,KAAK,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;aAClC;SACF;KACF;IACD,MAAM,UAAU,GAAG,6CAAqB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACrE,IAAI,UAAU,EAAE;QACd,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;QAC/B,IAAI,CAAC,CAAC,eAAe,KAAK,IAAI,CAAC,EAAE;YAC/B,MAAM,YAAY,GAAG,MAAM,wCAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YACxF,IAAI,YAAY,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBACtE,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;aAC9B;SACF;KACF;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,MAAM,mBAAmB,CAAC,IAAI,CAAC,EAAE;~~YACnC~~,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACvB;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;~~AAhDD~~,~~sCAgDC~~"}
1	+ {"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"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"}

package/build/common/local/projectSettingsHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;~~AAWhF~~,qBAAa,qBAAqB;IAEhC,OAAc,MAAM,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAEtD;WAEV,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAMtE,cAAc,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WASrE,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;IAK/E,OAAc,UAAU,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,~~CAGvD~~;~~IAE3B~~,OAAc,iBAAiB,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAGhD;IAEzC,OAAc,eAAe,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAClC;CACtD"}
1	+ {"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAYhF,qBAAa,qBAAqB;IAEhC,OAAc,MAAM,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAEtD;WAEV,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAMtE,cAAc,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WASrE,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;IAK/E,OAAc,UAAU,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAI9E;IAEJ,OAAc,iBAAiB,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAGhD;IAEzC,OAAc,eAAe,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAClC;CACtD"}

package/build/common/local/projectSettingsHelper.js CHANGED Viewed

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectSettingsHelper = void 0;
 const question_1 = require("../../plugins/solution/fx-solution/question");
+const constants_1 = require("../constants");
 const tools_1 = require("../tools");
 class ProjectSettingsHelper {
     static includeFrontend(projectSettings) {
@@ -31,10 +32,9 @@ ProjectSettingsHelper.isSpfx = (projectSettings) => {
         question_1.HostTypeOptionSPFx.id;
 };
 ProjectSettingsHelper.includeAAD = (projectSettings) => {
-    var _a;
+    var _a, _b;
     return !ProjectSettingsHelper.isMigrateFromV1(projectSettings) &&
-        ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.hostType) ===
-            question_1.HostTypeOptionAzure.id;
+        !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.includes(constants_1.ResourcePlugins.Aad));
 };
 ProjectSettingsHelper.includeSimpleAuth = (projectSettings) =>
 // TODO: update this when retiring simple auth service

package/build/common/local/projectSettingsHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,0EAOqD;AACrD,oCAA+C;AAE/C,MAAa,qBAAqB;IAMzB,MAAM,CAAC,eAAe,CAAC,eAA4C;QACxE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,GAAG,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QACjD,OAAO,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACjG,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,eAA4C;QACvE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,cAAc,GAAG,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAA2B,KAAI,EAAE,CAAC;QAC5E,OAAO,CACL,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE;YACrD,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,eAA4C;;QACnE,MAAM,GAAG,GAAG,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,YAAY,KAAI,EAAE,CAAC;QAC7F,OAAO,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;;AAxBH,~~sDAsCC~~;~~AArCC~~,2CAA2C;AAC7B,4BAAM,GAAG,CAAC,eAA4C,EAAW,EAAE;;IAC/E,OAAA,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,QAAQ;QACtE,6BAAkB,CAAC,EAAE,CAAA;CAAA,CAAC;AAsBV,gCAAU,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACnF,OAAA,CAAC,qBAAqB,CAAC,eAAe,CAAC,eAAe,CAAC;QACvD,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,QAAQ~~;YACpE~~,~~8BAAmB~~,CAAC,~~EAAE~~,CAAA;CAAA,CAAC;~~AAEb~~,uCAAiB,GAAG,CAAC,eAA4C,EAAW,EAAE;AAC1F,sDAAsD;AACtD,CAAC,qBAAqB,CAAC,eAAe,CAAC,eAAe,CAAC;IACvD,CAAC,CAAC,2BAAmB,CAAC,eAAe,CAAC,CAAC;AAE3B,qCAAe,GAAG,CAAC,eAA4C,EAAW,EAAE,WACxF,OAAA,CAAC,CAAC,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAgB,0CAAE,aAAa,CAAA,CAAA,EAAA,CAAC"}
1	+ {"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,0EAOqD;AACrD,4CAA+C;AAC/C,oCAA+C;AAE/C,MAAa,qBAAqB;IAMzB,MAAM,CAAC,eAAe,CAAC,eAA4C;QACxE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,GAAG,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QACjD,OAAO,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACjG,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,eAA4C;QACvE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,cAAc,GAAG,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAA2B,KAAI,EAAE,CAAC;QAC5E,OAAO,CACL,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE;YACrD,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,eAA4C;;QACnE,MAAM,GAAG,GAAG,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,YAAY,KAAI,EAAE,CAAC;QAC7F,OAAO,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;;AAxBH,sDAuCC;AAtCC,2CAA2C;AAC7B,4BAAM,GAAG,CAAC,eAA4C,EAAW,EAAE;;IAC/E,OAAA,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,QAAQ;QACtE,6BAAkB,CAAC,EAAE,CAAA;CAAA,CAAC;AAsBV,gCAAU,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACnF,OAAA,CAAC,qBAAqB,CAAC,eAAe,CAAC,eAAe,CAAC;QACvD,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,QAAQ,CAC7F,2BAAe,CAAC,GAAG,CACpB,CAAA,CAAA;CAAA,CAAC;AAEU,uCAAiB,GAAG,CAAC,eAA4C,EAAW,EAAE;AAC1F,sDAAsD;AACtD,CAAC,qBAAqB,CAAC,eAAe,CAAC,eAAe,CAAC;IACvD,CAAC,CAAC,2BAAmB,CAAC,eAAe,CAAC,CAAC;AAE3B,qCAAe,GAAG,CAAC,eAA4C,EAAW,EAAE,WACxF,OAAA,CAAC,CAAC,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAgB,0CAAE,aAAa,CAAA,CAAA,EAAA,CAAC"}