@microsoft/teamsfx-core 2.0.3 → 2.0.4-alpha.0237b70e3.0

package/build/core/downloadSample.js

@@ -1,161 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadSample = exports.downloadSampleHook = exports.saveFilesRecursively = exports.fetchCodeZip = void 0;
-const tslib_1 = require("tslib");
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
-const axios_1 = tslib_1.__importDefault(require("axios"));
-const fs = tslib_1.__importStar(require("fs-extra"));
-const glob_1 = require("glob");
-const path = tslib_1.__importStar(require("path"));
-const uuid = tslib_1.__importStar(require("uuid"));
-const globalVars_1 = require("./globalVars");
-const samples_1 = require("../common/samples");
-const telemetry_1 = require("../common/telemetry");
-const error_1 = require("./error");
-const projectSettingsLoader_1 = require("./middleware/projectSettingsLoader");
-const question_1 = require("./question");
-async function fetchCodeZip(url, sampleId) {
-    let retries = 3;
-    let result = undefined;
-    const error = new error_1.FetchSampleError(sampleId);
-    while (retries > 0) {
-        retries--;
-        try {
-            result = await axios_1.default.get(url, {
-                responseType: "arraybuffer",
-            });
-            if (result.status === 200 || result.status === 201) {
-                return teamsfx_api_1.ok(result);
-            }
-        }
-        catch (e) {
-            await new Promise((resolve) => setTimeout(resolve, 10000));
-            if (e.response) {
-                error.message += `, status code: ${e.response.status}`;
-            }
-            else if (e.request) {
-                if (e.code === "ENOTFOUND") {
-                    error.message += ". Network issue, please check your network connectivity";
-                }
-                else {
-                    error.message += `. Request: ${e.request} failed with error message ${e.message}`;
-                }
-            }
-            else {
-                error.message += `. ${e.message}`;
-            }
-        }
-    }
-    return teamsfx_api_1.err(error);
-}
-exports.fetchCodeZip = fetchCodeZip;
-async function saveFilesRecursively(zip, appFolder, dstPath) {
-    await Promise.all(zip
-        .getEntries()
-        .filter((entry) => !entry.isDirectory && entry.entryName.includes(`${appFolder}/`))
-        .map(async (entry) => {
-        const entryPath = entry.entryName.substring(entry.entryName.indexOf(appFolder) + appFolder.length);
-        const filePath = path.join(dstPath, entryPath);
-        await fs.ensureDir(path.dirname(filePath));
-        await fs.writeFile(filePath, entry.getData());
-    }));
-}
-exports.saveFilesRecursively = saveFilesRecursively;
-async function downloadSampleHook(sampleId, sampleAppPath) {
-    // A temporary solution to avoid duplicate componentId
-    if (sampleId === "todo-list-SPFx") {
-        const originalId = "c314487b-f51c-474d-823e-a2c3ec82b1ff";
-        const componentId = uuid.v4();
-        glob_1.glob.glob(`${sampleAppPath}/**/*.json`, { nodir: true, dot: true }, async (err, files) => {
-            await Promise.all(files.map(async (file) => {
-                let content = (await fs.readFile(file)).toString();
-                const reg = new RegExp(originalId, "g");
-                content = content.replace(reg, componentId);
-                await fs.writeFile(file, content);
-            }));
-        });
-    }
-}
-exports.downloadSampleHook = downloadSampleHook;
-async function downloadSample(inputs, ctx, contextV3) {
-    var _a;
-    let fxError;
-    const progress = globalVars_1.TOOLS.ui.createProgressBar("Fetch sample app", 3);
-    await progress.start();
-    const telemetryProperties = {
-        [telemetry_1.TelemetryProperty.Success]: telemetry_1.TelemetrySuccess.Yes,
-        module: "fx-core",
-    };
-    try {
-        const folder = inputs["folder"];
-        try {
-            await fs.ensureDir(folder);
-        }
-        catch (e) {
-            throw new error_1.ProjectFolderInvalidError(folder);
-        }
-        const sampleId = inputs[question_1.CoreQuestionNames.Samples];
-        if (!(sampleId && folder)) {
-            throw error_1.InvalidInputError(`invalid answer for '${question_1.CoreQuestionNames.Samples}'`, inputs);
-        }
-        telemetryProperties[telemetry_1.TelemetryProperty.SampleAppName] = sampleId;
-        const samples = samples_1.sampleProvider.SampleCollection.samples.filter((sample) => sample.id.toLowerCase() === sampleId.toLowerCase());
-        if (samples.length === 0) {
-            throw error_1.InvalidInputError(`invalid sample id: '${sampleId}'`, inputs);
-        }
-        const sample = samples[0];
-        const url = sample.link;
-        let sampleAppPath = path.resolve(folder, sampleId);
-        if ((await fs.pathExists(sampleAppPath)) && (await fs.readdir(sampleAppPath)).length > 0) {
-            let suffix = 1;
-            while (await fs.pathExists(sampleAppPath)) {
-                sampleAppPath = `${folder}/${sampleId}_${suffix++}`;
-            }
-        }
-        await progress.next(`Downloading from ${url}`);
-        const fetchRes = await fetchCodeZip(url, sample.id);
-        if (fetchRes.isErr()) {
-            throw fetchRes.error;
-        }
-        else if (!fetchRes.value) {
-            throw new error_1.FetchSampleError(sample.id);
-        }
-        await progress.next("Unzipping the sample package");
-        await saveFilesRecursively(new adm_zip_1.default(fetchRes.value.data), (_a = sample.relativePath) !== null && _a !== void 0 ? _a : sampleId, sampleAppPath);
-        await downloadSampleHook(sampleId, sampleAppPath);
-        await progress.next("Update project settings");
-        const loadInputs = Object.assign(Object.assign({}, inputs), { projectPath: sampleAppPath });
-        const projectSettingsRes = await projectSettingsLoader_1.loadProjectSettings(loadInputs, true);
-        if (projectSettingsRes.isOk()) {
-            const projectSettings = projectSettingsRes.value;
-            projectSettings.projectId = inputs.projectId ? inputs.projectId : uuid.v4();
-            projectSettings.isFromSample = true;
-            inputs.projectId = projectSettings.projectId;
-            telemetryProperties[telemetry_1.TelemetryProperty.NewProjectId] = projectSettings.projectId;
-            if (ctx)
-                ctx.projectSettings = projectSettings;
-            if (contextV3)
-                contextV3.projectSetting = projectSettings;
-            inputs.projectPath = sampleAppPath;
-        }
-        else {
-            telemetryProperties[telemetry_1.TelemetryProperty.NewProjectId] =
-                "unknown, failed to set projectId in projectSettings.json";
-        }
-        await progress.end(true);
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DownloadSample, telemetryProperties);
-        return teamsfx_api_1.ok(sampleAppPath);
-    }
-    catch (e) {
-        fxError = teamsfx_api_1.assembleError(e);
-        await progress.end(false);
-        telemetryProperties[telemetry_1.TelemetryProperty.Success] = telemetry_1.TelemetrySuccess.No;
-        telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DownloadSample, fxError, telemetryProperties);
-        return teamsfx_api_1.err(fxError);
-    }
-}
-exports.downloadSample = downloadSample;
-//# sourceMappingURL=downloadSample.js.map

