@microsoft/teamsfx-core 2.0.3 → 2.0.4-alpha.06f5ef6da.0

package/build/component/driver/aad/utility/aadAppClient.js

@@ -4,12 +4,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AadAppClient = void 0;
 const tslib_1 = require("tslib");
+const lib_1 = require("@feathersjs/hooks/lib");
 const axios_1 = tslib_1.__importDefault(require("axios"));
-const aadManifestHelper_1 = require("../../../resource/aadApp/utils/aadManifestHelper");
-const tools_1 = require("../../../../common/tools");
-const constants_1 = require("../../../resource/aadApp/constants");
 const axios_retry_1 = tslib_1.__importDefault(require("axios-retry"));
+const tools_1 = require("../../../../common/tools");
+const globalVars_1 = require("../../../../core/globalVars");
+const aadManifestError_1 = require("../error/aadManifestError");
 const signInAudience_1 = require("../interface/signInAudience");
+const aadManifestHelper_1 = require("./aadManifestHelper");
+const constants_1 = require("./constants");
 // Another implementation of src\component\resource\aadApp\graph.ts to reduce call stacks
 // It's our internal utility so make sure pass valid parameters to it instead of relying on it to handle parameter errors
 class AadAppClient {
@@ -50,7 +53,7 @@ class AadAppClient {
     async generateClientSecret(objectId) {
         const requestBody = {
             passwordCredential: {
-                displayName: constants_1.Constants.aadAppPasswordDisplayName,
+                displayName: constants_1.constants.aadAppPasswordDisplayName,
             },
         };
         const response = await this.axios.post(`applications/${objectId}/addPassword`, requestBody, {
@@ -67,14 +70,63 @@ class AadAppClient {
     async updateAadApp(manifest) {
         const objectId = manifest.id; // You need to ensure the object id exists in manifest
         const requestBody = aadManifestHelper_1.AadManifestHelper.manifestToApplication(manifest);
-        await this.axios.patch(`applications/${objectId}`, requestBody, {
+        try {
+            await this.axios.patch(`applications/${objectId}`, requestBody, {
+                "axios-retry": {
+                    retries: this.retryNumber,
+                    retryDelay: axios_retry_1.default.exponentialDelay,
+                    retryCondition: (error) => axios_retry_1.default.isNetworkError(error) ||
+                        axios_retry_1.default.isRetryableError(error) ||
+                        this.is404Error(error) || // also retry 404 error since AAD need sometime to sync created AAD app data
+                        this.is400Error(error), // sometimes AAD will complain OAuth permission not found if we pre-authorize a newly created permission
+                },
+            });
+        }
+        catch (err) {
+            if (axios_1.default.isAxiosError(err) &&
+                err.response &&
+                err.response.status === 400 &&
+                err.response.data.error.code === constants_1.aadErrorCode.permissionErrorCode) {
+                throw new aadManifestError_1.DeleteOrUpdatePermissionFailedError(AadAppClient.name);
+            }
+            throw err;
+        }
+    }
+    async getOwners(objectId) {
+        var _a;
+        const response = await this.axios.get(`applications/${objectId}/owners`, {
+            "axios-retry": {
+                retries: this.retryNumber,
+                retryDelay: axios_retry_1.default.exponentialDelay,
+                retryCondition: (error) => axios_retry_1.default.isNetworkError(error) ||
+                    axios_retry_1.default.isRetryableError(error) ||
+                    this.is404Error(error), // also retry 404 error since AAD need sometime to sync created AAD app data
+            },
+        });
+        const aadOwners = [];
+        for (const aadOwner of response.data.value) {
+            aadOwners.push({
+                userObjectId: aadOwner.id,
+                resourceId: objectId,
+                displayName: aadOwner.displayName,
+                // For guest account, aadOwner.userPrincipalName will contains "EXT", thus use mail instead.
+                userPrincipalName: (_a = aadOwner.mail) !== null && _a !== void 0 ? _a : aadOwner.userPrincipalName,
+            });
+        }
+        return aadOwners;
+    }
+    async addOwner(objectId, userObjectId) {
+        const requestBody = {
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+            "@odata.id": `${this.axios.defaults.baseURL}/directoryObjects/${userObjectId}`,
+        };
+        await this.axios.post(`applications/${objectId}/owners/$ref`, requestBody, {
             "axios-retry": {
                 retries: this.retryNumber,
                 retryDelay: axios_retry_1.default.exponentialDelay,
                 retryCondition: (error) => axios_retry_1.default.isNetworkError(error) ||
                     axios_retry_1.default.isRetryableError(error) ||
-                    this.is404Error(error) || // also retry 404 error since AAD need sometime to sync created AAD app data
-                    this.is400Error(error), // sometimes AAD will complain OAuth permission not found if we pre-authorize a newly created permission
+                    this.is404Error(error), // also retry 404 error since AAD need sometime to sync created AAD app data
             },
         });
     }
@@ -86,5 +138,35 @@ class AadAppClient {
         return error.code !== "ECONNABORTED" && (!error.response || error.response.status === 400);
     }
 }
+tslib_1.__decorate([
+    lib_1.hooks([globalVars_1.ErrorContextMW({ source: "Graph", component: "AadAppClient" })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AadAppClient.prototype, "createAadApp", null);
+tslib_1.__decorate([
+    lib_1.hooks([globalVars_1.ErrorContextMW({ source: "Graph", component: "AadAppClient" })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AadAppClient.prototype, "generateClientSecret", null);
+tslib_1.__decorate([
+    lib_1.hooks([globalVars_1.ErrorContextMW({ source: "Graph", component: "AadAppClient" })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AadAppClient.prototype, "updateAadApp", null);
+tslib_1.__decorate([
+    lib_1.hooks([globalVars_1.ErrorContextMW({ source: "Graph", component: "AadAppClient" })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AadAppClient.prototype, "getOwners", null);
+tslib_1.__decorate([
+    lib_1.hooks([globalVars_1.ErrorContextMW({ source: "Graph", component: "AadAppClient" })]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, String]),
+    tslib_1.__metadata("design:returntype", Promise)
+], AadAppClient.prototype, "addOwner", null);
 exports.AadAppClient = AadAppClient;
 //# sourceMappingURL=aadAppClient.js.map

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

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

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

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

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

@@ -0,0 +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;AAYvD,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;CAiCnF"}

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

@@ -0,0 +1,226 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AadManifestHelper = void 0;
+const tslib_1 = require("tslib");
+const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
+const permissions_1 = require("../permissions");
+const aadManifestError_1 = require("../error/aadManifestError");
+const componentName = "AadManifestHelper";
+class AadManifestHelper {
+    static manifestToApplication(manifest) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        const result = {
+            id: manifest.id,
+            appId: manifest.appId,
+            disabledByMicrosoftStatus: manifest.disabledByMicrosoftStatus,
+            displayName: manifest.name,
+            description: manifest.description,
+            groupMembershipClaims: manifest.groupMembershipClaims,
+            identifierUris: manifest.identifierUris,
+            isFallbackPublicClient: manifest.allowPublicClient,
+            notes: manifest.notes,
+            signInAudience: manifest.signInAudience,
+            tags: manifest.tags,
+            tokenEncryptionKeyId: manifest.tokenEncryptionKeyId,
+            addIns: manifest.addIns,
+            api: {
+                acceptMappedClaims: manifest.acceptMappedClaims,
+                knownClientApplications: manifest.knownClientApplications,
+                requestedAccessTokenVersion: manifest.accessTokenAcceptedVersion,
+                oauth2PermissionScopes: manifest.oauth2Permissions,
+                preAuthorizedApplications: (_a = manifest.preAuthorizedApplications) === null || _a === void 0 ? void 0 : _a.map((item) => {
+                    return { appId: item.appId, delegatedPermissionIds: item.permissionIds };
+                }),
+            },
+            appRoles: manifest.appRoles,
+            info: {
+                marketingUrl: (_b = manifest.informationalUrls) === null || _b === void 0 ? void 0 : _b.marketing,
+                privacyStatementUrl: (_c = manifest.informationalUrls) === null || _c === void 0 ? void 0 : _c.privacy,
+                supportUrl: (_d = manifest.informationalUrls) === null || _d === void 0 ? void 0 : _d.support,
+                termsOfServiceUrl: (_e = manifest.informationalUrls) === null || _e === void 0 ? void 0 : _e.termsOfService,
+            },
+            keyCredentials: (_f = manifest.keyCredentials) === null || _f === void 0 ? void 0 : _f.map((item) => {
+                return {
+                    customKeyIdentifier: item.customKeyIdentifier,
+                    displayName: item.displayName,
+                    endDateTime: item.endDate,
+                    key: item.value,
+                    keyId: item.keyId,
+                    startDateTime: item.startDate,
+                    type: item.type,
+                    usage: item.usage,
+                };
+            }),
+            optionalClaims: manifest.optionalClaims,
+            parentalControlSettings: manifest.parentalControlSettings,
+            publicClient: {
+                redirectUris: (_g = manifest.replyUrlsWithType) === null || _g === void 0 ? void 0 : _g.filter((item) => item.type === "InstalledClient").map((item) => item.url),
+            },
+            requiredResourceAccess: manifest.requiredResourceAccess,
+            web: {
+                homePageUrl: manifest.signInUrl,
+                logoutUrl: manifest.logoutUrl,
+                redirectUris: (_h = manifest.replyUrlsWithType) === null || _h === void 0 ? void 0 : _h.filter((item) => item.type === "Web").map((item) => item.url),
+                implicitGrantSettings: {
+                    enableIdTokenIssuance: manifest.oauth2AllowIdTokenImplicitFlow,
+                    enableAccessTokenIssuance: manifest.oauth2AllowImplicitFlow,
+                },
+            },
+            spa: {
+                redirectUris: (_j = manifest.replyUrlsWithType) === null || _j === void 0 ? void 0 : _j.filter((item) => item.type === "Spa").map((item) => item.url),
+            },
+        };
+        return result;
+    }
+    static applicationToManifest(app) {
+        const result = {
+            id: app.id,
+            appId: app.appId,
+            acceptMappedClaims: app.api.acceptMappedClaims,
+            accessTokenAcceptedVersion: app.api.requestedAccessTokenVersion,
+            addIns: app.addIns,
+            allowPublicClient: app.isFallbackPublicClient,
+            appRoles: app.appRoles,
+            description: app.description,
+            disabledByMicrosoftStatus: app.disabledByMicrosoftStatus,
+            groupMembershipClaims: app.groupMembershipClaims,
+            identifierUris: app.identifierUris,
+            informationalUrls: {
+                termsOfService: app.info.termsOfServiceUrl,
+                support: app.info.supportUrl,
+                privacy: app.info.privacyStatementUrl,
+                marketing: app.info.marketingUrl,
+            },
+            keyCredentials: app.keyCredentials.map((item) => {
+                return {
+                    customKeyIdentifier: item.customKeyIdentifier,
+                    endDate: item.endDateTime,
+                    keyId: item.keyId,
+                    startDate: item.startDateTime,
+                    type: item.type,
+                    usage: item.usage,
+                    value: item.key,
+                    displayName: item.displayName,
+                };
+            }),
+            knownClientApplications: app.api.knownClientApplications,
+            logoutUrl: app.web.logoutUrl,
+            name: app.displayName,
+            notes: app.notes,
+            oauth2AllowIdTokenImplicitFlow: app.web.implicitGrantSettings.enableIdTokenIssuance,
+            oauth2AllowImplicitFlow: app.web.implicitGrantSettings.enableIdTokenIssuance,
+            oauth2Permissions: app.api.oauth2PermissionScopes,
+            optionalClaims: app.optionalClaims,
+            parentalControlSettings: app.parentalControlSettings,
+            preAuthorizedApplications: app.api.preAuthorizedApplications.map((item) => {
+                return {
+                    appId: item.appId,
+                    permissionIds: item.delegatedPermissionIds,
+                };
+            }),
+            replyUrlsWithType: app.spa.redirectUris
+                .map((item) => {
+                return {
+                    type: "Spa",
+                    url: item,
+                };
+            })
+                .concat(app.web.redirectUris.map((item) => {
+                return {
+                    type: "Web",
+                    url: item,
+                };
+            }))
+                .concat(app.publicClient.redirectUris.map((item) => {
+                return {
+                    type: "InstalledClient",
+                    url: item,
+                };
+            })),
+            requiredResourceAccess: app.requiredResourceAccess,
+            signInUrl: app.web.homePageUrl,
+            signInAudience: app.signInAudience,
+            tags: app.tags,
+            tokenEncryptionKeyId: app.tokenEncryptionKeyId,
+        };
+        return result;
+    }
+    static validateManifest(manifest) {
+        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;
+        }
+        // if manifest doesn't contain requiredResourceAccess property
+        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 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 (!manifest.optionalClaims.accessToken.find((item) => item.name === "idtyp")) {
+            warningMsg += aadManifestError_1.AadManifestErrorMessage.OptionalClaimsMissingIdtypClaim;
+        }
+        if (warningMsg) {
+            warningMsg = aadManifestError_1.AadManifestErrorMessage.AADManifestIssues + warningMsg;
+        }
+        return warningMsg.trimEnd();
+    }
+    static processRequiredResourceAccessInManifest(manifest) {
+        var _a;
+        const map = permissions_1.getPermissionMap();
+        (_a = manifest.requiredResourceAccess) === null || _a === void 0 ? void 0 : _a.forEach((requiredResourceAccessItem) => {
+            var _a, _b;
+            const resourceIdOrName = requiredResourceAccessItem.resourceAppId;
+            let resourceId = resourceIdOrName;
+            if (!isUUID_1.default(resourceIdOrName)) {
+                resourceId = (_a = map[resourceIdOrName]) === null || _a === void 0 ? void 0 : _a.id;
+                if (!resourceId) {
+                    throw new aadManifestError_1.UnknownResourceAppIdUserError(componentName, resourceIdOrName);
+                }
+                requiredResourceAccessItem.resourceAppId = resourceId;
+            }
+            (_b = requiredResourceAccessItem.resourceAccess) === null || _b === void 0 ? void 0 : _b.forEach((resourceAccessItem) => {
+                var _a, _b;
+                const resourceAccessIdOrName = resourceAccessItem.id;
+                if (!isUUID_1.default(resourceAccessIdOrName)) {
+                    let resourceAccessId;
+                    if (resourceAccessItem.type === "Scope") {
+                        resourceAccessId = (_a = map[resourceId]) === null || _a === void 0 ? void 0 : _a.scopes[resourceAccessItem.id];
+                    }
+                    else if (resourceAccessItem.type === "Role") {
+                        resourceAccessId = (_b = map[resourceId]) === null || _b === void 0 ? void 0 : _b.roles[resourceAccessItem.id];
+                    }
+                    else {
+                        throw new aadManifestError_1.UnknownResourceAccessTypeUserError(componentName, resourceAccessItem.type);
+                    }
+                    if (!resourceAccessId) {
+                        throw new aadManifestError_1.UnknownResourceAccessIdUserError(componentName, resourceAccessItem.id);
+                    }
+                    resourceAccessItem.id = resourceAccessId;
+                }
+            });
+        });
+    }
+}
+exports.AadManifestHelper = AadManifestHelper;
+//# sourceMappingURL=aadManifestHelper.js.map

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

@@ -0,0 +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,gEAKmC;AAEnC,MAAM,aAAa,GAAG,mBAAmB,CAAC;AAE1C,MAAa,iBAAiB;IACrB,MAAM,CAAC,qBAAqB,CAAC,QAAqB;;QACvD,MAAM,MAAM,GAAmB;YAC7B,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,yBAAyB,EAAE,QAAQ,CAAC,yBAAyB;YAC7D,WAAW,EAAE,QAAQ,CAAC,IAAI;YAC1B,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB;YACrD,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,sBAAsB,EAAE,QAAQ,CAAC,iBAAiB;YAClD,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;YACnD,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,GAAG,EAAE;gBACH,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;gBAC/C,uBAAuB,EAAE,QAAQ,CAAC,uBAAuB;gBACzD,2BAA2B,EAAE,QAAQ,CAAC,0BAA0B;gBAChE,sBAAsB,EAAE,QAAQ,CAAC,iBAAiB;gBAClD,yBAAyB,EAAE,MAAA,QAAQ,CAAC,yBAAyB,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC1E,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,sBAAsB,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC3E,CAAC,CAAC;aACH;YACD,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAA,QAAQ,CAAC,iBAAiB,0CAAE,SAAS;gBACnD,mBAAmB,EAAE,MAAA,QAAQ,CAAC,iBAAiB,0CAAE,OAAO;gBACxD,UAAU,EAAE,MAAA,QAAQ,CAAC,iBAAiB,0CAAE,OAAO;gBAC/C,iBAAiB,EAAE,MAAA,QAAQ,CAAC,iBAAiB,0CAAE,cAAc;aAC9D;YACD,cAAc,EAAE,MAAA,QAAQ,CAAC,cAAc,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpD,OAAO;oBACL,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;oBAC7C,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,WAAW,EAAE,IAAI,CAAC,OAAO;oBACzB,GAAG,EAAE,IAAI,CAAC,KAAK;oBACf,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,aAAa,EAAE,IAAI,CAAC,SAAS;oBAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,KAAK,EAAE,IAAI,CAAC,KAAK;iBAClB,CAAC;YACJ,CAAC,CAAC;YACF,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,uBAAuB,EAAE,QAAQ,CAAC,uBAAuB;YACzD,YAAY,EAAE;gBACZ,YAAY,EAAE,MAAA,QAAQ,CAAC,iBAAiB,0CACpC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,EACjD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aAC3B;YACD,sBAAsB,EAAE,QAAQ,CAAC,sBAAsB;YACvD,GAAG,EAAE;gBACH,WAAW,EAAE,QAAQ,CAAC,SAAS;gBAC/B,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,YAAY,EAAE,MAAA,QAAQ,CAAC,iBAAiB,0CACpC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,EACrC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC1B,qBAAqB,EAAE;oBACrB,qBAAqB,EAAE,QAAQ,CAAC,8BAA8B;oBAC9D,yBAAyB,EAAE,QAAQ,CAAC,uBAAuB;iBAC5D;aACF;YACD,GAAG,EAAE;gBACH,YAAY,EAAE,MAAA,QAAQ,CAAC,iBAAiB,0CACpC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,EACrC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aAC3B;SACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,qBAAqB,CAAC,GAAmB;QACrD,MAAM,MAAM,GAAgB;YAC1B,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,kBAAkB,EAAE,GAAG,CAAC,GAAG,CAAC,kBAAkB;YAC9C,0BAA0B,EAAE,GAAG,CAAC,GAAG,CAAC,2BAA2B;YAC/D,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,iBAAiB,EAAE,GAAG,CAAC,sBAAsB;YAC7C,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,yBAAyB,EAAE,GAAG,CAAC,yBAAyB;YACxD,qBAAqB,EAAE,GAAG,CAAC,qBAAqB;YAChD,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,iBAAiB,EAAE;gBACjB,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,iBAAiB;gBAC1C,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU;gBAC5B,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,mBAAmB;gBACrC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY;aACjC;YACD,cAAc,EAAE,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC9C,OAAO;oBACL,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;oBAC7C,OAAO,EAAE,IAAI,CAAC,WAAW;oBACzB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,SAAS,EAAE,IAAI,CAAC,aAAa;oBAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,KAAK,EAAE,IAAI,CAAC,GAAG;oBACf,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC9B,CAAC;YACJ,CAAC,CAAC;YACF,uBAAuB,EAAE,GAAG,CAAC,GAAG,CAAC,uBAAuB;YACxD,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS;YAC5B,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,8BAA8B,EAAE,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,qBAAqB;YACnF,uBAAuB,EAAE,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,qBAAqB;YAC5E,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC,sBAAsB;YACjD,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,uBAAuB,EAAE,GAAG,CAAC,uBAAuB;YACpD,yBAAyB,EAAE,GAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACxE,OAAO;oBACL,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,aAAa,EAAE,IAAI,CAAC,sBAAsB;iBAC3C,CAAC;YACJ,CAAC,CAAC;YACF,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC,YAAY;iBACpC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACZ,OAAO;oBACL,IAAI,EAAE,KAAK;oBACX,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC,CAAC;iBACD,MAAM,CACL,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChC,OAAO;oBACL,IAAI,EAAE,KAAK;oBACX,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC,CAAC,CACH;iBACA,MAAM,CACL,GAAG,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACzC,OAAO;oBACL,IAAI,EAAE,iBAAiB;oBACvB,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC,CAAC,CACH;YACH,sBAAsB,EAAE,GAAG,CAAC,sBAAsB;YAClD,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW;YAC9B,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,oBAAoB,EAAE,GAAG,CAAC,oBAAoB;SAC/C,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,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,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE;YACrF,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,8BAAgB,EAAE,CAAC;QAC/B,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,gBAAM,CAAC,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,MAAA,0BAA0B,CAAC,cAAc,0CAAE,OAAO,CAAC,CAAC,kBAAkB,EAAE,EAAE;;gBACxE,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,EAAE,CAAC;gBACrD,IAAI,CAAC,gBAAM,CAAC,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;AAvOD,8CAuOC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"buildAadManifest.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAQrE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAC;AAW9E,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,WAAW,CAAC,CAuBtB"}
+{"version":3,"file":"buildAadManifest.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/buildAadManifest.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAQrE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAYvD,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"}

package/build/component/driver/aad/utility/buildAadManifest.js

@@ -1,10 +1,12 @@
 "use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildAadManifest = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
-const aadManifestHelper_1 = require("../../../resource/aadApp/utils/aadManifestHelper");
+const aadManifestHelper_1 = require("./aadManifestHelper");
 const invalidFieldInManifestError_1 = require("../error/invalidFieldInManifestError");
 const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
 const localizeUtils_1 = require("../../../../common/localizeUtils");
@@ -14,12 +16,12 @@ const tools_1 = require("../../../../common/tools");
 const common_2 = require("../../../../error/common");
 const actionName = "aadApp/update"; // DO NOT MODIFY the name
 const helpLink = "https://aka.ms/teamsfx-actions/aadapp-update";
-const driverConstants = {
-    generateManifestFailedMessageKey: "driver.aadApp.error.generateManifestFailed",
-};
 async function buildAadManifest(context, manifestPath, outputFilePath, state) {
     var _a;
     const manifestAbsolutePath = getAbsolutePath(manifestPath, context.projectPath);
+    if (!(await fs.pathExists(manifestAbsolutePath))) {
+        throw new common_2.FileNotFoundError(actionName, manifestAbsolutePath, helpLink);
+    }
     const manifest = await loadManifest(manifestAbsolutePath, state);
     const warningMessage = aadManifestHelper_1.AadManifestHelper.validateManifest(manifest);
     if (warningMessage) {
@@ -67,7 +69,14 @@ async function loadManifest(manifestPath, state) {
             const error = new common_2.MissingEnvironmentVariablesError("aadAppUpdate", unresolvedEnvironmentVariable.join(", "), manifestPath, helpLink);
             throw error;
         }
-        const manifest = JSON.parse(manifestString);
+        let manifest;
+        try {
+            manifest = JSON.parse(manifestString);
+        }
+        catch (error) {
+            // JSON.parse only throws SyntaxError per doc, which is a subsclass of Error
+            throw new common_2.JSONSyntaxError(manifestPath, error, actionName);
+        }
         aadManifestHelper_1.AadManifestHelper.processRequiredResourceAccessInManifest(manifest);
         return manifest;
     }

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

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

package/build/component/driver/aad/utility/constants.d.ts

@@ -15,4 +15,17 @@ export declare const descriptionMessageKeys: {
     create: string;
     update: string;
 };
+export declare const permissionsKeys: {
+    name: string;
+    owner: string;
+    noPermission: string;
+    type: string;
+};
+export declare const aadErrorCode: {
+    permissionErrorCode: string;
+};
+export declare const constants: {
+    aadAppPasswordDisplayName: string;
+    oauthAuthorityPrefix: string;
+};
 //# sourceMappingURL=constants.d.ts.map

package/build/component/driver/aad/utility/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;;;;;;;CAY1B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;CAGlC,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;;;;;;;CAY1B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;CAGlC,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;CAK3B,CAAC;AAEF,eAAO,MAAM,YAAY;;CAExB,CAAC;AAEF,eAAO,MAAM,SAAS;;;CAGrB,CAAC"}

package/build/component/driver/aad/utility/constants.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.descriptionMessageKeys = exports.logMessageKeys = void 0;
+exports.constants = exports.aadErrorCode = exports.permissionsKeys = exports.descriptionMessageKeys = exports.logMessageKeys = void 0;
 exports.logMessageKeys = {
     startExecuteDriver: "driver.aadApp.log.startExecuteDriver",
     successExecuteDriver: "driver.aadApp.log.successExecuteDriver",
@@ -20,4 +20,17 @@ exports.descriptionMessageKeys = {
     create: "driver.aadApp.description.create",
     update: "driver.aadApp.description.update",
 };
+exports.permissionsKeys = {
+    name: "Azure AD App",
+    owner: "Owner",
+    noPermission: "No Permission",
+    type: "M365",
+};
+exports.aadErrorCode = {
+    permissionErrorCode: "CannotDeleteOrUpdateEnabledEntitlement",
+};
+exports.constants = {
+    aadAppPasswordDisplayName: "default",
+    oauthAuthorityPrefix: "https://login.microsoftonline.com",
+};
 //# sourceMappingURL=constants.js.map

package/build/component/driver/aad/utility/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,oBAAoB,EAAE,wCAAwC;IAC9D,iBAAiB,EAAE,qCAAqC;IACxD,iBAAiB,EAAE,qCAAqC;IACxD,mBAAmB,EAAE,uCAAuC;IAC5D,gBAAgB,EAAE,oCAAoC;IACtD,yBAAyB,EAAE,6CAA6C;IACxE,2BAA2B,EAAE,+CAA+C;IAC5E,wBAAwB,EAAE,4CAA4C;IACtE,oBAAoB,EAAE,wCAAwC;IAC9D,2BAA2B,EAAE,+CAA+C;CAC7E,CAAC;AAEW,QAAA,sBAAsB,GAAG;IACpC,MAAM,EAAE,kCAAkC;IAC1C,MAAM,EAAE,kCAAkC;CAC3C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,oBAAoB,EAAE,wCAAwC;IAC9D,iBAAiB,EAAE,qCAAqC;IACxD,iBAAiB,EAAE,qCAAqC;IACxD,mBAAmB,EAAE,uCAAuC;IAC5D,gBAAgB,EAAE,oCAAoC;IACtD,yBAAyB,EAAE,6CAA6C;IACxE,2BAA2B,EAAE,+CAA+C;IAC5E,wBAAwB,EAAE,4CAA4C;IACtE,oBAAoB,EAAE,wCAAwC;IAC9D,2BAA2B,EAAE,+CAA+C;CAC7E,CAAC;AAEW,QAAA,sBAAsB,GAAG;IACpC,MAAM,EAAE,kCAAkC;IAC1C,MAAM,EAAE,kCAAkC;CAC3C,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,IAAI,EAAE,cAAc;IACpB,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,eAAe;IAC7B,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,mBAAmB,EAAE,wCAAwC;CAC9D,CAAC;AAEW,QAAA,SAAS,GAAG;IACvB,yBAAyB,EAAE,SAAS;IACpC,oBAAoB,EAAE,mCAAmC;CAC1D,CAAC"}

package/build/component/driver/add/addWebPart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addWebPart.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/add/addWebPart.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA6B,MAAM,wBAAwB,CAAC;AAGpF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAKrD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAY5D,qBACa,gBAAiB,YAAW,UAAU;IACjD,WAAW,SAAqD;IAGnD,GAAG,CACd,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAKnC,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAS/E,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CA8DjG"}
+{"version":3,"file":"addWebPart.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/add/addWebPart.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA6B,MAAM,wBAAwB,CAAC;AAGpF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAKrD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAW5D,qBACa,gBAAiB,YAAW,UAAU;IACjD,WAAW,SAAqD;IAGnD,GAAG,CACd,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAKnC,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAS/E,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CA6EjG"}

package/build/component/driver/add/addWebPart.js

@@ -9,26 +9,25 @@ const lib_1 = require("@feathersjs/hooks/lib");
 const typedi_1 = require("typedi");
 const wrapUtil_1 = require("../util/wrapUtil");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const ManifestUtils_1 = require("../../resource/appManifest/utils/ManifestUtils");
+const ManifestUtils_1 = require("../teamsApp/utils/ManifestUtils");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const common_1 = require("../../utils/common");
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const util = tslib_1.__importStar(require("util"));
-const constants_1 = require("../../resource/spfx/utils/constants");
-const spfxGenerator_1 = require("../../generator/spfxGenerator");
+const constants_1 = require("../../generator/spfx/utils/constants");
+const spfxGenerator_1 = require("../../generator/spfx/spfxGenerator");
 const utils_1 = require("../../utils");
 const constants_2 = require("./utility/constants");
 const noConfigurationError_1 = require("./error/noConfigurationError");
-const constants_3 = require("../../constants");
-const questions_1 = require("../../resource/spfx/utils/questions");
+const questionNames_1 = require("../../../question/questionNames");
 let AddWebPartDriver = class AddWebPartDriver {
     constructor() {
         this.description = localizeUtils_1.getLocalizedString("driver.spfx.add.description");
     }
     async run(args, context) {
         const wrapContext = new wrapUtil_1.WrapDriverContext(context, constants_2.Constants.ActionName, constants_2.Constants.ActionName);
-        return common_1.wrapRun(() => this.add(args, wrapContext));
+        return common_1.wrapRun(() => this.add(args, wrapContext), constants_2.Constants.ActionName);
     }
     async execute(args, context) {
         const wrapContext = new wrapUtil_1.WrapDriverContext(context, constants_2.Constants.ActionName, constants_2.Constants.ActionName);
@@ -46,18 +45,23 @@ let AddWebPartDriver = class AddWebPartDriver {
         const localManifestPath = args.localManifestPath;
         const spfxPackage = args.spfxPackage;
         const yorcPath = path_1.default.join(spfxFolder, constants_2.Constants.YO_RC_FILE);
+        context.logProvider.verbose(`Checking configuration file under ${yorcPath}...`);
         if (!(await fs.pathExists(yorcPath))) {
             throw new noConfigurationError_1.NoConfigurationError();
         }
+        context.logProvider.verbose(`Configuration file exists.`);
         const inputs = { platform: context.platform, stage: teamsfx_api_1.Stage.addWebpart };
-        inputs[constants_3.SPFxQuestionNames.WebPartName] = webpartName;
-        inputs[constants_3.SPFxQuestionNames.SPFxFolder] = spfxFolder;
-        inputs[constants_3.SPFxQuestionNames.ManifestPath] = manifestPath;
-        inputs[constants_3.SPFxQuestionNames.LocalManifestPath] = localManifestPath;
-        inputs[questions_1.SPFXQuestionNames.use_global_package_or_install_local] = spfxPackage;
+        inputs[questionNames_1.QuestionNames.SPFxWebpartName] = webpartName;
+        inputs[questionNames_1.QuestionNames.SPFxFolder] = spfxFolder;
+        inputs[questionNames_1.QuestionNames.ManifestPath] = manifestPath;
+        inputs[questionNames_1.QuestionNames.LocalTeamsAppManifestFilePath] = localManifestPath;
+        inputs[questionNames_1.QuestionNames.SPFxInstallPackage] = spfxPackage;
+        context.logProvider.verbose(`Adding web part with Yeoman generator...`);
+        context.logProvider.debug(`SPFx web part name: ${webpartName}, SPFx folder: ${spfxFolder}, manifest path: ${manifestPath}, local manifest path: ${localManifestPath}`);
         const yeomanRes = await spfxGenerator_1.SPFxGenerator.doYeomanScaffold(utils_1.createContextV3(), inputs, context.projectPath);
         if (yeomanRes.isErr())
             throw yeomanRes.error;
+        context.logProvider.verbose(`Succeeded to add web part '${webpartName}'.`);
         const componentId = yeomanRes.value;
         const remoteStaticSnippet = {
             entityId: componentId,
@@ -74,13 +78,17 @@ let AddWebPartDriver = class AddWebPartDriver {
             scopes: ["personal"],
         };
         inputs["addManifestPath"] = localManifestPath;
+        context.logProvider.verbose(`Exposing web part with component id ${componentId} to local manifest file under ${localManifestPath}...`);
         const localRes = await ManifestUtils_1.manifestUtils.addCapabilities(Object.assign(Object.assign({}, inputs), { projectPath: context.projectPath }), [{ name: "staticTab", snippet: localStaticSnippet }]);
         if (localRes.isErr())
             throw localRes.error;
+        context.logProvider.verbose(`Succeeded to update local manifest file.`);
         inputs["addManifestPath"] = manifestPath;
+        context.logProvider.verbose(`Exposing web part with component id ${componentId} to remote manifest file under ${manifestPath}...`);
         const remoteRes = await ManifestUtils_1.manifestUtils.addCapabilities(Object.assign(Object.assign({}, inputs), { projectPath: context.projectPath }), [{ name: "staticTab", snippet: remoteStaticSnippet }]);
         if (remoteRes.isErr())
             throw remoteRes.error;
+        context.logProvider.verbose(`Succeeded to update remote manifest file.`);
         (_a = context.ui) === null || _a === void 0 ? void 0 : _a.showMessage("info", localizeUtils_1.getLocalizedString("driver.spfx.add.successNotice", webpartName), false);
         return new Map();
     }