@microsoft/teamsfx-core 1.3.0 → 1.3.1-alpha.59b5e7c6.0

package/build/plugins/solution/utils/questions.js

@@ -2,66 +2,26 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectResourceQuestion = exports.selectScaffoldTemplateQuestion = exports.selectCapabilitiesQuestion = exports.createSelectModulesToDeployQuestionNode = exports.createSelectModuleQuestionNode = exports.selectMultiModulesQuestion = exports.selectSingleModuleQuestion = exports.SolutionV3QuestionNames = void 0;
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const typedi_1 = require("typedi");
+exports.selectCapabilitiesQuestion = exports.selectMultiPluginsQuestion = exports.selectSingleFeatureQuestion = exports.SolutionV3QuestionNames = void 0;
 const question_1 = require("../fx-solution/question");
 var SolutionV3QuestionNames;
 (function (SolutionV3QuestionNames) {
-    SolutionV3QuestionNames["scaffoldTemplate"] = "template";
     SolutionV3QuestionNames["capabilities"] = "capabilities";
-    SolutionV3QuestionNames["resource"] = "resource";
-    SolutionV3QuestionNames["module"] = "module";
-    SolutionV3QuestionNames["modules"] = "modules";
+    SolutionV3QuestionNames["feature"] = "feature";
+    SolutionV3QuestionNames["plugins"] = "plugins";
 })(SolutionV3QuestionNames = exports.SolutionV3QuestionNames || (exports.SolutionV3QuestionNames = {}));