package/build/core/downloadSample.js.map

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

package/build/core/generateAadManifestTemplate.d.ts

@@ -1,3 +0,0 @@
-import { RequiredResourceAccess } from "../component/resource/aadApp/interfaces/AADManifest";
-export declare function generateAadManifestTemplate(projectFolder: string, projectSettings: any, requiredResourceAccess?: RequiredResourceAccess[] | undefined, updateCapabilities?: boolean): Promise<void>;
-//# sourceMappingURL=generateAadManifestTemplate.d.ts.map

package/build/core/generateAadManifestTemplate.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateAadManifestTemplate.d.ts","sourceRoot":"","sources":["../../src/core/generateAadManifestTemplate.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,sBAAsB,EACvB,MAAM,qDAAqD,CAAC;AAQ7D,wBAAsB,2BAA2B,CAC/C,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,GAAG,EACpB,sBAAsB,GAAE,sBAAsB,EAAE,GAAG,SAAqB,EACxE,kBAAkB,UAAQ,GACzB,OAAO,CAAC,IAAI,CAAC,CAmGf"}

package/build/core/generateAadManifestTemplate.js

@@ -1,136 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateAadManifestTemplate = void 0;
-const tslib_1 = require("tslib");
-const folder_1 = require("../folder");
-const fs = tslib_1.__importStar(require("fs-extra"));
-const os = tslib_1.__importStar(require("os"));
-const tools_1 = require("../common/tools");
-const constants_1 = require("../component/constants");
-const workflow_1 = require("../component/workflow");
-const projectSettingsHelper_1 = require("../common/local/projectSettingsHelper");
-const projectSettingsHelper_2 = require("../common/projectSettingsHelper");
-const constants_2 = require("../component/resource/aadApp/constants");
-async function generateAadManifestTemplate(projectFolder, projectSettings, requiredResourceAccess = undefined, updateCapabilities = false) {
-    const templatesFolder = folder_1.getTemplatesFolder();
-    const appDir = await tools_1.getAppDirectory(projectFolder);
-    const aadManifestTemplate = `${templatesFolder}/${constants_2.Constants.aadManifestTemplateFolder}/${constants_2.Constants.aadManifestTemplateName}`;
-    await fs.ensureDir(appDir);
-    const isVs = projectSettingsHelper_2.isVSProject(projectSettings);
-    const aadManifestPath = `${appDir}/${constants_2.Constants.aadManifestTemplateName}`;
-    let aadJson;
-    if (await fs.pathExists(aadManifestPath)) {
-        aadJson = await fs.readJSON(aadManifestPath);
-    }
-    else {
-        aadJson = await fs.readJSON(aadManifestTemplate);
-    }
-    if (!aadJson.replyUrlsWithType) {
-        aadJson.replyUrlsWithType = [];
-    }
-    if (requiredResourceAccess) {
-        aadJson.requiredResourceAccess = requiredResourceAccess;
-    }
-    const hasTab = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
-    if (hasTab) {
-        const tabRedirectUrl1 = "{{state.fx-resource-aad-app-for-teams.frontendEndpoint}}/auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl1, "Web")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl1,
-                type: "Web",
-            });
-        }
-        const tabRedirectUrl2 = "{{state.fx-resource-aad-app-for-teams.frontendEndpoint}}/auth-end.html?clientId={{state.fx-resource-aad-app-for-teams.clientId}}";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl2, "Spa")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl2,
-                type: "Spa",
-            });
-        }
-        const tabRedirectUrl3 = "{{state.fx-resource-aad-app-for-teams.frontendEndpoint}}/blank-auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl3, "Spa")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl3,
-                type: "Spa",
-            });
-        }
-    }
-    const hasBot = projectSettingsHelper_1.ProjectSettingsHelper.includeBot(projectSettings);
-    if (hasBot) {
-        const botRedirectUrl = isVs
-            ? "{{state.fx-resource-aad-app-for-teams.botEndpoint}}/bot-auth-end.html"
-            : "{{state.fx-resource-aad-app-for-teams.botEndpoint}}/auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, botRedirectUrl, "Web")) {
-            aadJson.replyUrlsWithType.push({
-                url: botRedirectUrl,
-                type: "Web",
-            });
-        }
-    }
-    // }
-    if (updateCapabilities) {
-        if (projectSettings.solutionSettings.capabilities.includes("Tab") &&
-            !projectSettings.solutionSettings.capabilities.includes("TabSSO")) {
-            projectSettings.solutionSettings.capabilities.push("TabSSO");
-        }
-        if (projectSettings.solutionSettings.capabilities.includes("Bot") &&
-            !projectSettings.solutionSettings.capabilities.includes("BotSSO")) {
-            projectSettings.solutionSettings.capabilities.push("BotSSO");
-        }
-        const tabConfig = workflow_1.getComponent(projectSettings, constants_1.ComponentNames.TeamsTab);
-        if (tabConfig) {
-            tabConfig.sso = true;
-        }
-        const botConfig = workflow_1.getComponent(projectSettings, constants_1.ComponentNames.TeamsTab);
-        if (botConfig) {
-            botConfig.sso = true;
-        }
-    }
-    await fs.writeJSON(`${appDir}/${constants_2.Constants.aadManifestTemplateName}`, aadJson, {
-        spaces: 4,
-        EOL: os.EOL,
-    });
-}
-exports.generateAadManifestTemplate = generateAadManifestTemplate;
-function isRedirectUrlExist(replyUrls, url, type) {
-    return (replyUrls.filter((item) => item.url === url && item.type === type).length > 0);
-}
-function updateRedirectUrlV3(aadJson, projectSetting) {
-    const teamsTabComponent = workflow_1.getComponent(projectSetting, constants_1.ComponentNames.TeamsTab);
-    if (teamsTabComponent) {
-        const tabRedirectUrl1 = "{{state.aad-app.frontendEndpoint}}/auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl1, "Web")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl1,
-                type: "Web",
-            });
-        }
-        const tabRedirectUrl2 = "{{state.aad-app.frontendEndpoint}}/auth-end.html?clientId={{state.aad-app.clientId}}";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl2, "Spa")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl2,
-                type: "Spa",
-            });
-        }
-        const tabRedirectUrl3 = "{{state.aad-app.frontendEndpoint}}/blank-auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl3, "Spa")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl3,
-                type: "Spa",
-            });
-        }
-    }
-    const teamsBotComponent = workflow_1.getComponent(projectSetting, constants_1.ComponentNames.TeamsBot);
-    if (teamsBotComponent) {
-        const botRedirectUrl = "{{state.aad-app.botEndpoint}}/auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, botRedirectUrl, "Web")) {
-            aadJson.replyUrlsWithType.push({
-                url: botRedirectUrl,
-                type: "Web",
-            });
-        }
-    }
-}
-//# sourceMappingURL=generateAadManifestTemplate.js.map

