npm - @microsoft/teamsfx-core - Versions diffs - 2.0.13-rc.1 → 2.0.14-alpha.038ce65fb.0 - Mend

@microsoft/teamsfx-core 2.0.13-rc.1 → 2.0.14-alpha.038ce65fb.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 (145) hide show

package/build/component/driver/aad/update.js CHANGED Viewed

@@ -14,6 +14,7 @@ const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry
 const aadAppClient_1 = require("./utility/aadAppClient");
 const buildAadManifest_1 = require("./utility/buildAadManifest");
 const constants_1 = require("./utility/constants");
+const aadManifestHelper_1 = require("./utility/aadManifestHelper");
 exports.actionName = "aadApp/update"; // DO NOT MODIFY the name
 const helpLink = "https://aka.ms/teamsfx-actions/aadapp-update";
 // logic from src\component\resource\aadApp\aadAppManifestManager.ts
@@ -23,29 +24,42 @@ let UpdateAadAppDriver = class UpdateAadAppDriver {
         this.progressTitle = (0, localizeUtils_1.getLocalizedString)("driver.aadApp.progressBar.updateAadAppTitle");
     }
     async execute(args, context) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const summaries = [];
         try {
             (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.info((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.startExecuteDriver, exports.actionName));
             const state = this.loadCurrentState();
             this.validateArgs(args);
             const aadAppClient = new aadAppClient_1.AadAppClient(context.m365TokenProvider, context.logProvider);
-            const manifest = await (0, buildAadManifest_1.buildAadManifest)(context, args.manifestPath, args.outputFilePath, state);
+            let manifest = await (0, buildAadManifest_1.buildAadManifest)(context, args.manifestPath, args.outputFilePath, state);
             // MS Graph API does not allow adding new OAuth permissions and pre authorize it within one request
             // So split update Microsoft Entra app to two requests:
             // 1. If there's preAuthorizedApplications, remove it temporary and update Microsoft Entra app to create possible new permission
-            if (manifest.preAuthorizedApplications && manifest.preAuthorizedApplications.length > 0) {
-                const preAuthorizedApplications = manifest.preAuthorizedApplications;
-                manifest.preAuthorizedApplications = [];
-                await aadAppClient.updateAadApp(manifest);
-                manifest.preAuthorizedApplications = preAuthorizedApplications;
+            if (aadManifestHelper_1.AadManifestHelper.isNewAADManifestSchema(manifest)) {
+                manifest = manifest;
+                if (((_b = manifest.api) === null || _b === void 0 ? void 0 : _b.preAuthorizedApplications) &&
+                    ((_c = manifest.api.preAuthorizedApplications) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+                    const preAuthorizedApplications = manifest.api.preAuthorizedApplications;
+                    manifest.api.preAuthorizedApplications = [];
+                    await aadAppClient.updateAadApp(manifest);
+                    manifest.api.preAuthorizedApplications = preAuthorizedApplications;
+                }
+            }
+            else {
+                manifest = manifest;
+                if (manifest.preAuthorizedApplications && manifest.preAuthorizedApplications.length > 0) {
+                    const preAuthorizedApplications = manifest.preAuthorizedApplications;
+                    manifest.preAuthorizedApplications = [];
+                    await aadAppClient.updateAadApp(manifest);
+                    manifest.preAuthorizedApplications = preAuthorizedApplications;
+                }
             }
             // 2. Update Microsoft Entra app again with full manifest to set preAuthorizedApplications
             await aadAppClient.updateAadApp(manifest);
             const summary = (0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.successUpdateAadAppManifest, args.manifestPath, manifest.id);
-            (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.info(summary);
+            (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.info(summary);
             summaries.push(summary);
-            (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.info((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.successExecuteDriver, exports.actionName));
+            (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.info((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.successExecuteDriver, exports.actionName));
             return {
                 result: (0, teamsfx_api_1.ok)(new Map(Object.entries(state) // convert each property to Map item
                     .filter((item) => item[1] && item[1] !== "") // do not return Map item that is empty
@@ -55,7 +69,7 @@ let UpdateAadAppDriver = class UpdateAadAppDriver {
         }
         catch (error) {
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, error.displayMessage));
+                (_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, error.displayMessage));
                 return {
                     result: (0, teamsfx_api_1.err)(error),
                     summaries: summaries,
@@ -65,7 +79,7 @@ let UpdateAadAppDriver = class UpdateAadAppDriver {
                 error.response // If no response, treat as unhandled error first to understand the actual problem
             ) {
                 const message = JSON.stringify(error.response.data);
-                (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, message));
+                (_g = context.logProvider) === null || _g === void 0 ? void 0 : _g.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, message));
                 if (error.response.status >= 400 && error.response.status < 500) {
                     return {
                         result: (0, teamsfx_api_1.err)(new common_1.HttpClientError(error, exports.actionName, message, helpLink)),
@@ -80,7 +94,7 @@ let UpdateAadAppDriver = class UpdateAadAppDriver {
                 }
             }
             const message = JSON.stringify(error);
-            (_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, message));
+            (_h = context.logProvider) === null || _h === void 0 ? void 0 : _h.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, message));
             return {
                 result: (0, teamsfx_api_1.err)((0, common_1.assembleError)(error, exports.actionName)),
                 summaries: summaries,

package/build/component/driver/aad/update.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,+CAA8C;AAC9C,wDAAyE;AACzE,0DAA0B;AAC1B,mCAAiC;AACjC,iEAAmE;AACnE,kDAK+B;AAG/B,mFAAgF;AAGhF,yDAAsD;AACtD,iEAA8D;AAC9D,mDAA6E;~~AAEhE~~,QAAA,UAAU,GAAG,eAAe,CAAC,CAAC,yBAAyB;AACpE,MAAM,QAAQ,GAAG,8CAA8C,CAAC;AAChE,oEAAoE;AAEpE,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,gBAAW,GAAG,IAAA,kCAAkB,EAAC,kCAAsB,CAAC,MAAM,CAAC,CAAC;QACvD,kBAAa,GAAG,IAAA,kCAAkB,EAAC,6CAA6C,CAAC,CAAC;~~IAmH7F~~,CAAC;~~IAhHQ~~,KAAK,CAAC,OAAO,CAAC,IAAsB,EAAE,OAAsB;;QACjE,MAAM,SAAS,GAAa,EAAE,CAAC;QAE/B,IAAI;YACF,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,IAAA,kCAAkB,EAAC,0BAAc,CAAC,kBAAkB,EAAE,kBAAU,CAAC,CAAC,CAAC;YAC7F,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAEtC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAEtF,~~MAAM~~,QAAQ,GAAG,MAAM,IAAA,mCAAgB,~~EACrC~~,OAAO,~~EACP~~,IAAI,CAAC,YAAY,~~EACjB~~,IAAI,CAAC,cAAc,~~EACnB~~,KAAK,~~CACN~~,CAAC;~~YAEF~~,mGAAmG;YACnG,uDAAuD;YACvD,gIAAgI;~~YAChI~~,IAAI,QAAQ,CAAC,yBAAyB,IAAI,QAAQ,CAAC,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE;~~gBACvF~~,MAAM,yBAAyB,GAAG,QAAQ,CAAC,yBAAyB,CAAC;~~gBACrE~~,QAAQ,CAAC,yBAAyB,GAAG,EAAE,CAAC;~~gBACxC~~,MAAM,YAAY,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;~~gBAC1C~~,QAAQ,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;~~aAChE~~;~~YACD~~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~~AAhHC~~;IADC,IAAA,WAAK,EAAC,CAAC,IAAA,iDAAuB,EAAC,kBAAU,EAAE,kBAAU,CAAC,CAAC,CAAC;;;;~~iDA2FxD~~;~~AA/FU~~,kBAAkB;IAD9B,IAAA,gBAAO,EAAC,kBAAU,CAAC,CAAC,iCAAiC;GACzC,kBAAkB,~~CAqH9B~~;~~AArHY~~,gDAAkB"}
1	+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/component/driver/aad/update.ts"],"names":[],"mappings":"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"}

package/build/component/driver/aad/utility/aadAppClient.d.ts CHANGED Viewed

@@ -20,7 +20,7 @@ export declare class AadAppClient {
     deleteAadApp(id: string): Promise<void>;
     generateClientSecret(objectId: string, clientSecretExpireDays?: number, // Recommended lifetime from Azure Portal
     clientSecretDescription?: string): Promise<string>;
-    updateAadApp(manifest: AADManifest): Promise<void>;
+    updateAadApp(manifest: AADManifest | AADApplication): Promise<void>;
     getOwners(objectId: string): Promise<AadOwner[] | undefined>;
     addOwner(objectId: string, userObjectId: string): Promise<void>;
     private is404Error;

package/build/component/driver/aad/utility/aadAppClient.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAmB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAG5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAQlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAO7D,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAiB,kBAAkB;QACjC,aAAa,CAAC,EAAE,iBAAiB,CAAC;KACnC;CACF;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;gBAE1D,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,WAAW;IAwC9D,YAAY,CACvB,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,cAA4C,EAC5D,0BAA0B,CAAC,EAAE,MAAM,GAClC,OAAO,CAAC,cAAc,CAAC;IAab,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,oBAAoB,CAC/B,QAAQ,EAAE,MAAM,EAChB,sBAAsB,SAAM,EAAE,yCAAyC;IACvE,uBAAuB,SAAY,GAClC,OAAO,CAAC,MAAM,CAAC;IA2CL,YAAY,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA+~~BlD~~,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;IA0B5D,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5E,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,UAAU;CAGnB"}
1	+ {"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAmB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAG5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAQlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAO7D,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAiB,kBAAkB;QACjC,aAAa,CAAC,EAAE,iBAAiB,CAAC;KACnC;CACF;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;gBAE1D,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,WAAW;IAwC9D,YAAY,CACvB,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,cAA4C,EAC5D,0BAA0B,CAAC,EAAE,MAAM,GAClC,OAAO,CAAC,cAAc,CAAC;IAab,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,oBAAoB,CAC/B,QAAQ,EAAE,MAAM,EAChB,sBAAsB,SAAM,EAAE,yCAAyC;IACvE,uBAAuB,SAAY,GAClC,OAAO,CAAC,MAAM,CAAC;IA2CL,YAAY,CAAC,QAAQ,EAAE,WAAW,GAAG,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BnE,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;IA0B5D,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5E,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,UAAU;CAGnB"}

package/build/component/driver/aad/utility/aadAppClient.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"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~~QAAqB~~;;~~QAC7C~~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"}
1	+ {"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAE9C,0DAA8E;AAC9E,sEAA4D;AAC5D,4DAA2D;AAC3D,oEAAsE;AAEtE,8DAA+D;AAC/D,gEAGmC;AACnC,sFAAmF;AACnF,4FAAyF;AAIzF,gEAA6D;AAC7D,2DAAwD;AACxD,2CAA2C;AAW3C,MAAa,YAAY;IAOvB,YAAY,iBAAoC,EAAE,WAAyB;QAN1D,gBAAW,GAAW,CAAC,CAAC;QAIxB,YAAO,GAAW,kCAAkC,CAAC;QAGpE,IAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC;QACvC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,mGAAmG;QACnG,IAAI,CAAC,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC;YACxB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;;YACnD,MAAA,IAAI,CAAC,WAAW,0CAAE,KAAK,CACrB,IAAA,kCAAkB,EAAC,+BAA+B,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAC7F,CAAC;YAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,uBAAW,EAAE,CAAC,CAAC;YACvF,IAAI,aAAa,CAAC,KAAK,EAAE,EAAE;gBACzB,MAAM,aAAa,CAAC,KAAK,CAAC;aAC3B;YACD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;YAElC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBACnB,MAAM,CAAC,OAAO,GAAG,EAAyB,CAAC;aAC5C;YACD,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAC;YAEpD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;;YAChD,MAAA,IAAI,CAAC,WAAW,0CAAE,KAAK,CACrB,IAAA,kCAAkB,EAAC,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACpF,CAAC;YACF,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,gIAAgI;QAChI,IAAA,qBAAU,EAAC,IAAI,CAAC,KAAK,EAAE;YACrB,OAAO,EAAE,IAAI,CAAC,WAAW;YACzB,UAAU,EAAE,qBAAU,CAAC,gBAAgB;YACvC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,qBAAU,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,qBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,gDAAgD;SAC3H,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,WAAmB,EACnB,iBAAiC,+BAAc,CAAC,YAAY,EAC5D,0BAAmC;QAEnC,MAAM,WAAW,GAAmB;YAClC,WAAW,EAAE,WAAW;YACxB,cAAc,EAAE,cAAc;YAC9B,0BAA0B,EAAE,0BAA0B;SACvD,CAAC,CAAC,kEAAkE;QAErE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAEpE,OAAuB,QAAQ,CAAC,IAAI,CAAC;IACvC,CAAC;IAGM,KAAK,CAAC,YAAY,CAAC,EAAU;QAClC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC;IAGM,KAAK,CAAC,oBAAoB,CAC/B,QAAgB,EAChB,sBAAsB,GAAG,GAAG,EAAE,yCAAyC;IACvE,uBAAuB,GAAG,SAAS;;QAEnC,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,sBAAsB,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG;YAClB,kBAAkB,EAAE;gBAClB,WAAW,EAAE,uBAAuB;gBACpC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE;gBAClC,aAAa,EAAE,SAAS,CAAC,WAAW,EAAE;aACvC;SACF,CAAC;QAEF,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,QAAQ,cAAc,EAAE,WAAW,EAAE;gBAC1F,aAAa,EAAE;oBACb,OAAO,EAAE,IAAI,CAAC,WAAW;oBACzB,UAAU,EAAE,qBAAU,CAAC,gBAAgB;oBACvC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,qBAAU,CAAC,cAAc,CAAC,KAAK,CAAC;wBAChC,qBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC;wBAClC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,oGAAoG;iBAC/H;aACF,CAAC,CAAC;YAEH,OAAO,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC;SACjC;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,eAAK,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE;gBAC3C,IACE,CAAA,MAAA,MAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,0CAAE,KAAK,0CAAE,IAAI,MAAK,wBAAY,CAAC,uCAAuC,EACvF;oBACA,MAAM,IAAI,+DAA8B,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;iBAC7D;gBACD,IACE,CAAA,MAAA,MAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,0CAAE,KAAK,0CAAE,IAAI,MAAK,wBAAY,CAAC,sCAAsC,EACtF;oBACA,MAAM,IAAI,yDAA2B,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;iBAC1D;aACF;YACD,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAGM,KAAK,CAAC,YAAY,CAAC,QAAsC;;QAC9D,MAAM,QAAQ,GAAG,QAAQ,CAAC,EAAG,CAAC,CAAC,sDAAsD;QACrF,MAAM,WAAW,GAAG,qCAAiB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACtE,IAAI;YACF,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,QAAQ,EAAE,EAAE,WAAW,EAAE;gBAC9D,aAAa,EAAE;oBACb,OAAO,EAAE,IAAI,CAAC,WAAW;oBACzB,UAAU,EAAE,qBAAU,CAAC,gBAAgB;oBACvC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,qBAAU,CAAC,cAAc,CAAC,KAAK,CAAC;wBAChC,qBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC;wBAClC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,oGAAoG;wBAC9H,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,oHAAoH;iBAC/I;aACF,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,eAAK,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;gBAC1E,IAAI,CAAA,MAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,0CAAE,IAAI,MAAK,wBAAY,CAAC,mBAAmB,EAAE;oBACtE,MAAM,IAAI,sDAAmC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;iBAClE;gBACD,IAAI,CAAA,MAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,0CAAE,IAAI,MAAK,wBAAY,CAAC,2BAA2B,EAAE;oBAC9E,MAAM,IAAI,mDAAgC,CACxC,YAAY,CAAC,IAAI,EACjB,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAChC,CAAC;iBACH;aACF;YACD,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,QAAgB;;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,QAAQ,SAAS,EAAE;YACvE,aAAa,EAAE;gBACb,OAAO,EAAE,IAAI,CAAC,WAAW;gBACzB,UAAU,EAAE,qBAAU,CAAC,gBAAgB;gBACvC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,qBAAU,CAAC,cAAc,CAAC,KAAK,CAAC;oBAChC,qBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,oGAAoG;aAC/H;SACF,CAAC,CAAC;QAEH,MAAM,SAAS,GAAe,EAAE,CAAC;QACjC,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;YAC1C,SAAS,CAAC,IAAI,CAAC;gBACb,YAAY,EAAE,QAAQ,CAAC,EAAE;gBACzB,UAAU,EAAE,QAAQ;gBACpB,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,4FAA4F;gBAC5F,iBAAiB,EAAE,MAAA,QAAQ,CAAC,IAAI,mCAAI,QAAQ,CAAC,iBAAiB;aAC/D,CAAC,CAAC;SACJ;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,QAAgB,EAAE,YAAoB;QAC1D,MAAM,WAAW,GAAG;YAClB,4EAA4E;YAC5E,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,qBAAqB,YAAY,EAAE;SAC/E,CAAC;QAEF,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,QAAQ,cAAc,EAAE,WAAW,EAAE;YACzE,aAAa,EAAE;gBACb,OAAO,EAAE,IAAI,CAAC,WAAW;gBACzB,UAAU,EAAE,qBAAU,CAAC,gBAAgB;gBACvC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,qBAAU,CAAC,cAAc,CAAC,KAAK,CAAC;oBAChC,qBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,oGAAoG;aAC/H;SACF,CAAC,CAAC;IACL,CAAC;IAED,0IAA0I;IAClI,UAAU,CAAC,KAAsB;QACvC,OAAO,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;IAC7F,CAAC;IAEO,UAAU,CAAC,KAAsB;QACvC,OAAO,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;IAC7F,CAAC;CACF;AAxJC;IADC,IAAA,WAAK,EAAC,CAAC,IAAA,2BAAc,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;;;;gDAevE;AAGD;IADC,IAAA,WAAK,EAAC,CAAC,IAAA,2BAAc,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;;;;gDAGvE;AAGD;IADC,IAAA,WAAK,EAAC,CAAC,IAAA,2BAAc,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;;;;wDA6CvE;AAGD;IADC,IAAA,WAAK,EAAC,CAAC,IAAA,2BAAc,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;;;;gDA8BvE;AAED;IADC,IAAA,WAAK,EAAC,CAAC,IAAA,2BAAc,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;;;;6CAyBvE;AAED;IADC,IAAA,WAAK,EAAC,CAAC,IAAA,2BAAc,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;;;;4CAiBvE;AA7LH,oCAuMC"}

package/build/component/driver/aad/utility/aadManifestHelper.d.ts CHANGED Viewed

@@ -1,9 +1,10 @@
 import { AADApplication } from "../interface/AADApplication";
 import { AADManifest } from "../interface/AADManifest";
 export declare class AadManifestHelper {
-    static manifestToApplication(manifest: AADManifest): AADApplication;
+    static manifestToApplication(manifest: AADManifest | AADApplication): AADApplication;
     static applicationToManifest(app: AADApplication): AADManifest;
-    static validateManifest(manifest: AADManifest): string;
-    static processRequiredResourceAccessInManifest(manifest: AADManifest): void;
+    static validateManifest(manifest: AADManifest | AADApplication): string;
+    static processRequiredResourceAccessInManifest(manifest: AADManifest | AADApplication): void;
+    static isNewAADManifestSchema(manifest: AADManifest | AADApplication): boolean;
 }
 //# sourceMappingURL=aadManifestHelper.d.ts.map

package/build/component/driver/aad/utility/aadManifestHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aadManifestHelper.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAgBvD,qBAAa,iBAAiB;WACd,qBAAqB,CAAC,QAAQ,EAAE,WAAW,GAAG,cAAc;~~WAwE5D~~,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,WAAW;WA+EvD,gBAAgB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM;~~WA8C/C~~,uCAAuC,~~CAAC~~,QAAQ,EAAE,WAAW,GAAG,IAAI;~~CAmDnF~~"}
1	+ {"version":3,"file":"aadManifestHelper.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAgBvD,qBAAa,iBAAiB;WACd,qBAAqB,CAAC,QAAQ,EAAE,WAAW,GAAG,cAAc,GAAG,cAAc;WA8E7E,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,WAAW;WA+EvD,gBAAgB,CAAC,QAAQ,EAAE,WAAW,GAAG,cAAc,GAAG,MAAM;WA4EhE,uCAAuC,CACnD,QAAQ,EAAE,WAAW,GAAG,cAAc,GACrC,IAAI;WAoDO,sBAAsB,CAAC,QAAQ,EAAE,WAAW,GAAG,cAAc,GAAG,OAAO;CAGtF"}

package/build/component/driver/aad/utility/aadManifestHelper.js CHANGED Viewed

@@ -11,6 +11,10 @@ const componentName = "AadManifestHelper";
 class AadManifestHelper {
     static manifestToApplication(manifest) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        if (this.isNewAADManifestSchema(manifest)) {
+            return manifest;
+        }
+        manifest = manifest;
         const result = {
             id: manifest.id,
             appId: manifest.appId,
@@ -148,12 +152,8 @@ class AadManifestHelper {
         return result;
     }
     static validateManifest(manifest) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         let warningMsg = "";
-        // if manifest doesn't contain name property or name is empty
-        if (!manifest.name || manifest.name === "") {
-            warningMsg += aadManifestError_1.AadManifestErrorMessage.NameIsMissing;
-        }
         // if manifest doesn't contain signInAudience property
         if (!manifest.signInAudience) {
             warningMsg += aadManifestError_1.AadManifestErrorMessage.SignInAudienceIsMissing;
@@ -162,23 +162,51 @@ class AadManifestHelper {
         if (!manifest.requiredResourceAccess) {
             warningMsg += aadManifestError_1.AadManifestErrorMessage.RequiredResourceAccessIsMissing;
         }
-        // if manifest doesn't contain oauth2Permissions or oauth2Permissions length is 0
-        if (!manifest.oauth2Permissions || manifest.oauth2Permissions.length === 0) {
-            warningMsg += aadManifestError_1.AadManifestErrorMessage.Oauth2PermissionsIsMissing;
-        }
-        // if manifest doesn't contain preAuthorizedApplications
-        if (!manifest.preAuthorizedApplications || manifest.preAuthorizedApplications.length === 0) {
-            warningMsg += aadManifestError_1.AadManifestErrorMessage.PreAuthorizedApplicationsIsMissing;
+        if (AadManifestHelper.isNewAADManifestSchema(manifest)) {
+            manifest = manifest;
+            // if manifest doesn't contain name property or name is empty
+            if (!manifest.displayName || manifest.displayName === "") {
+                warningMsg += aadManifestError_1.AadManifestErrorMessage.NameIsMissing;
+            }
+            // if manifest doesn't contain oauth2Permissions or oauth2Permissions length is 0
+            if (!((_a = manifest.api) === null || _a === void 0 ? void 0 : _a.oauth2PermissionScopes) ||
+                ((_b = manifest.api) === null || _b === void 0 ? void 0 : _b.oauth2PermissionScopes.length) === 0) {
+                warningMsg += aadManifestError_1.AadManifestErrorMessage.Oauth2PermissionsIsMissing;
+            }
+            // if manifest doesn't contain preAuthorizedApplications
+            if (!((_c = manifest.api) === null || _c === void 0 ? void 0 : _c.preAuthorizedApplications) ||
+                ((_d = manifest.api) === null || _d === void 0 ? void 0 : _d.preAuthorizedApplications.length) === 0) {
+                warningMsg += aadManifestError_1.AadManifestErrorMessage.PreAuthorizedApplicationsIsMissing;
+            }
+            // if accessTokenAcceptedVersion in manifest is not 2
+            if (((_e = manifest.api) === null || _e === void 0 ? void 0 : _e.requestedAccessTokenVersion) !== 2) {
+                warningMsg += aadManifestError_1.AadManifestErrorMessage.AccessTokenAcceptedVersionIs1;
+            }
         }
-        // if accessTokenAcceptedVersion in manifest is not 2
-        if (manifest.accessTokenAcceptedVersion !== 2) {
-            warningMsg += aadManifestError_1.AadManifestErrorMessage.AccessTokenAcceptedVersionIs1;
+        else {
+            manifest = manifest;
+            // if manifest doesn't contain name property or name is empty
+            if (!manifest.name || manifest.name === "") {
+                warningMsg += aadManifestError_1.AadManifestErrorMessage.NameIsMissing;
+            }
+            // if manifest doesn't contain oauth2Permissions or oauth2Permissions length is 0
+            if (!manifest.oauth2Permissions || manifest.oauth2Permissions.length === 0) {
+                warningMsg += aadManifestError_1.AadManifestErrorMessage.Oauth2PermissionsIsMissing;
+            }
+            // if manifest doesn't contain preAuthorizedApplications
+            if (!manifest.preAuthorizedApplications || manifest.preAuthorizedApplications.length === 0) {
+                warningMsg += aadManifestError_1.AadManifestErrorMessage.PreAuthorizedApplicationsIsMissing;
+            }
+            // if accessTokenAcceptedVersion in manifest is not 2
+            if (manifest.accessTokenAcceptedVersion !== 2) {
+                warningMsg += aadManifestError_1.AadManifestErrorMessage.AccessTokenAcceptedVersionIs1;
+            }
         }
         // if manifest doesn't contain optionalClaims or access token doesn't contain idtyp clams
         if (!manifest.optionalClaims) {
             warningMsg += aadManifestError_1.AadManifestErrorMessage.OptionalClaimsIsMissing;
         }
-        else if (!((_a = manifest.optionalClaims.accessToken) === null || _a === void 0 ? void 0 : _a.find((item) => item.name === "idtyp"))) {
+        else if (!((_f = manifest.optionalClaims.accessToken) === null || _f === void 0 ? void 0 : _f.find((item) => item.name === "idtyp"))) {
             warningMsg += aadManifestError_1.AadManifestErrorMessage.OptionalClaimsMissingIdtypClaim;
         }
         if (warningMsg) {
@@ -235,6 +263,9 @@ class AadManifestHelper {
             });
         });
     }
+    static isNewAADManifestSchema(manifest) {
+        return "displayName" in manifest;
+    }
 }
 exports.AadManifestHelper = AadManifestHelper;
 //# sourceMappingURL=aadManifestHelper.js.map

package/build/component/driver/aad/utility/aadManifestHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aadManifestHelper.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,0EAA0C;AAC1C,gDAAkD;AAClD,gEASmC;AAEnC,MAAM,aAAa,GAAG,mBAAmB,CAAC;AAE1C,MAAa,iBAAiB;IACrB,MAAM,CAAC,qBAAqB,CAAC,~~QAAqB~~;;~~QACvD~~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~~QAAqB~~;;~~QAClD~~,IAAI,UAAU,GAAG,EAAE,CAAC;QAEpB,~~6DAA6D~~;~~QAC7D~~,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,EAAE,EAAE;~~YAC1C~~,UAAU,IAAI,0CAAuB,CAAC,aAAa,CAAC;~~SACrD~~;~~QAED~~,~~sDAAsD~~;~~QACtD~~,IAAI,CAAC,QAAQ,CAAC,~~cAAc~~,EAAE;~~YAC5B~~,UAAU,IAAI,0CAAuB,CAAC,~~uBAAuB~~,CAAC;~~SAC/D~~;~~QAED~~,~~8DAA8D~~;~~QAC9D~~,IAAI,CAAC,QAAQ,CAAC,~~sBAAsB~~,EAAE;~~YACpC~~,UAAU,IAAI,0CAAuB,CAAC~~,+BAA+B~~,CAAC;~~SACvE~~;~~QAED~~,iFAAiF;~~QACjF~~,IAAI,CAAC,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;~~YAC1E~~,UAAU,IAAI,0CAAuB,CAAC,0BAA0B,CAAC;~~SAClE~~;~~QAED~~,wDAAwD;~~QACxD~~,IAAI,CAAC,QAAQ,CAAC,yBAAyB,IAAI,QAAQ,CAAC,yBAAyB,CAAC,MAAM,KAAK,CAAC,EAAE;~~YAC1F~~,UAAU,IAAI,0CAAuB,CAAC,kCAAkC,CAAC;~~SAC1E~~;~~QAED~~,qDAAqD;~~QACrD~~,IAAI,QAAQ,CAAC,0BAA0B,KAAK,CAAC,EAAE;~~YAC7C~~,UAAU,IAAI,0CAAuB,CAAC,6BAA6B,CAAC;~~SACrE~~;QAED,yFAAyF;QACzF,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;YAC5B,UAAU,IAAI,0CAAuB,CAAC,uBAAuB,CAAC;SAC/D;aAAM,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,cAAc,CAAC,WAAW,0CAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA,EAAE;YACtF,UAAU,IAAI,0CAAuB,CAAC,+BAA+B,CAAC;SACvE;QAED,IAAI,UAAU,EAAE;YACd,UAAU,GAAG,0CAAuB,CAAC,iBAAiB,GAAG,UAAU,CAAC;SACrE;QACD,OAAO,UAAU,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAEM,MAAM,CAAC,uCAAuC,~~CAAC~~,~~QAAqB~~;;~~QACzE~~,MAAM,GAAG,GAAG,IAAA,8BAAgB,GAAE,CAAC;QAE/B,IAAI,QAAQ,CAAC,sBAAsB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;YACtF,MAAM,IAAI,+DAA4C,CAAC,aAAa,CAAC,CAAC;SACvE;QAED,MAAA,QAAQ,CAAC,sBAAsB,0CAAE,OAAO,CAAC,CAAC,0BAA0B,EAAE,EAAE;;YACtE,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,aAAa,CAAC;YAClE,IAAI,UAAU,GAAG,gBAAgB,CAAC;YAClC,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,IAAI,gDAA6B,CAAC,aAAa,CAAC,CAAC;aACxD;YACD,IAAI,CAAC,IAAA,gBAAM,EAAC,gBAAgB,CAAC,EAAE;gBAC7B,UAAU,GAAG,MAAA,GAAG,CAAC,gBAAgB,CAAC,0CAAE,EAAE,CAAC;gBACvC,IAAI,CAAC,UAAU,EAAE;oBACf,MAAM,IAAI,gDAA6B,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;iBAC1E;gBACD,0BAA0B,CAAC,aAAa,GAAG,UAAU,CAAC;aACvD;YAED,IACE,0BAA0B,CAAC,cAAc;gBACzC,CAAC,KAAK,CAAC,OAAO,CAAC,0BAA0B,CAAC,cAAc,CAAC,EACzD;gBACA,MAAM,IAAI,uDAAoC,CAAC,aAAa,CAAC,CAAC;aAC/D;YAED,MAAA,0BAA0B,CAAC,cAAc,0CAAE,OAAO,CAAC,CAAC,kBAAkB,EAAE,EAAE;;gBACxE,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,EAAE,CAAC;gBACrD,IAAI,CAAC,sBAAsB,EAAE;oBAC3B,MAAM,IAAI,mDAAgC,CAAC,aAAa,CAAC,CAAC;iBAC3D;gBACD,IAAI,CAAC,IAAA,gBAAM,EAAC,sBAAsB,CAAC,EAAE;oBACnC,IAAI,gBAAgB,CAAC;oBACrB,IAAI,kBAAkB,CAAC,IAAI,KAAK,OAAO,EAAE;wBACvC,gBAAgB,GAAG,MAAA,GAAG,CAAC,UAAU,CAAC,0CAAE,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;qBACnE;yBAAM,IAAI,kBAAkB,CAAC,IAAI,KAAK,MAAM,EAAE;wBAC7C,gBAAgB,GAAG,MAAA,GAAG,CAAC,UAAU,CAAC,0CAAE,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;qBAClE;yBAAM;wBACL,MAAM,IAAI,qDAAkC,CAAC,aAAa,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC;qBACtF;oBAED,IAAI,CAAC,gBAAgB,EAAE;wBACrB,MAAM,IAAI,mDAAgC,CAAC,aAAa,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC;qBAClF;oBACD,kBAAkB,CAAC,EAAE,GAAG,gBAAgB,CAAC;iBAC1C;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;~~AAzPD~~,~~8CAyPC~~"}
1	+ {"version":3,"file":"aadManifestHelper.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":"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"}

package/build/component/driver/aad/utility/buildAadManifest.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { DriverContext } from "../../interface/commonArgs";
 import { AADManifest } from "../interface/AADManifest";
 import { UpdateAadAppOutput } from "../interface/updateAadAppOutput";
-export declare function buildAadManifest(context: DriverContext, manifestPath: string, outputFilePath: string, state?: UpdateAadAppOutput): Promise<AADManifest>;
+import { AADApplication } from "../interface/AADApplication";
+export declare function buildAadManifest(context: DriverContext, manifestPath: string, outputFilePath: string, state?: UpdateAadAppOutput): Promise<AADManifest | AADApplication>;
 //# sourceMappingURL=buildAadManifest.d.ts.map

package/build/component/driver/aad/utility/buildAadManifest.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildAadManifest.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;~~AAOrE~~,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,WAAW,CAAC,~~CA0BtB~~"}
1	+ {"version":3,"file":"buildAadManifest.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAGrE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAK7D,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,WAAW,GAAG,cAAc,CAAC,CA0BvC"}

package/build/component/driver/aad/utility/buildAadManifest.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildAadManifest.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,0EAA0C;AAC1C,oEAAsE;AACtE,gEAAyD;AACzD,qDAIkC;AAClC,kDAA2F;AAE3F,sFAAuF;AAGvF,oDAAsD;AACtD,2DAAwD;~~AAExD~~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~~QAAqB~~,CAAC;~~QAC1B~~,IAAI;YACF,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;SACvC;QAAC,OAAO,KAAK,EAAE;YACd,4EAA4E;YAC5E,MAAM,IAAI,wBAAe,CAAC,YAAY,EAAE,KAAc,EAAE,UAAU,CAAC,CAAC;SACrE;QACD,qCAAiB,CAAC,uCAAuC,CAAC,QAAQ,CAAC,CAAC;QACpE,OAAO,QAAQ,CAAC;KACjB;YAAS;QACR,IAAI,wBAAwB,EAAE;YAC5B,6DAA6D;YAC7D,OAAO,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC;SACzD;KACF;AACH,CAAC"}
1	+ {"version":3,"file":"buildAadManifest.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"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"}

package/build/component/driver/apiKey/utility/utility.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utility.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/utility.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAOjE,wBAAgB,gBAAgB,CAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAMpC;AAGD,wBAAsB,SAAS,CAC7B,IAAI,EAAE,gBAAgB,GAAG,gBAAgB,EACzC,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,~~CA4BnB~~;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAQzE"}
1	+ {"version":3,"file":"utility.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/utility.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAOjE,wBAAgB,gBAAgB,CAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAMpC;AAGD,wBAAsB,SAAS,CAC7B,IAAI,EAAE,gBAAgB,GAAG,gBAAgB,EACzC,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CA6BnB;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAQzE"}

package/build/component/driver/apiKey/utility/utility.js CHANGED Viewed

@@ -24,15 +24,16 @@ async function getDomain(args, context, actionName) {
     const parser = new m365_spec_parser_1.SpecParser(absolutePath, {
         allowBearerTokenAuth: true,
         allowMultipleParameters: true,
+        projectType: m365_spec_parser_1.ProjectType.Copilot,
     });
     const listResult = await parser.list();
     const operations = listResult.APIs;
     const filteredOperations = operations.filter((value) => {
         const auth = value.auth;
         return (auth &&
-            auth.authScheme.type === "http" &&
-            auth.authScheme.scheme === "bearer" &&
-            auth.name === args.name);
+            auth.name === args.name &&
+            ((auth.authScheme.type === "http" && auth.authScheme.scheme === "bearer") ||
+                (auth.authScheme.type === "apiKey" && auth.authScheme.in !== "cookie")));
     });
     if (filteredOperations.length === 0) {
         throw new apiKeyAuthMissingInSpec_1.ApiKeyAuthMissingInSpecError(actionName, args.name);

package/build/component/driver/apiKey/utility/utility.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utility.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/utility.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,~~kEAAyD~~;~~AACzD~~,kDAAwD;AAIxD,2CAAiD;AACjD,sEAAwE;AACxE,8EAAgF;AAChF,8EAAgF;AAEhF,2DAA2D;AAC3D,SAAgB,gBAAgB,CAC9B,iBAAsC;IAEtC,MAAM,MAAM,GAAuC,EAAE,CAAC;IACtD,KAAK,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,iBAAiB,EAAE;QAC1D,MAAM,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KAChD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AARD,4CAQC;AAED,4FAA4F;AACrF,KAAK,UAAU,SAAS,CAC7B,IAAyC,EACzC,OAAsB,EACtB,UAAkB;IAElB,MAAM,YAAY,GAAG,IAAA,wBAAe,EAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAI,6BAAU,CAAC,YAAY,EAAE;QAC1C,oBAAoB,EAAE,IAAI;QAC1B,uBAAuB,EAAE,IAAI;~~KAC9B~~,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;IAEnC,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,OAAO,CACL,IAAI;YACJ,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,MAAM~~;YAC/B~~,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,QAAQ;~~YACnC~~,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,~~IAAI~~,~~CACxB~~,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,MAAM,IAAI,sDAA4B,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;KAC/D;IAED,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEhE,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC;IAE/F,OAAO,gBAAgB,CAAC;AAC1B,CAAC;~~AAhCD~~,~~8BAgCC~~;AAED,SAAgB,cAAc,CAAC,MAAgB,EAAE,UAAkB;IACjE,IAAI,MAAM,CAAC,MAAM,GAAG,8BAAkB,EAAE;QACtC,MAAM,IAAI,8CAAwB,CAAC,UAAU,CAAC,CAAC;KAChD;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;QAC9C,MAAM,IAAI,sDAA4B,CAAC,UAAU,CAAC,CAAC;KACpD;AACH,CAAC;AARD,wCAQC"}
1	+ {"version":3,"file":"utility.js","sourceRoot":"","sources":["../../../../../src/component/driver/apiKey/utility/utility.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kEAAsE;AACtE,kDAAwD;AAIxD,2CAAiD;AACjD,sEAAwE;AACxE,8EAAgF;AAChF,8EAAgF;AAEhF,2DAA2D;AAC3D,SAAgB,gBAAgB,CAC9B,iBAAsC;IAEtC,MAAM,MAAM,GAAuC,EAAE,CAAC;IACtD,KAAK,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,iBAAiB,EAAE;QAC1D,MAAM,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KAChD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AARD,4CAQC;AAED,4FAA4F;AACrF,KAAK,UAAU,SAAS,CAC7B,IAAyC,EACzC,OAAsB,EACtB,UAAkB;IAElB,MAAM,YAAY,GAAG,IAAA,wBAAe,EAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAI,6BAAU,CAAC,YAAY,EAAE;QAC1C,oBAAoB,EAAE,IAAI;QAC1B,uBAAuB,EAAE,IAAI;QAC7B,WAAW,EAAE,8BAAW,CAAC,OAAO;KACjC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;IAEnC,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,OAAO,CACL,IAAI;YACJ,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI;YACvB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,QAAQ,CAAC;gBACvE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAC1E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,MAAM,IAAI,sDAA4B,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;KAC/D;IAED,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEhE,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC;IAE/F,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAjCD,8BAiCC;AAED,SAAgB,cAAc,CAAC,MAAgB,EAAE,UAAkB;IACjE,IAAI,MAAM,CAAC,MAAM,GAAG,8BAAkB,EAAE;QACtC,MAAM,IAAI,8CAAwB,CAAC,UAAU,CAAC,CAAC;KAChD;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;QAC9C,MAAM,IAAI,sDAA4B,CAAC,UAAU,CAAC,CAAC;KACpD;AACH,CAAC;AARD,wCAQC"}

package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts CHANGED Viewed

@@ -9,6 +9,5 @@ export declare class CreateOrUpdateEnvironmentFileDriver implements StepDriver {
     execute(args: GenerateEnvArgs, ctx: DriverContext): Promise<ExecutionResult>;
     private handler;
     private validateArgs;
-    private getAbsolutePath;
 }
 //# sourceMappingURL=createOrUpdateEnvironmentFile.d.ts.map

package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createOrUpdateEnvironmentFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"~~AAUA~~,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;~~AAMjF~~,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;~~AAK9D~~,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAA+E;IAC1F,QAAQ,CAAC,aAAa,SAAqD;IAG9D,GAAG,CACd,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;YAa3E,OAAO;~~IA2CrB~~,OAAO,CAAC,YAAY;~~IAqBpB,OAAO,CAAC,eAAe;CAKxB~~"}
1	+ {"version":3,"file":"createOrUpdateEnvironmentFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"AASA,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;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAM9D,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAA+E;IAC1F,QAAQ,CAAC,aAAa,SAAqD;IAG9D,GAAG,CACd,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;YAa3E,OAAO;IAuDrB,OAAO,CAAC,YAAY;CAoBrB"}

package/build/component/driver/file/createOrUpdateEnvironmentFile.js CHANGED Viewed

@@ -16,6 +16,7 @@ const common_1 = require("../../../error/common");
 const common_2 = require("../../utils/common");
 const constants_1 = require("../aad/utility/constants");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
+const pathUtils_1 = require("../../utils/pathUtils");
 const actionName = "file/createOrUpdateEnvironmentFile";
 const helpLink = "https://aka.ms/teamsfx-actions/file-createOrUpdateEnvironmentFile";
 let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDriver {
@@ -45,15 +46,24 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
         var _a, _b, _c, _d;
         try {
             this.validateArgs(args);
-            const target = this.getAbsolutePath(args.target, context.projectPath);
+            const target = pathUtils_1.pathUtils.resolveFilePath(context.projectPath, args.target);
             await fs.ensureFile(target);
             const envs = dotenv.parse(await fs.readFile(target));
             (_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.debug(`Existing envs: ${JSON.stringify(envs)}`);
             const updatedEnvs = Object.entries(Object.assign(Object.assign({}, envs), args.envs)).map(([key, value]) => `${key}=${value}`);
             (_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.debug(`Updated envs: ${JSON.stringify(updatedEnvs)}`);
             await fs.writeFile(target, updatedEnvs.join(os.EOL));
+            const map = new Map();
+            const envFilePathRes = await pathUtils_1.pathUtils.getEnvFilePath(context.projectPath, process.env.TEAMSFX_ENV || "dev");
+            if (envFilePathRes.isOk()) {
+                if (path.resolve(target) === path.resolve(envFilePathRes.value)) {
+                    for (const key of Object.keys(args.envs)) {
+                        map.set(key, args.envs[key]);
+                    }
+                }
+            }
             return {
-                output: new Map(),
+                output: map,
                 summaries: [
                     (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.summary", path.normalize(target)),
                 ],
@@ -88,11 +98,6 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
             throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
         }
     }
-    getAbsolutePath(relativeOrAbsolutePath, projectPath) {
-        return path.isAbsolute(relativeOrAbsolutePath)
-            ? relativeOrAbsolutePath
-            : path.join(projectPath, relativeOrAbsolutePath);
-    }
 };
 tslib_1.__decorate([
     (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(actionName, actionName)]),

package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createOrUpdateEnvironmentFile.js","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAiC;AACjC,qDAA+B;AAC/B,+CAAyB;AACzB,mDAA6B;AAC7B,mCAAiC;~~AAEjC~~,+CAA8C;AAC9C,wDAAiF;~~AAEjF~~,iEAAmE;AACnE,kDAA+E;AAC/E,+CAA6C;AAC7C,wDAA0D;AAG1D,mFAAgF;~~AAGhF~~,MAAM,UAAU,GAAG,oCAAoC,CAAC;AACxD,MAAM,QAAQ,GAAG,mEAAmE,CAAC;AAGrF,IAAa,mCAAmC,GAAhD,MAAa,mCAAmC;IAAhD;QACE,gBAAW,GAAG,IAAA,kCAAkB,EAAC,uDAAuD,CAAC,CAAC;QACjF,kBAAa,GAAG,IAAA,kCAAkB,EAAC,6BAA6B,CAAC,CAAC;~~IAgG7E~~,CAAC;~~IA7FQ~~,KAAK,CAAC,GAAG,CACd,IAAqB,EACrB,OAAsB;QAEtB,OAAO,IAAA,gBAAO,EAAC,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,EAAE,UAAU,CAAC,CAAC;IACjB,CAAC;IAGM,KAAK,CAAC,OAAO,CAAC,IAAqB,EAAE,GAAkB;QAC5D,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,IAAA,gBAAO,EAAC,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,EAAE,UAAU,CAAC,CAAC;QACf,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,SAAS;SACV,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,IAAqB,EACrB,OAAsB;;QAKtB,IAAI;YACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,MAAM,GAAG,~~IAAI~~,CAAC,eAAe,CAAC,~~IAAI~~,CAAC,~~MAAO~~,EAAE,~~OAAO~~,CAAC,~~WAAW~~,CAAC,CAAC;~~YACvE~~,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YACrD,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,iCAAM,IAAI,GAAK,IAAI,CAAC,IAAI,EAAG,CAAC,GAAG,CAC/D,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CACpC,CAAC;YACF,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAC3E,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,OAAO;~~gBACL~~,MAAM,EAAE,IAAI,GAAG,~~EAAkB~~;~~gBACjC~~,SAAS,EAAE;oBACT,IAAA,kCAAkB,EAChB,mDAAmD,EACnD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB;iBACF;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,IAAA,kCAAkB,EAAC,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,IAAA,kCAAkB,EAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;YACF,MAAM,IAAA,sBAAa,EAAC,KAAc,EAAE,UAAU,CAAC,CAAC;SACjD;IACH,CAAC;IAEO,YAAY,CAAC,IAAqB;QACxC,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/E,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC/C,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAChC;aAAM;YACL,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC5C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBACtE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAChC;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;~~IAEO,eAAe,CAAC,sBAA8B,EAAE,WAAmB;QACzE,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC;YAC5C,CAAC,CAAC,sBAAsB;YACxB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;IACrD,CAAC;~~CACF,CAAA;~~AA7FC~~;IADC,IAAA,WAAK,EAAC,CAAC,IAAA,iDAAuB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;;;8DASxD;AAGD;IADC,IAAA,WAAK,EAAC,CAAC,IAAA,iDAAuB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;;;kEAYxD;AA3BU,mCAAmC;IAD/C,IAAA,gBAAO,EAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,mCAAmC,~~CAkG~~/C;~~AAlGY~~,kFAAmC"}
1	+ {"version":3,"file":"createOrUpdateEnvironmentFile.js","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"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"}

package/build/component/driver/script/scriptDriver.d.ts CHANGED Viewed

@@ -32,6 +32,5 @@ export declare function getStderrHandler(logProvider: LogProvider, systemEncodin
 export declare function bufferToString(data: Buffer, systemEncoding: string): string;
 export declare function convertScriptErrorToFxError(error: child_process.ExecException, run: string): ScriptTimeoutError | ScriptExecutionError;
 export declare function parseSetOutputCommand(stdout: string): DotenvOutput;
-export declare function capitalizeFirstLetter(raw: string): string;
 export {};
 //# sourceMappingURL=scriptDriver.d.ts.map

package/build/component/driver/script/scriptDriver.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";;;AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;~~AAM1C~~,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAGjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;~~AACnD~~,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;~~AAMtE~~,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgBhE;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAoB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAM3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,~~CA0ElD~~;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAUlE~~;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD~~"}
1	+ {"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";;;AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;AAK1C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAGjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgBhE;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAoB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAM3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CA0FlD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAUlE"}

package/build/component/driver/script/scriptDriver.js CHANGED Viewed

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalizeFirstLetter = exports.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.getStderrHandler = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = exports.defaultShell = void 0;
+exports.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.getStderrHandler = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = exports.defaultShell = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author huajiezhang <huajiezhang@microsoft.com>
@@ -12,14 +12,13 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const child_process_1 = tslib_1.__importDefault(require("child_process"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
-const os_1 = tslib_1.__importDefault(require("os"));
-const path = tslib_1.__importStar(require("path"));
 const typedi_1 = require("typedi");
+const stringUtils_1 = require("../../../common/stringUtils");
 const script_1 = require("../../../error/script");
 const commonConstant_1 = require("../../constant/commonConstant");
 const charsetUtils_1 = require("../../utils/charsetUtils");
+const pathUtils_1 = require("../../utils/pathUtils");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const stringUtils_1 = require("../../../common/stringUtils");
 const ACTION_NAME = "script";
 /**
  * Get the default shell for the current platform:
@@ -78,6 +77,25 @@ ScriptDriver = tslib_1.__decorate([
 exports.ScriptDriver = ScriptDriver;
 exports.scriptDriver = new ScriptDriver();
 async function executeCommand(command, projectPath, logProvider, ui, workingDirectory, env, shell, timeout, redirectTo) {
+    const workingDir = pathUtils_1.pathUtils.resolveFilePath(projectPath, workingDirectory);
+    if (ui === null || ui === void 0 ? void 0 : ui.runCommand) {
+        const res = await ui.runCommand({
+            cmd: command,
+            workingDirectory: workingDir,
+            timeout: timeout,
+            shell: shell,
+        });
+        if (res.isErr()) {
+            return (0, teamsfx_api_1.err)(res.error);
+        }
+        const outputString = res.value;
+        const outputObject = parseSetOutputCommand(command);
+        if (Object.keys(outputObject).length > 0)
+            logProvider.verbose(`script output env variables: ${(0, stringUtils_1.maskSecret)(JSON.stringify(outputObject), {
+                replace: "***",
+            })}`);
+        return (0, teamsfx_api_1.ok)([outputString, outputObject]);
+    }
     let systemEncoding = await (0, charsetUtils_1.getSystemEncoding)(command);
     if (command.startsWith("dotnet ")) {
         systemEncoding = "utf-8";
@@ -87,15 +105,9 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
         var _a, _b;
         const finalShell = shell || dshell;
         const finalCmd = command;
-        const platform = os_1.default.platform();
-        let workingDir = workingDirectory || ".";
-        workingDir = path.isAbsolute(workingDir) ? workingDir : path.join(projectPath, workingDir);
-        if (platform === "win32") {
-            workingDir = capitalizeFirstLetter(path.resolve(workingDir !== null && workingDir !== void 0 ? workingDir : ""));
-        }
         let appendFile = undefined;
         if (redirectTo) {
-            appendFile = path.isAbsolute(redirectTo) ? redirectTo : path.join(projectPath, redirectTo);
+            appendFile = pathUtils_1.pathUtils.resolveFilePath(projectPath, redirectTo);
         }
         logProvider.verbose(`Start to run command: "${(0, stringUtils_1.maskSecret)(finalCmd, {
             replace: "***",
@@ -184,8 +196,4 @@ function parseSetOutputCommand(stdout) {
     return output;
 }
 exports.parseSetOutputCommand = parseSetOutputCommand;
-function capitalizeFirstLetter(raw) {
-    return raw.charAt(0).toUpperCase() + raw.slice(1);
-}
-exports.capitalizeFirstLetter = capitalizeFirstLetter;
 //# sourceMappingURL=scriptDriver.js.map