-exports.selectSingleModuleQuestion = {
-    name: SolutionV3QuestionNames.module,
-    title: "Select a module",
+exports.selectSingleFeatureQuestion = {
+    name: SolutionV3QuestionNames.feature,
+    title: "Select a feature to add",
     type: "singleSelect",
     staticOptions: [],
 };
-exports.selectMultiModulesQuestion = {
-    name: SolutionV3QuestionNames.modules,
-    title: "Select modules to deploy",
+exports.selectMultiPluginsQuestion = {
+    name: SolutionV3QuestionNames.plugins,
+    title: "Select plugins to deploy",
     type: "multiSelect",
     staticOptions: [],
 };
-function createSelectModuleQuestionNode(modules) {
-    const moduleNode = new teamsfx_api_1.QTreeNode(exports.selectSingleModuleQuestion);
-    const moduleOptions = [];
-    let i = 0;
-    for (const module of modules) {
-        const option = {
-            id: `${i++}`,
-            label: JSON.stringify(module),
-        };
-        moduleOptions.push(option);
-    }
-    moduleOptions.push({ id: "none", label: "none" });
-    exports.selectSingleModuleQuestion.staticOptions = moduleOptions;
-    return moduleNode;
-}
-exports.createSelectModuleQuestionNode = createSelectModuleQuestionNode;
-function createSelectModulesToDeployQuestionNode(modules) {
-    const moduleNode = new teamsfx_api_1.QTreeNode(exports.selectMultiModulesQuestion);
-    const moduleOptions = [];
-    let i = 0;
-    for (const module of modules) {
-        if (module.hostingPlugin) {
-            const plugin = typedi_1.Container.get(module.hostingPlugin);
-            if (plugin.deploy) {
-                const option = {
-                    id: `${i++}`,
-                    label: JSON.stringify(module),
-                };
-                moduleOptions.push(option);
-            }
-        }
-    }
-    exports.selectMultiModulesQuestion.staticOptions = moduleOptions;
-    return moduleNode;
-}
-exports.createSelectModulesToDeployQuestionNode = createSelectModulesToDeployQuestionNode;
 exports.selectCapabilitiesQuestion = {
     name: SolutionV3QuestionNames.capabilities,
     title: "Select capabilities",
@@ -70,17 +30,4 @@ exports.selectCapabilitiesQuestion = {
     default: [question_1.TabOptionItem.id],
     skipSingleOption: true,
 };
-exports.selectScaffoldTemplateQuestion = {
-    name: SolutionV3QuestionNames.scaffoldTemplate,
-    title: "Select a scaffold template",
-    type: "singleSelect",
-    staticOptions: [],
-    returnObject: true,
-};
-exports.selectResourceQuestion = {
-    name: SolutionV3QuestionNames.resource,
-    title: "Select a resources",
-    type: "singleSelect",
-    staticOptions: [],
-};
 //# sourceMappingURL=questions.js.map

package/build/plugins/solution/utils/questions.js.map

@@ -1 +1 @@
-{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../../../src/plugins/solution/utils/questions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../../../src/plugins/solution/utils/questions.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,sDAA6F;AAE7F,IAAY,uBAIX;AAJD,WAAY,uBAAuB;IACjC,wDAA6B,CAAA;IAC7B,8CAAmB,CAAA;IACnB,8CAAmB,CAAA;AACrB,CAAC,EAJW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAIlC;AAEY,QAAA,2BAA2B,GAAyB;IAC/D,IAAI,EAAE,uBAAuB,CAAC,OAAO;IACrC,KAAK,EAAE,yBAAyB;IAChC,IAAI,EAAE,cAAc;IACpB,aAAa,EAAE,EAAE;CAClB,CAAC;AAEW,QAAA,0BAA0B,GAAwB;IAC7D,IAAI,EAAE,uBAAuB,CAAC,OAAO;IACrC,KAAK,EAAE,0BAA0B;IACjC,IAAI,EAAE,aAAa;IACnB,aAAa,EAAE,EAAE;CAClB,CAAC;AAEW,QAAA,0BAA0B,GAAwB;IAC7D,IAAI,EAAE,uBAAuB,CAAC,YAAY;IAC1C,KAAK,EAAE,qBAAqB;IAC5B,IAAI,EAAE,aAAa;IACnB,aAAa,EAAE,CAAC,wBAAa,EAAE,wBAAa,EAAE,+BAAoB,CAAC;IACnE,OAAO,EAAE,CAAC,wBAAa,CAAC,EAAE,CAAC;IAC3B,gBAAgB,EAAE,IAAI;CACvB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.3.0",
+  "version": "1.3.1-alpha.59b5e7c6.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -13,6 +13,7 @@
     "test:localdebug": "nyc mocha \"tests/plugins/resource/localdebug/**/*.test.ts\"",
     "test:frontend": "nyc mocha \"tests/plugins/resource/frontend/**/*.test.ts\"",
     "test:aad": "nyc mocha \"tests/plugins/resource/aad/**/*.test.ts\"",
+    "test:aadv3": "nyc mocha \"tests/plugins/resource/aad/v3/*.test.ts\"",
     "test:simpleauth": "nyc mocha \"tests/plugins/resource/simpleauth/**/*.test.ts\"",
     "test:sql": "nyc mocha \"tests/plugins/resource/sql/**/*.test.ts\"",
     "test:identity": "nyc mocha \"tests/plugins/resource/identity/**/*.test.ts\"",
@@ -23,6 +24,7 @@
     "test:unit": "nyc --no-clean mocha \"tests/**/*.test.ts\"",
     "test:common": "nyc --no-clean mocha \"tests/common/*.test.ts\"",
     "test:solution": "nyc mocha \"tests/plugins/solution/*.test.ts\"",
+    "test:solution:deploy": "nyc mocha \"tests/plugins/solution/solution.deploy.test.ts\"",
     "test:solution:debug": "nyc mocha \"tests/plugins/solution/debug/**/*.test.ts\"",
     "test:core": "nyc mocha \"tests/core/**/*.test.ts\"",
     "test:core:sample": "nyc mocha \"tests/core/sample.test.ts\"",
@@ -35,8 +37,8 @@
     "clean": "rm -rf build",
     "build": "rimraf build && npx tsc -p ./",
     "lint:fix": "eslint --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
-    "prepare": "npm run build && node ./scripts/download-templates-zip.js $(git tag --list)",
-    "prepublishOnly": "npm run test:unit && npm run build",
+    "postbuild": "node ./scripts/download-templates-zip.js $(git tag --list)",
+    "prepublishOnly": "npm run test:unit -- check-coverage --lines 0 && npm run build",
     "package": "rimraf build && webpack --mode production --config ./webpack.config.js",
     "check-sensitive": "npx eslint --plugin 'no-secrets' --cache --ignore-pattern 'package.json' --ignore-pattern 'package-lock.json'",
     "precommit": "npm run check-sensitive && lint-staged",
@@ -57,13 +59,14 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.14.0",
+    "@microsoft/teamsfx-api": "0.14.1-alpha.59b5e7c6.0",
     "@npmcli/arborist": "^4.2.0",
     "@npmcli/package-json": "^1.0.1",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
     "adm-zip": "^0.5.5",
-    "ajv": "^7.2.4",
+    "ajv": "^8.5.0",
+    "ajv-draft-04": "^1.0.0",
     "axios": "^0.21.2",
     "cryptr": "^6.0.2",
     "dateformat": "^4.5.1",
@@ -85,6 +88,7 @@
     "md5": "^2.3.0",
     "mime": "^2.5.2",
     "mustache": "^4.2.0",
+    "nanoid": "^3.1.31",
     "node-forge": "^1.0.0",
     "node-ts-uuid": "^1.0.8",
     "openapi-types": "^7.2.3",
@@ -131,6 +135,7 @@
     "@types/node": "^14.14.21",
     "@types/node-forge": "^0.9.7",
     "@types/proxyquire": "^1.3.28",
+    "@types/rewire": "^2.5.28",
     "@types/semver": "^7.3.4",
     "@types/sinon": "^9.0.10",
     "@types/tedious": "^4.0.3",
@@ -159,6 +164,7 @@
     "nyc": "^15.1.0",
     "prettier": "^2.4.1",
     "proxyquire": "^2.1.3",
+    "rewire": "^6.0.0",
     "sinon": "^9.2.2",
     "source-map-support": "^0.5.19",
     "tmp": "^0.2.1",
@@ -175,7 +181,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "f7a979eba61fdc9c66569bc5ac249b1dca17bcfc",
+  "gitHead": "10ab13c4aeb1ea72d8ccd4b0577e5b964a47a205",
   "publishConfig": {
     "access": "public"
   },

package/resource/strings.json

@@ -61,7 +61,34 @@
     "Collaboration": {
       "ListCollaboratorsSuccess": "List M365 Teams App%s owners success, you can view it in Teams Toolkit output window",
       "WithAadApp": "(With AAD App)",
-      "FailedToListCollaborators": "Failed to list Teams App owners for the project.\nError details: \n"
+      "FailedToListCollaborators": "Failed to list Teams App owners for the project.\nError details: \n",
+      "GrantingPermission": "Granting permission",
+      "EmailCannotBeEmptyOrSame":"Collaborator's email cannot be null or same as current user",
+      "CannotFindUserInCurrentTenant":"Cannot find user in current tenant, please check whether your email address is correct",
+      "GrantPermissionForUser":"Grant permission for user",
+      "FailedToGetEnvName": "Failed to get env name.",
+      "AccountToGrantPermission": "Account to grant permission: ",
+      "StartingGrantPermission":"Starting grant permission for environment: ",
+      "TenantId": "Tenant ID: ",
+      "FailedToGrantPermission":"Failed to grant permission for the below resources to user: %s.\n Resource details: \n",
+      "PermissionHasBeenGrantTo":"permission has been granted to ",
+      "GrantPermissionResourceId": ", Resource ID: ",
+      "SharePointTip":"\nIf added user is not a SharePoint App Catalog site admin, you need to manually setup access policy via SharePoint admin center, please refer to this link for more details: ",
+      "AzureTip":"\nIf added user cannot access Azure resources, you need to manually setup access policy via Azure portal, please refer to this link for more details: ",
+      "ListingM365Permission": "Listing M365 permissions\n",
+      "AccountUsedToCheck":"Account used to check: ",
+      "StartingListAllTeamsAppOwners": "Starting list all teams app owners for environment: ",
+      "M365TeamsAppId": "M365 Teams App (ID: ",
+      "SsoAadAppId":"), SSO AAD App (ID: ",
+      "TeamsAppOwner": "Teams App Owner: ",
+      "NotOwnerOfSsoAadApp":"(Not owner of SSO AAD app)",
+      "FailedToConvertProfile": "failed to convert profile ",
+      "StaringCheckPermission": "Starting check permission for environment: ",
+      "FailedToCheckPermission": "Failed to check permission for the below resources.\n Resource details: \n",
+      "CheckPermissionResourceId": "Resource ID: ",
+      "Undefined": "undefined",
+      "ResourceName": ", Resource Name: ",
+      "Permission": ", Permission: "
     }
   },
   "plugins": {

package/templates/plugins/resource/function/bicep/functionConfiguration.template.bicep

@@ -47,9 +47,11 @@ var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
 var teamsWebAppClientId = '5e3ce6c0-2b1f-4285-8d4b-75ee78787346'
 var officeWebAppClientId1 = '4345a7b9-9a63-4910-a426-35363201d503'
 var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
+var officeDesktopAppClientId = '0ec893e0-5785-4de6-99da-4ed124e5296c'
 var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
-var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
-var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
+var outlookWebAppClientId1 = '00000002-0000-0ff1-ce00-000000000000'
+var outlookWebAppClientId2 = 'bc59ab01-8403-45c6-8796-ac3ef710b3e3'
+var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${officeDesktopAppClientId};${outlookDesktopAppClientId};${outlookWebAppClientId1};${outlookWebAppClientId2}'
 
 var currentAllowedOrigins = empty(currentConfigs.cors) ? [] : currentConfigs.cors.allowedOrigins
 

package/templates/plugins/resource/simpleauth/bicep/simpleAuthConfiguration.template.bicep

@@ -40,9 +40,11 @@ var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
 var teamsWebAppClientId = '5e3ce6c0-2b1f-4285-8d4b-75ee78787346'
 var officeWebAppClientId1 = '4345a7b9-9a63-4910-a426-35363201d503'
 var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
+var officeDesktopAppClientId = '0ec893e0-5785-4de6-99da-4ed124e5296c'
 var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
-var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
-var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
+var outlookWebAppClientId1 = '00000002-0000-0ff1-ce00-000000000000'
+var outlookWebAppClientId2 = 'bc59ab01-8403-45c6-8796-ac3ef710b3e3'
+var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${officeDesktopAppClientId};${outlookDesktopAppClientId};${outlookWebAppClientId1};${outlookWebAppClientId2}'
 
 resource simpleAuthWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
   name: '${webAppName}/appsettings'

package/templates/plugins/resource/webapp/bicep/webappConfiguration.template.bicep

@@ -7,21 +7,17 @@ param provisionOutputs object
 param currentAppSettings object
 
 var webappName = split(provisionOutputs.webappOutput.value.webappResourceId, '/')[8]
-
 var m365ClientId = provisionParameters['m365ClientId']
 {{#if (contains "fx-resource-key-vault" plugins)}}
 var m365ClientSecret = \{{fx-resource-key-vault.References.m365ClientSecretReference}}
 {{else}}
 var m365ClientSecret = provisionParameters['m365ClientSecret']
 {{/if}}
-
 var m365TenantId = provisionParameters['m365TenantId']
 var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
 var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
-
-var webappDomain = provisionOutputs.webappOutput.value.domain
 var webappEndpoint = provisionOutputs.webappOutput.value.endpoint
-
+var initiateLoginEndpoint = uri(webappEndpoint, 'auth-start.html')
 {{#if (contains "fx-resource-bot" plugins) }}
 var botAadAppClientId = provisionParameters['botAadAppClientId']
   {{#if (contains "fx-resource-key-vault" plugins) }}
@@ -31,36 +27,14 @@ var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
   {{/if}}
 {{/if}}
 
-{{#if (contains "fx-resource-bot" plugins) }}
-var m365ApplicationIdUri = 'api://${webappDomain}/botid-${botAadAppClientId}'
-{{else}}
-var m365ApplicationIdUri = 'api://${webappDomain}/${m365ClientId}'
-{{/if}}
-var aadMetadataAddress = uri(m365OauthAuthorityHost, '${m365TenantId}/v2.0/.well-known/openid-configuration')
-var initiateLoginEndpoint = uri(webappEndpoint, 'auth-start.html')
-
-var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
-var teamsWebAppClientId = '5e3ce6c0-2b1f-4285-8d4b-75ee78787346'
-var officeWebAppClientId1 = '4345a7b9-9a63-4910-a426-35363201d503'
-var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
-var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
-var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
-var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
-
 resource appSettings 'Microsoft.Web/sites/config@2021-02-01' = {
   name: '${webappName}/appsettings'
   properties: union({
-    AAD_METADATA_ADDRESS: aadMetadataAddress
-    CLIENT_ID: m365ClientId
-    CLIENT_SECRET: m365ClientSecret
-    IDENTIFIER_URI: m365ApplicationIdUri
-    OAUTH_AUTHORITY: oauthAuthority
     TAB_APP_ENDPOINT: webappEndpoint
     TeamsFx__Authentication__ClientId: m365ClientId
+    TeamsFx__Authentication__ClientSecret: m365ClientSecret
     TeamsFx__Authentication__InitiateLoginEndpoint: initiateLoginEndpoint
-    TeamsFx__Authentication__SimpleAuthEndpoint: webappEndpoint
-    ALLOWED_APP_IDS: authorizedClientApplicationIds
-    M365_TENANT_ID: m365TenantId
+    TeamsFx__Authentication__OAuthAuthority: oauthAuthority
     {{#if (contains "fx-resource-bot" plugins) }}
     BOT_ID: botAadAppClientId
     BOT_PASSWORD: botAadAppClientSecret

package/templates/plugins/solution/{main.bicep → mainConfig.bicep}

@@ -1,13 +1,3 @@
-@secure()
-param provisionParameters object
-
-module provision './provision.bicep' = {
-  name: 'provisionResources'
-  params: {
-    provisionParameters: provisionParameters
-  }
-}
-
 module teamsFxConfig './config.bicep' = {
   name: 'addTeamsFxConfigurations'
   params: {
@@ -15,6 +5,4 @@ module teamsFxConfig './config.bicep' = {
     provisionOutputs: provision
   }
 }
-
-output provisionOutput object = provision
 output teamsFxConfigurationOutput object = contains(reference(resourceId('Microsoft.Resources/deployments', teamsFxConfig.name), '2020-06-01'), 'outputs') ? teamsFxConfig : {}

package/templates/plugins/solution/mainProvision.bicep

@@ -0,0 +1,10 @@
+@secure()
+param provisionParameters object
+
+module provision './provision.bicep' = {
+  name: 'provisionResources'
+  params: {
+    provisionParameters: provisionParameters
+  }
+}
+output provisionOutput object = provision

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

@@ -1,4 +0,0 @@
-import { Middleware } from "@feathersjs/hooks/lib";
-export declare const ProjectSettingsLoaderMW_V3: Middleware;
-export declare function getProjectSettingsPath(projectPath: string): string;
-//# sourceMappingURL=projectSettingsLoaderV3.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"projectSettingsLoaderV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoaderV3.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAkBjE,eAAO,MAAM,0BAA0B,EAAE,UA8BxC,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,UAOzD"}

package/build/core/middleware/projectSettingsLoaderV3.js

@@ -1,49 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectSettingsPath = exports.ProjectSettingsLoaderMW_V3 = void 0;
-const tslib_1 = require("tslib");
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const fs = tslib_1.__importStar(require("fs-extra"));
-const path = tslib_1.__importStar(require("path"));
-const uuid = tslib_1.__importStar(require("uuid"));
-const __1 = require("..");
-const fileUtils_1 = require("../../common/fileUtils");
-const crypto_1 = require("../crypto");
-const error_1 = require("../error");
-const tools_1 = require("../tools");
-const ProjectSettingsLoaderMW_V3 = async (ctx, next) => {
-    const inputs = ctx.arguments[ctx.arguments.length - 1];
-    if (!inputs.projectPath) {
-        ctx.result = teamsfx_api_1.err(error_1.NoProjectOpenedError());
-        return;
-    }
-    const projectPathExist = await fs.pathExists(inputs.projectPath);
-    if (!projectPathExist) {
-        ctx.result = teamsfx_api_1.err(error_1.PathNotExistError(inputs.projectPath));
-        return;
-    }
-    const settingsFile = getProjectSettingsPath(inputs.projectPath);
-    const projectSettings = await fileUtils_1.readJson(settingsFile);
-    if (!projectSettings.projectId) {
-        projectSettings.projectId = uuid.v4();
-    }
-    const validRes = tools_1.validateSettings(projectSettings);
-    if (validRes) {
-        ctx.result = teamsfx_api_1.err(error_1.InvalidProjectError(validRes));
-        return;
-    }
-    ctx.projectSettings = projectSettings;
-    ctx.self.isFromSample = projectSettings.isFromSample === true;
-    ctx.self.settingsVersion = projectSettings.version;
-    __1.TOOLS.cryptoProvider = new crypto_1.LocalCrypto(projectSettings.projectId);
-    ctx.contextV2 = __1.createV2Context(projectSettings);
-    await next();
-};
-exports.ProjectSettingsLoaderMW_V3 = ProjectSettingsLoaderMW_V3;
-function getProjectSettingsPath(projectPath) {
-    return path.resolve(projectPath, `.${teamsfx_api_1.ConfigFolderName}`, teamsfx_api_1.InputConfigsFolderName, teamsfx_api_1.ProjectSettingsFileName);
-}
-exports.getProjectSettingsPath = getProjectSettingsPath;
-//# sourceMappingURL=projectSettingsLoaderV3.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"projectSettingsLoaderV3.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoaderV3.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,wDAOgC;AAChC,qDAA+B;AAC/B,mDAA6B;AAC7B,mDAA6B;AAC7B,0BAA6D;AAC7D,sDAAkD;AAClD,sCAAwC;AACxC,oCAAwF;AACxF,oCAA4C;AAErC,MAAM,0BAA0B,GAAe,KAAK,EACzD,GAAoB,EACpB,IAAkB,EAClB,EAAE;IACF,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,4BAAoB,EAAE,CAAC,CAAC;QACzC,OAAO;KACR;IACD,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACjE,IAAI,CAAC,gBAAgB,EAAE;QACrB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,yBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;QACxD,OAAO;KACR;IACD,MAAM,YAAY,GAAG,sBAAsB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAChE,MAAM,eAAe,GAAoB,MAAM,oBAAQ,CAAC,YAAY,CAAC,CAAC;IACtE,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;QAC9B,eAAe,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;KACvC;IACD,MAAM,QAAQ,GAAG,wBAAgB,CAAC,eAAe,CAAC,CAAC;IACnD,IAAI,QAAQ,EAAE;QACZ,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,2BAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChD,OAAO;KACR;IACD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC;IACrC,GAAG,CAAC,IAAY,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,KAAK,IAAI,CAAC;IACtE,GAAG,CAAC,IAAY,CAAC,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC;IAC5D,SAAK,CAAC,cAAc,GAAG,IAAI,oBAAW,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IAClE,GAAG,CAAC,SAAS,GAAG,mBAAe,CAAC,eAAe,CAAC,CAAC;IACjD,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AA9BW,QAAA,0BAA0B,8BA8BrC;AAEF,SAAgB,sBAAsB,CAAC,WAAmB;IACxD,OAAO,IAAI,CAAC,OAAO,CACjB,WAAW,EACX,IAAI,8BAAgB,EAAE,EACtB,oCAAsB,EACtB,qCAAuB,CACxB,CAAC;AACJ,CAAC;AAPD,wDAOC"}

package/build/plugins/resource/apim/interfaces/IApimResource.d.ts

@@ -1,5 +0,0 @@
-export interface IApimServiceResource {
-    serviceName: string;
-    resourceGroupName: string;
-}
-//# sourceMappingURL=IApimResource.d.ts.map

package/build/plugins/resource/apim/interfaces/IApimResource.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"IApimResource.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/apim/interfaces/IApimResource.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B"}

package/build/plugins/resource/apim/interfaces/IApimResource.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IApimResource.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/apim/interfaces/IApimResource.ts"],"names":[],"mappings":""}

package/build/plugins/resource/frontend/v3/AzureStoragePlugin.d.ts

@@ -1,15 +0,0 @@
-import { AzureAccountProvider, FxError, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
-export declare class AzureStoragePlugin implements v3.ResourcePlugin {
-    type: "resource";
-    resourceType: string;
-    description: string;
-    name: string;
-    generateResourceTemplate(ctx: v3.ContextWithManifest, inputs: v3.PluginAddResourceInputs): Promise<Result<v2.ResourceTemplate, FxError>>;
-    updateResourceTemplate(ctx: v3.ContextWithManifest, inputs: v3.PluginAddResourceInputs): Promise<Result<v2.ResourceTemplate, FxError>>;
-    private buildFrontendConfig;
-    configureResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
-    deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
-    private updateDotEnv;
-    private collectEnvs;
-}
-//# sourceMappingURL=AzureStoragePlugin.d.ts.map

package/build/plugins/resource/frontend/v3/AzureStoragePlugin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AzureStoragePlugin.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/frontend/v3/AzureStoragePlugin.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EAEpB,OAAO,EAEP,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAqBhC,qBACa,kBAAmB,YAAW,EAAE,CAAC,cAAc;IAC1D,IAAI,EAAE,UAAU,CAAc;IAC9B,YAAY,SAAmB;IAC/B,WAAW,SAAmB;IAC9B,IAAI,SAAsC;IACpC,wBAAwB,CAC5B,GAAG,EAAE,EAAE,CAAC,mBAAmB,EAC3B,MAAM,EAAE,EAAE,CAAC,uBAAuB,GACjC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IA0BnC,sBAAsB,CACjC,GAAG,EAAE,EAAE,CAAC,mBAAmB,EAC3B,MAAM,EAAE,EAAE,CAAC,uBAAuB,GACjC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAWlC,mBAAmB;IAkB3B,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IA2B3B,MAAM,CACV,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,kBAAkB,EAC7B,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YA6BnB,YAAY;IAe1B,OAAO,CAAC,WAAW;CAgCpB"}

package/build/plugins/resource/frontend/v3/AzureStoragePlugin.js

@@ -1,149 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AzureStoragePlugin = void 0;
-const tslib_1 = require("tslib");
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const path = tslib_1.__importStar(require("path"));
-const typedi_1 = require("typedi");
-const constants_1 = require("../../../../common/constants");
-const tools_1 = require("../../../../common/tools");
-const folder_1 = require("../../../../folder");
-const constants_2 = require("../../../solution/fx-solution/v3/constants");
-const clients_1 = require("../clients");
-const configs_1 = require("../configs");
-const constants_3 = require("../constants");
-const env_1 = require("../env");
-const deploy_1 = require("../ops/deploy");
-const messages_1 = require("../resources/messages");
-const progress_helper_1 = require("../utils/progress-helper");
-const error_1 = require("./error");
-let AzureStoragePlugin = class AzureStoragePlugin {
-    constructor() {
-        this.type = "resource";
-        this.resourceType = "Azure Storage";
-        this.description = "Azure Storage";
-        this.name = constants_2.BuiltInResourcePluginNames.storage;
-    }
-    async generateResourceTemplate(ctx, inputs) {
-        ctx.logProvider.info(messages_1.Messages.StartGenerateArmTemplates(this.name));
-        const solutionSettings = ctx.projectSetting.solutionSettings;
-        const pluginCtx = { plugins: solutionSettings.activeResourcePlugins };
-        const bicepTemplateDir = path.join(folder_1.getTemplatesFolder(), path.join("plugins", "resource", "storage", "bicep"));
-        const provisionFilePath = path.join(bicepTemplateDir, constants_1.Bicep.ProvisionFileName);
-        const moduleProvisionFilePath = path.join(bicepTemplateDir, "azureStorageProvision.bicep");
-        const provisionOrchestration = await tools_1.generateBicepFromFile(provisionFilePath, pluginCtx);
-        const provisionModules = await tools_1.generateBicepFromFile(moduleProvisionFilePath, pluginCtx);
-        const result = {
-            Provision: {
-                Orchestration: provisionOrchestration,
-                Modules: { azureStorage: provisionModules },
-            },
-            Reference: {
-                endpoint: "provisionOutputs.azureStorageOutput.value.endpoint",
-                domain: "provisionOutputs.azureStorageOutput.value.domain",
-            },
-        };
-        return teamsfx_api_1.ok({ kind: "bicep", template: result });
-    }
-    async updateResourceTemplate(ctx, inputs) {
-        ctx.logProvider.info(messages_1.Messages.StartUpdateArmTemplates(this.name));
-        const result = {
-            Reference: {
-                endpoint: "provisionOutputs.azureStorageOutput.value.endpoint",
-                domain: "provisionOutputs.azureStorageOutput.value.domain",
-            },
-        };
-        return teamsfx_api_1.ok({ kind: "bicep", template: result });
-    }
-    async buildFrontendConfig(envInfo, tokenProvider) {
-        const credentials = await tokenProvider.getAccountCredentialAsync();
-        if (!credentials) {
-            return teamsfx_api_1.err(new error_1.UnauthenticatedError());
-        }
-        const storage = envInfo.state[this.name];
-        const frontendConfig = new configs_1.FrontendConfig(tools_1.getSubscriptionIdFromResourceId(storage.storageResourceId), tools_1.getResourceGroupNameFromResourceId(storage.storageResourceId), envInfo.state.solution.location, tools_1.getStorageAccountNameFromResourceId(storage.storageResourceId), credentials);
-        return teamsfx_api_1.ok(frontendConfig);
-    }
-    async configureResource(ctx, inputs, envInfo, tokenProvider) {
-        ctx.logProvider.info(messages_1.Messages.StartPostProvision(this.name));
-        const progress = ctx.userInteraction.createProgressBar(messages_1.Messages.PostProvisionProgressTitle, Object.entries(progress_helper_1.PostProvisionSteps).length);
-        await progress.start(messages_1.Messages.ProgressStart);
-        await progress.next(progress_helper_1.PostProvisionSteps.EnableStaticWebsite);
-        const frontendConfigRes = await this.buildFrontendConfig(envInfo, tokenProvider.azureAccountProvider);
-        if (frontendConfigRes.isErr()) {
-            return teamsfx_api_1.err(frontendConfigRes.error);
-        }
-        const client = new clients_1.AzureStorageClient(frontendConfigRes.value);
-        try {
-            await client.enableStaticWebsite();
-        }
-        catch (e) {
-            return teamsfx_api_1.err(new error_1.EnableStaticWebsiteError());
-        }
-        await this.updateDotEnv(ctx, inputs, envInfo);
-        await progress.end(true);
-        ctx.logProvider.info(messages_1.Messages.EndPostProvision(this.name));
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-    async deploy(ctx, inputs, envInfo, tokenProvider) {
-        ctx.logProvider.info(messages_1.Messages.StartDeploy(this.name));
-        const progress = ctx.userInteraction.createProgressBar(messages_1.Messages.DeployProgressTitle, Object.entries(progress_helper_1.DeploySteps).length);
-        await progress.start(messages_1.Messages.ProgressStart);
-        const frontendConfigRes = await this.buildFrontendConfig(envInfo, tokenProvider);
-        if (frontendConfigRes.isErr()) {
-            return teamsfx_api_1.err(frontendConfigRes.error);
-        }
-        const client = new clients_1.AzureStorageClient(frontendConfigRes.value);
-        //TODO deploy according to build type
-        const componentPath = inputs.dir
-            ? inputs.dir
-            : path.join(inputs.projectPath, constants_3.FrontendPathInfo.WorkingDir);
-        const envName = envInfo.envName;
-        const envs = await env_1.loadEnvFile(env_1.envFilePath(envName, componentPath));
-        await deploy_1.FrontendDeployment.doFrontendBuildV3(componentPath, envs, envName, progress);
-        await deploy_1.FrontendDeployment.doFrontendDeploymentV3(client, componentPath, envName);
-        await progress.end(true);
-        ctx.logProvider.info(messages_1.Messages.EndDeploy(this.name));
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-    async updateDotEnv(ctx, inputs, envInfo) {
-        const envs = this.collectEnvs(ctx, inputs, envInfo);
-        await env_1.saveEnvFile(env_1.envFilePath(envInfo.envName, path.join(inputs.projectPath, constants_3.FrontendPathInfo.WorkingDir)), {
-            teamsfxRemoteEnvs: envs,
-            customizedRemoteEnvs: {},
-        });
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-    collectEnvs(ctx, inputs, envInfo) {
-        const envs = {};
-        const addToEnvs = (key, value) => {
-            // Check for both null and undefined, add to envs when value is "", 0 or false.
-            if (value != null) {
-                envs[key] = value;
-            }
-        };
-        const solutionSettings = ctx.projectSetting.solutionSettings;
-        if (solutionSettings.activeResourcePlugins.includes(constants_2.BuiltInResourcePluginNames.function)) {
-            const functionState = envInfo.state[constants_2.BuiltInResourcePluginNames.function];
-            addToEnvs(env_1.EnvKeys.FuncName, ctx.projectSetting.defaultFunctionName);
-            addToEnvs(env_1.EnvKeys.FuncEndpoint, functionState.functionEndpoint);
-        }
-        if (solutionSettings.activeResourcePlugins.includes(constants_2.BuiltInResourcePluginNames.simpleAuth)) {
-            const simpleAuthState = envInfo.state[constants_2.BuiltInResourcePluginNames.simpleAuth];
-            addToEnvs(env_1.EnvKeys.RuntimeEndpoint, simpleAuthState.endpoint);
-            addToEnvs(env_1.EnvKeys.StartLoginPage, constants_3.DependentPluginInfo.StartLoginPageURL);
-        }
-        if (solutionSettings.activeResourcePlugins.includes(constants_2.BuiltInResourcePluginNames.aad)) {
-            const aadState = envInfo.state[constants_2.BuiltInResourcePluginNames.aad];
-            addToEnvs(env_1.EnvKeys.ClientID, aadState.clientId);
-        }
-        return envs;
-    }
-};
-AzureStoragePlugin = tslib_1.__decorate([
-    typedi_1.Service(constants_2.BuiltInResourcePluginNames.storage)
-], AzureStoragePlugin);
-exports.AzureStoragePlugin = AzureStoragePlugin;
-//# sourceMappingURL=AzureStoragePlugin.js.map