package/build/core/generateAadManifestTemplate.js.map

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

package/build/core/middleware/CommonErrorHandlerMW.d.ts

@@ -1,14 +0,0 @@
-import { HookContext, Middleware } from "@feathersjs/hooks";
-import { FxError, Result } from "@microsoft/teamsfx-api";
-export interface ErrorHandleOption {
-    error?: FxError;
-    startFn?: (ctx: HookContext) => Promise<Result<any, FxError>>;
-    endFn?: (ctx: HookContext) => Promise<Result<any, FxError>>;
-    telemetry?: {
-        component: string;
-        eventName?: string;
-        properties?: Record<string, string>;
-    };
-}
-export declare function CommonErrorHandlerMW(option?: ErrorHandleOption): Middleware;
-//# sourceMappingURL=CommonErrorHandlerMW.d.ts.map

package/build/core/middleware/CommonErrorHandlerMW.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CommonErrorHandlerMW.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/CommonErrorHandlerMW.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAsB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAU7E,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9D,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,SAAS,CAAC,EAAE;QACV,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACrC,CAAC;CACH;AAED,wBAAgB,oBAAoB,CAAC,MAAM,CAAC,EAAE,iBAAiB,GAAG,UAAU,CA4D3E"}

package/build/core/middleware/CommonErrorHandlerMW.js

@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonErrorHandlerMW = void 0;
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const lodash_1 = require("lodash");
-const telemetry_1 = require("../../common/telemetry");
-const globalVars_1 = require("../globalVars");
-function CommonErrorHandlerMW(option) {
-    return async (ctx, next) => {
-        try {
-            if (option === null || option === void 0 ? void 0 : option.startFn) {
-                await (option === null || option === void 0 ? void 0 : option.startFn(ctx));
-            }
-            if (option === null || option === void 0 ? void 0 : option.telemetry) {
-                const event = option.telemetry.eventName
-                    ? option.telemetry.eventName + "-start"
-                    : lodash_1.kebabCase(ctx.method) + "-start";
-                if (!option.telemetry.properties) {
-                    option.telemetry.properties = {};
-                    ctx.arguments.push(option.telemetry.properties);
-                }
-                telemetry_1.sendTelemetryEvent(option.telemetry.component, event, option.telemetry.properties);
-            }
-            await next();
-            if (option === null || option === void 0 ? void 0 : option.endFn) {
-                await (option === null || option === void 0 ? void 0 : option.endFn(ctx));
-            }
-            if (option === null || option === void 0 ? void 0 : option.telemetry) {
-                const event = option.telemetry.eventName
-                    ? option.telemetry.eventName
-                    : lodash_1.kebabCase(ctx.method);
-                const result = ctx.result;
-                option.telemetry.properties[telemetry_1.TelemetryProperty.Success] = result.isOk()
-                    ? telemetry_1.TelemetrySuccess.Yes
-                    : telemetry_1.TelemetrySuccess.No;
-                option.telemetry.properties[telemetry_1.TelemetryProperty.AppId] = globalVars_1.globalVars.teamsAppId || "";
-                result.isOk()
-                    ? telemetry_1.sendTelemetryEvent(option.telemetry.component, event, option.telemetry.properties)
-                    : telemetry_1.sendTelemetryErrorEvent(option.telemetry.component, event, result.error, option.telemetry.properties);
-            }
-        }
-        catch (e) {
-            const error = (option === null || option === void 0 ? void 0 : option.error) ? option.error : teamsfx_api_1.assembleError(e);
-            ctx.error = error;
-            if (option === null || option === void 0 ? void 0 : option.endFn) {
-                await (option === null || option === void 0 ? void 0 : option.endFn(ctx));
-            }
-            ctx.result = teamsfx_api_1.err(error);
-            if (option === null || option === void 0 ? void 0 : option.telemetry) {
-                const event = option.telemetry.eventName
-                    ? option.telemetry.eventName
-                    : lodash_1.kebabCase(ctx.method);
-                option.telemetry.properties[telemetry_1.TelemetryProperty.Success] = telemetry_1.TelemetrySuccess.No;
-                option.telemetry.properties[telemetry_1.TelemetryProperty.AppId] = globalVars_1.globalVars.teamsAppId || "";
-                telemetry_1.sendTelemetryErrorEvent(option.telemetry.component, event, error, option.telemetry.properties);
-            }
-        }
-    };
-}
-exports.CommonErrorHandlerMW = CommonErrorHandlerMW;
-//# sourceMappingURL=CommonErrorHandlerMW.js.map

package/build/core/middleware/CommonErrorHandlerMW.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CommonErrorHandlerMW.js","sourceRoot":"","sources":["../../../src/core/middleware/CommonErrorHandlerMW.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/aadManifestMigration.d.ts

@@ -1,3 +0,0 @@
-import { Middleware } from "@feathersjs/hooks/lib";
-export declare const AadManifestMigrationMW: Middleware;
-//# sourceMappingURL=aadManifestMigration.d.ts.map

package/build/core/middleware/aadManifestMigration.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"aadManifestMigration.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/aadManifestMigration.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AA0BjE,eAAO,MAAM,sBAAsB,EAAE,UAapC,CAAC"}

package/build/core/middleware/aadManifestMigration.js

@@ -1,119 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AadManifestMigrationMW = void 0;
-const tslib_1 = require("tslib");
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const error_1 = require("../error");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const telemetry_1 = require("../../common/telemetry");
-const globalVars_1 = require("../globalVars");
-const localizeUtils_1 = require("../../common/localizeUtils");
-const folder_1 = require("../../folder");
-const projectSettingsLoader_1 = require("./projectSettingsLoader");
-const projectMigrator_1 = require("./projectMigrator");
-const consolidateLocalRemote_1 = require("./consolidateLocalRemote");
-const os = tslib_1.__importStar(require("os"));
-const MigrationUtils_1 = require("./utils/MigrationUtils");
-const LearnMore = localizeUtils_1.getLocalizedString("core.option.learnMore");
-const LearnMoreLink = "https://aka.ms/teamsfx-aad-manifest";
-let userCancelFlag = false;
-const backupFolder = ".backup";
-const methods = new Set(["getProjectConfig", "checkPermission"]);
-const upgradeReportName = "aad-manifest-change-logs.md";
-const AadManifestMigrationMW = async (ctx, next) => {
-    if (await projectMigrator_1.needMigrateToArmAndMultiEnv(ctx)) {
-        await next();
-    }
-    else if (await consolidateLocalRemote_1.needConsolidateLocalRemote(ctx)) {
-        await next();
-    }
-    else if ((await MigrationUtils_1.needMigrateToAadManifest(ctx)) && checkMethod(ctx)) {
-        await upgrade(ctx, next);
-    }
-    else {
-        await next();
-    }
-};
-exports.AadManifestMigrationMW = AadManifestMigrationMW;
-async function upgrade(ctx, next) {
-    try {
-        await migrate(ctx);
-        await next();
-    }
-    catch (error) {
-        telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationError, teamsfx_api_1.assembleError(error, error_1.CoreSource));
-        throw error;
-    }
-}
-async function migrate(ctx) {
-    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationStart);
-    const inputs = ctx.arguments[ctx.arguments.length - 1];
-    const fileList = [];
-    const loadRes = await projectSettingsLoader_1.loadProjectSettings(inputs, true);
-    if (loadRes.isErr()) {
-        ctx.result = teamsfx_api_1.err(loadRes.error);
-        return false;
-    }
-    const projectSettings = loadRes.value;
-    const projectSettingsPath = path_1.default.join(inputs.projectPath, ".fx", "configs", "projectSettings.json");
-    try {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationAddAADTemplateStart);
-        const projectSettingsJsonOld = await fs_extra_1.default.readJson(projectSettingsPath);
-        // make sure this function use upgraded version of projectsettings for V3
-        await MigrationUtils_1.generateAadManifest(inputs.projectPath, projectSettings);
-        const aadManifestPath = path_1.default.join(inputs.projectPath, "templates", "appPackage", "aad.template.json");
-        fileList.push(aadManifestPath);
-        await fs_extra_1.default.writeJSON(projectSettingsPath, projectSettings, { spaces: 4, EOL: os.EOL });
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationAddAADTemplate);
-        // backup
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationBackupStart);
-        const backupPath = path_1.default.join(inputs.projectPath, backupFolder);
-        await fs_extra_1.default.ensureDir(path_1.default.join(backupPath, ".fx", "configs"));
-        await fs_extra_1.default.writeJSON(path_1.default.join(backupPath, ".fx", "configs", "projectSettings.json"), projectSettingsJsonOld, { spaces: 4, EOL: os.EOL });
-        fileList.push(path_1.default.join(backupPath, ".fx", "configs", "projectSettings.json"));
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigrationBackup);
-    }
-    catch (e) {
-        for (const item of fileList) {
-            await fs_extra_1.default.remove(item);
-        }
-        await fs_extra_1.default.writeJSON(projectSettingsPath, projectSettings, { spaces: 4, EOL: os.EOL });
-        throw e;
-    }
-    postMigration(inputs);
-    generateUpgradeReport(path_1.default.join(inputs.projectPath, backupFolder));
-    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectAadManifestMigration);
-    return true;
-}
-function checkMethod(ctx) {
-    if (ctx.method && methods.has(ctx.method) && userCancelFlag)
-        return false;
-    userCancelFlag = ctx.method != undefined && methods.has(ctx.method);
-    return true;
-}
-async function postMigration(inputs) {
-    if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
-        const res = await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("info", localizeUtils_1.getLocalizedString("core.aadManifestMigration.outputMsg"), false, "OK", LearnMore));
-        const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
-        if (answer === LearnMore) {
-            globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.openUrl(LearnMoreLink);
-        }
-    }
-    else {
-        globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.info(localizeUtils_1.getLocalizedString("core.aadManifestMigration.SuccessMessage", LearnMoreLink));
-    }
-}
-async function generateUpgradeReport(backupFolder) {
-    try {
-        const target = path_1.default.join(backupFolder, upgradeReportName);
-        const source = path_1.default.resolve(path_1.default.join(folder_1.getResourceFolder(), upgradeReportName));
-        await fs_extra_1.default.copyFile(source, target);
-    }
-    catch (error) {
-        // do nothing
-    }
-}
-//# sourceMappingURL=aadManifestMigration.js.map

package/build/core/middleware/aadManifestMigration.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"aadManifestMigration.js","sourceRoot":"","sources":["../../../src/core/middleware/aadManifestMigration.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/consolidateLocalRemote.d.ts

@@ -1,5 +0,0 @@
-import { Middleware } from "@feathersjs/hooks/lib";
-import { CoreHookContext } from "../types";
-export declare const ProjectConsolidateMW: Middleware;
-export declare function needConsolidateLocalRemote(ctx: CoreHookContext): Promise<boolean>;
-//# sourceMappingURL=consolidateLocalRemote.d.ts.map

package/build/core/middleware/consolidateLocalRemote.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"consolidateLocalRemote.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAajE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AA+B3C,eAAO,MAAM,oBAAoB,EAAE,UAwBlC,CAAC;AAoDF,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBvF"}