npm - @microsoft/teamsfx-core - Versions diffs - 1.0.0 → 1.0.1-alpha.83fede86.0 - Mend

@microsoft/teamsfx-core 1.0.0 → 1.0.1-alpha.83fede86.0

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

Files changed (168) hide show

package/build/plugins/solution/fx-solution/v2/provision.js CHANGED Viewed

@@ -8,17 +8,17 @@ const executor_1 = require("./executor");
 const utils_1 = require("./utils");
 const constants_1 = require("../constants");
 const util = tslib_1.__importStar(require("util"));
-const lodash_1 = require("lodash");
+const lodash_1 = tslib_1.__importStar(require("lodash"));
 const constants_2 = require("../../../../common/constants");
 const adaptor_1 = require("./adaptor");
 const commonQuestions_1 = require("../commonQuestions");
 const arm_1 = require("../arm");
 const typedi_1 = tslib_1.__importDefault(require("typedi"));
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
-const lodash_2 = tslib_1.__importDefault(require("lodash"));
 const permissionRequest_1 = require("../../../../core/permissionRequest");
 const core_1 = require("../../../../core");
 const constants_3 = require("../../../resource/appstudio/constants");
+const utils4v2_1 = require("../../../resource/utils4v2");
 async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
     var _a, _b, _c, _d;
     if (inputs.projectPath === undefined) {
@@ -39,7 +39,7 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
             return new teamsfx_api_1.v2.FxFailure(result.error);
         }
     }
-    const newEnvInfo = lodash_2.default.cloneDeep(envInfo);
+    const newEnvInfo = lodash_1.default.cloneDeep(envInfo);
     if (!newEnvInfo.state[constants_1.GLOBAL_CONFIG]) {
         newEnvInfo.state[constants_1.GLOBAL_CONFIG] = { output: {}, secrets: {} };
     }
@@ -148,9 +148,26 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
         (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(msg);
         ctx.userInteraction.showMessage("info", msg, false);
         solutionInputs[constants_1.SOLUTION_PROVISION_SUCCEEDED] = true;
-        const output = configureResourceResult.output;
-        output.push({ name: constants_1.GLOBAL_CONFIG, result: { output: solutionInputs, secrets: {} } });
-        return new teamsfx_api_1.v2.FxSuccess(utils_1.combineRecords(output));
+        const configOutput = configureResourceResult.output;
+        configOutput.push({ name: constants_1.GLOBAL_CONFIG, result: { output: solutionInputs, secrets: {} } });
+        const res1 = utils_1.combineRecords(provisionResult.output);
+        const res2 = utils_1.combineRecords(configOutput);
+        for (const key of Object.keys(res2)) {
+            if (!newEnvInfo.state[key]) {
+                newEnvInfo.state[key].output = res2[key].output;
+            }
+            else {
+                const newOutput = utils4v2_1.assignJsonInc(newEnvInfo.state[key].output, res2[key].output);
+                if (newOutput)
+                    newEnvInfo.state[key].output = newOutput;
+            }
+        }
+        for (const key of Object.keys(newEnvInfo.state)) {
+            if (!res1[key])
+                res1[key] = { output: {}, secrets: {} };
+            res1[key].output = newEnvInfo.state[key].output;
+        }
+        return new teamsfx_api_1.v2.FxSuccess(res1);
     }
 }
 exports.provisionResource = provisionResource;

package/build/plugins/solution/fx-solution/v2/provision.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":";;;;AAAA,wDAYgC;AAChC,oDAA8F;AAC9F,yCAAiD;AACjD,mCAOiB;AACjB,4CASsB;AACtB,mDAA6B;AAC7B,~~mCAAqC~~;~~AACrC~~,4DAAiE;AACjE,uCAAoD;AACpD,wDAA2D;AAC3D,gCAA4C;AAC5C,4DAA+B;AAC/B,wEAA+D;~~AAC~~/D,~~4DAAuB;AAEvB,~~0EAAmF;AACnF,2CAAwD;AACxD,qEAAkE;~~AAE3D~~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~~MAAM~~,GAAG,uBAAuB,CAAC,MAAM,CAAC;~~QAC9C~~,~~MAAM~~,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,yBAAa,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;~~QAEtF~~,~~OAAO~~,IAAI,~~gBAAE~~,CAAC,~~SAAS~~,CAAC,sBAAc,CAAC,MAAM,CAAC,CAAC,CAAC;~~KACjD~~;AACH,CAAC;~~AAvMD~~,~~8CAuMC~~;AAEM,KAAK,UAAU,sBAAsB,CAAC,GAAoB;;IAC/D,IAAI,qBAAc,EAAE,EAAE;QACpB,8EAA8E;QAC9E,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;IAED,MAAM,UAAU,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,oBAAoB,0CAAE,yBAAyB,EAAE,CAAA,CAAC;IAE/E,kDAAkD;IAClD,MAAM,QAAQ,GAAI,UAAkB,CAAC,QAAQ,CAAC,CAAC,CAAE,UAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAClF,MAAM,cAAc,GAAG,MAAA,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAa,CAAC,0CAAE,GAAG,CAAC,2BAAe,CAAW,CAAC;IAC5F,MAAM,gBAAgB,GAAG,MAAA,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAa,CAAC,0CAAE,GAAG,CAAC,6BAAiB,CAAW,CAAC;IAEhG,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CACrB,kBAAU,EAAE,CAAC,QAAQ,CAAC,sBAAsB,EAC5C,QAAQ,EACR,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAc,CACrD,CAAC;IACF,IAAI,UAAU,GAAG,SAAS,CAAC;IAC3B,IAAI,yBAAiB,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CACxB,kBAAU,EAAE,CAAC,QAAQ,CAAC,yBAAyB,EAC/C,GAAG,CAAC,OAAO,CAAC,OAAO,EACnB,QAAQ,EACR,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAc,CACrD,CAAC;QACF,UAAU,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA,CAAC;KAC3E;SAAM;QACL,UAAU,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAA,CAAC;KAC9F;IACD,MAAM,OAAO,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,EAAE,EAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAElE,IAAI,OAAO,KAAK,WAAW,EAAE;QAC3B,IAAI,OAAO,KAAK,oBAAoB,EAAE;YACpC,MAAA,GAAG,CAAC,EAAE,0CAAE,OAAO,CAAC,uDAAuD,CAAC,CAAC;SAC1E;QAED,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,EAChD,0BAAc,EACd,kBAAU,EAAE,CAAC,QAAQ,CAAC,eAAe,CACtC,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA9CD,wDA8CC"}
1	+ {"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/solution.d.ts CHANGED Viewed

@@ -14,5 +14,9 @@ export declare class TeamsAppSolutionV2 implements v2.SolutionPlugin {
     createEnv?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Void, FxError>>;
     getQuestions?: (ctx: v2.Context, inputs: Inputs, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<QTreeNode | undefined, FxError>>;
     getQuestionsForUserTask?: (ctx: v2.Context, inputs: Inputs, func: Func, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<QTreeNode | undefined, FxError>>;
+    grantPermission?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
+    checkPermission?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
+    listCollaborator?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
+    listAllCollaborators?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
 }
 //# sourceMappingURL=solution.d.ts.map

package/build/plugins/solution/fx-solution/v2/solution.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EACJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;~~AAc1E~~,qBACa,kBAAmB,YAAW,EAAE,CAAC,cAAc;IAC1D,IAAI,SAAuB;IAC3B,WAAW,EAAE,MAAM,CAA8B;IAEjD,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAClE;IACrB,wBAAwB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAClE;IAE3B,kBAAkB,EAAE,CAClB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CAAqB;IAEnF,MAAM,CAAC,EAAE,CACP,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,IAAI,EACtB,aAAa,EAAE,oBAAoB,KAChC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAU;IAE7C,kBAAkB,EAAE,CAClB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,KAClC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAsB;IACzD,sBAAsB,CAAC,EAAE,CACvB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAA0B;IAElE,0BAA0B,CAAC,EAAE,CAC3B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAA8B;IAElF,eAAe,CAAC,EAAE,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAmB;IAEzD,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAa;IAE5F,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,EAChC,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAAgB;IAEpE,uBAAuB,CAAC,EAAE,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,EAChC,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAA2B;~~CAChF~~"}
1	+ {"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/solution.js CHANGED Viewed

@@ -5,11 +5,15 @@ const tslib_1 = require("tslib");
 const typedi_1 = require("typedi");
 const constants_1 = require("../../../../common/constants");
 const SolutionPluginContainer_1 = require("../../../../core/SolutionPluginContainer");
+const checkPermission_1 = require("./checkPermission");
 const createEnv_1 = require("./createEnv");
 const deploy_1 = require("./deploy");
 const executeUserTask_1 = require("./executeUserTask");
 const generateResourceTemplate_1 = require("./generateResourceTemplate");
 const getQuestions_1 = require("./getQuestions");
+const grantPermission_1 = require("./grantPermission");
+const listAllCollaborators_1 = require("./listAllCollaborators");
+const listCollaborator_1 = require("./listCollaborator");
 const provision_1 = require("./provision");
 const provisionLocal_1 = require("./provisionLocal");
 const publish_1 = require("./publish");
@@ -29,6 +33,10 @@ let TeamsAppSolutionV2 = class TeamsAppSolutionV2 {
         this.createEnv = createEnv_1.createEnv;
         this.getQuestions = getQuestions_1.getQuestions;
         this.getQuestionsForUserTask = getQuestions_1.getQuestionsForUserTask;
+        this.grantPermission = (ctx, inputs, envInfo, tokenProvider) => grantPermission_1.grantPermission({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
+        this.checkPermission = (ctx, inputs, envInfo, tokenProvider) => checkPermission_1.checkPermission({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
+        this.listCollaborator = (ctx, inputs, envInfo, tokenProvider) => listCollaborator_1.listCollaborator({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
+        this.listAllCollaborators = (ctx, inputs, envInfo, tokenProvider) => listAllCollaborators_1.listAllCollaborators({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
     }
 };
 TeamsAppSolutionV2 = tslib_1.__decorate([

package/build/plugins/solution/fx-solution/v2/solution.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;AAcA,mCAAiC;AACjC,4DAAiE;AACjE,sFAA6E;AAC7E,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAAmG;AACnG,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,mBAAmB,CAAC;QAC3B,gBAAW,GAAW,6BAAiB,CAAC,QAAQ,CAAC;QAEjD,uBAAkB,GAChB,gCAAkB,CAAC;QACrB,6BAAwB,GACtB,mDAAwB,CAAC;QAE3B,uBAAkB,GAK+C,6BAAiB,CAAC;QAEnF,WAAM,GAKgC,eAAM,CAAC;QAE7C,uBAAkB,GAKoB,4BAAkB,CAAC;QACzD,2BAAsB,GAKqB,uCAAsB,CAAC;QAElE,+BAA0B,GAG6B,yCAA0B,CAAC;QAElF,oBAAe,GAO0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;~~IACjF~~,CAAC;CAAA,CAAA;~~AAlEY~~,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,~~CAkE9B~~;~~AAlEY~~,gDAAkB"}
1	+ {"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;AAcA,mCAAiC;AACjC,4DAAiE;AACjE,sFAA6E;AAC7E,uDAAoD;AACpD,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAAmG;AACnG,uDAAoD;AACpD,iEAA8D;AAC9D,yDAAsD;AACtD,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,mBAAmB,CAAC;QAC3B,gBAAW,GAAW,6BAAiB,CAAC,QAAQ,CAAC;QAEjD,uBAAkB,GAChB,gCAAkB,CAAC;QACrB,6BAAwB,GACtB,mDAAwB,CAAC;QAE3B,uBAAkB,GAK+C,6BAAiB,CAAC;QAEnF,WAAM,GAKgC,eAAM,CAAC;QAE7C,uBAAkB,GAKoB,4BAAkB,CAAC;QACzD,2BAAsB,GAKqB,uCAAsB,CAAC;QAElE,+BAA0B,GAG6B,yCAA0B,CAAC;QAElF,oBAAe,GAO0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;QAE/E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,qBAAgB,GAKsB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,mCAAgB,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE9E,yBAAoB,GAKkB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,2CAAoB,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IACpF,CAAC;CAAA,CAAA;AAlHY,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,CAkH9B;AAlHY,gDAAkB"}

package/build/plugins/solution/fx-solution/v2/utils.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json } from "@microsoft/teamsfx-api";
+import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin } from "@microsoft/teamsfx-api";
+import { PluginsWithContext } from "../solution";
 export declare function getSelectedPlugins(azureSettings: AzureSolutionSettings): v2.ResourcePlugin[];
 export declare function getAzureSolutionSettings(ctx: v2.Context): AzureSolutionSettings;
 export declare function isAzureProject(azureSettings: AzureSolutionSettings): boolean;
@@ -14,4 +15,5 @@ export declare function parseUserName(appStudioToken?: Record<string, unknown>):
 export declare function loadTeamsAppTenantIdForLocal(localSettings: v2.LocalSettings, appStudioToken?: Record<string, unknown>): Result<Void, FxError>;
 export declare function fillInSolutionSettings(solutionSettings: AzureSolutionSettings, answers: Inputs): Result<Void, FxError>;
 export declare function checkWetherProvisionSucceeded(config: Json): boolean;
+export declare function getPluginAndContextArray(ctx: SolutionContext, selectedPlugins: Plugin[]): PluginsWithContext[];
 //# sourceMappingURL=utils.d.ts.map

package/build/plugins/solution/fx-solution/v2/utils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAGzB,IAAI,~~EACL~~,MAAM,wBAAwB,CAAC;~~AAsBhC~~,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE"}
1	+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAGzB,IAAI,EACJ,eAAe,EACf,MAAM,EACP,MAAM,wBAAwB,CAAC;AAqBhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}

package/build/plugins/solution/fx-solution/v2/utils.js CHANGED Viewed

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.loadTeamsAppTenantIdForLocal = exports.parseUserName = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.reloadV2Plugins = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
+exports.getPluginAndContextArray = exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.loadTeamsAppTenantIdForLocal = exports.parseUserName = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.reloadV2Plugins = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
 const constants_1 = require("../constants");
 const question_1 = require("../question");
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
+const util_1 = require("../utils/util");
 function getSelectedPlugins(azureSettings) {
     const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSettings);
     azureSettings.activeResourcePlugins = plugins.map((p) => p.name);
@@ -135,4 +136,8 @@ function checkWetherProvisionSucceeded(config) {
     return config[constants_1.GLOBAL_CONFIG] && config[constants_1.GLOBAL_CONFIG][constants_1.SOLUTION_PROVISION_SUCCEEDED];
 }
 exports.checkWetherProvisionSucceeded = checkWetherProvisionSucceeded;
+function getPluginAndContextArray(ctx, selectedPlugins) {
+    return selectedPlugins.map((plugin) => [plugin, util_1.getPluginContext(ctx, plugin.name)]);
+}
+exports.getPluginAndContextArray = getPluginAndContextArray;
 //# sourceMappingURL=utils.js.map

package/build/plugins/solution/fx-solution/v2/utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":";;;AAAA,~~wDAcgC~~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"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.0.0",
+  "version": "1.0.1-alpha.83fede86.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -19,6 +19,7 @@
     "test:appstudio": "nyc mocha \"tests/plugins/resource/appstudio/**/*.test.ts\"",
     "test:spfx": "nyc mocha \"tests/plugins/resource/spfx/**/*.test.ts\"",
     "test:apim": "nyc mocha \"tests/plugins/resource/apim/**/*.test.ts\"",
+    "test:keyvault": "nyc mocha \"tests/plugins/resource/keyvault/**/*.test.ts\"",
     "test:unit": "nyc --no-clean mocha \"tests/**/*.test.ts\"",
     "test:solution": "nyc mocha \"tests/plugins/solution/*.test.ts\"",
     "test:core": "nyc mocha \"tests/core/*.test.ts\"",
@@ -47,7 +48,7 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.11.0",
+    "@microsoft/teamsfx-api": "0.11.1-alpha.83fede86.0",
     "@npmcli/package-json": "^1.0.1",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -61,6 +62,7 @@
     "fs-extra": "^9.1.0",
     "glob": "^7.1.6",
     "got": "^11.8.2",
+    "handlebars": "^4.7.7",
     "http-close": "^1.0.0",
     "ignore": "^5.1.8",
     "install": "^0.13.0",
@@ -153,7 +155,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "ede858b9747681a1bbf87bb3c80b0d770f2cafb5",
+  "gitHead": "3905151fa86df6f238841e2520ca5c91c6a0df4c",
   "publishConfig": {
     "access": "public"
   },

package/resource/strings.json CHANGED Viewed

@@ -23,6 +23,7 @@
     "AlreadyProvisionNotice": "'%s' is already provisioned in the cloud, will create the teams app again if it has been removed.",
     "NotProvisionedNotice": "'%s' is not provisioned in the cloud yet. Please provision first.",
     "GenerateArmTemplateFailNotice": "'%s' Failed to create ARM template for required Azure services.",
+    "UpdateArmTemplateFailNotice": "'%s' Failed to update ARM template for required Azure services.",
     "UpdateArmTemplateNotice": "The Azure resource template is updated based on your resource and capability selection. We recommend to initialize your project workspace with git init to track all changes.",
     "LocalDebugTenantConfirmNotice": "You already run local debug for the Teams app in another tenant '%s'. You can sign out %s and sign in with the matched M365 account to re-use the previous local debug resource. If you really want to switch tenant for local debug, you can delete the %s file and re-run local debug.",
     "MigrationToArmAndMultiEnvMessage": "Teams Toolkit will upgrade your project configuration files to support the latest features. The upgrade process will not change your custom code and create the backup files in case revert is needed.\nNotice this upgrade is a must-have to continue to use current version Teams Toolkit. If you are not ready to upgrade and want to continue to use the old version, please find Teams Toolkit in Extension and install the version <= 2.10.0",

package/templates/azure/config.bicep CHANGED Viewed

@@ -1,25 +1,25 @@
 @secure()
 param provisionParameters object
 param provisionOutputs object
-var functionCurrentConfigs = reference('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/web', '2021-02-01')
-var functionCurrentAppSettings = list('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/appsettings', '2021-02-01').properties
+var simpleAuthCurrentAppSettings = list('${provisionOutputs.simpleAuthOutput.value.webAppResourceId}/config/appsettings', '2021-02-01').properties
-module teamsFxFunctionConfig './teamsFx/function.bicep' = {
-  name: 'addTeamsFxFunctionConfiguration'
+module teamsFxSimpleAuthConfig './teamsFx/simpleAuth.bicep' = {
+  name: 'addTeamsFxSimpleAuthConfiguration'
   params: {
     provisionParameters: provisionParameters
     provisionOutputs: provisionOutputs
-    currentConfigs: functionCurrentConfigs
-    currentAppSettings: functionCurrentAppSettings
+    currentAppSettings: simpleAuthCurrentAppSettings
   }
 }
-var simpleAuthCurrentAppSettings = list('${provisionOutputs.simpleAuthOutput.value.webAppResourceId}/config/appsettings', '2021-02-01').properties
+var functionCurrentConfigs = reference('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/web', '2021-02-01')
+var functionCurrentAppSettings = list('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/appsettings', '2021-02-01').properties
-module teamsFxSimpleAuthConfig './teamsFx/simpleAuth.bicep' = {
-  name: 'addTeamsFxSimpleAuthConfiguration'
+module teamsFxFunctionConfig './teamsFx/function.bicep' = {
+  name: 'addTeamsFxFunctionConfiguration'
   params: {
     provisionParameters: provisionParameters
     provisionOutputs: provisionOutputs
-    currentAppSettings: simpleAuthCurrentAppSettings
+    currentConfigs: functionCurrentConfigs
+    currentAppSettings: functionCurrentAppSettings
   }
 }

package/templates/azure/provision.bicep CHANGED Viewed

@@ -14,19 +14,19 @@ output frontendHostingOutput object = {
   endpoint: frontendHostingProvision.outputs.endpoint
   storageResourceId: frontendHostingProvision.outputs.resourceId
 }
-// Resources for identity
-module userAssignedIdentityProvision './provision/identity.bicep' = {
-  name: 'userAssignedIdentityProvision'
+// Resources for Simple Auth
+module simpleAuthProvision './provision/simpleAuth.bicep' = {
+  name: 'simpleAuthProvision'
   params: {
     provisionParameters: provisionParameters
+    userAssignedIdentityId: userAssignedIdentityProvision.outputs.identityResourceId
   }
 }
-output identityOutput object = {
-  teamsFxPluginId: 'fx-resource-identity'
-  identityName: userAssignedIdentityProvision.outputs.identityName
-  identityResourceId: userAssignedIdentityProvision.outputs.identityResourceId
-  identityClientId: userAssignedIdentityProvision.outputs.identityClientId
+output simpleAuthOutput object = {
+  teamsFxPluginId: 'fx-resource-simple-auth'
+  endpoint: simpleAuthProvision.outputs.endpoint
+  webAppResourceId: simpleAuthProvision.outputs.webAppResourceId
 }
 // Resources for Azure SQL
 module azureSqlProvision './provision/azureSql.bicep' = {
@@ -55,18 +55,4 @@ output functionOutput object = {
   teamsFxPluginId: 'fx-resource-function'
   functionAppResourceId: functionProvision.outputs.functionAppResourceId
   functionEndpoint: functionProvision.outputs.functionEndpoint
-}
-// Resources for Simple Auth
-module simpleAuthProvision './provision/simpleAuth.bicep' = {
-  name: 'simpleAuthProvision'
-  params: {
-    provisionParameters: provisionParameters
-    userAssignedIdentityId: userAssignedIdentityProvision.outputs.identityResourceId
-  }
-}
-output simpleAuthOutput object = {
-  teamsFxPluginId: 'fx-resource-simple-auth'
-  endpoint: simpleAuthProvision.outputs.endpoint
-  webAppResourceId: simpleAuthProvision.outputs.webAppResourceId
 }

package/templates/azure/teamsFx/bot.bicep ADDED Viewed

@@ -0,0 +1,34 @@
+// Auto generated content, please customize files under provision folder
+@secure()
+param provisionParameters object
+param provisionOutputs object
+@secure()
+param currentAppSettings object
+var botWebAppName = split(provisionOutputs.botOutput.value.botWebAppResourceId, '/')[8]
+var m365ClientId = provisionParameters['m365ClientId']
+var m365ClientSecret = provisionParameters['m365ClientSecret']
+var m365TenantId = provisionParameters['m365TenantId']
+var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
+var botAadAppClientId = provisionParameters['botAadAppClientId']
+var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
+var botId = provisionParameters['botAadAppClientId']
+var m365ApplicationIdUri = 'api://${provisionOutputs.frontendHostingOutput.value.domain}/botid-${botId}'
+resource botWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
+  name: '${botWebAppName}/appsettings'
+  properties: union({
+    INITIATE_LOGIN_ENDPOINT: uri(provisionOutputs.botOutput.value.siteEndpoint, 'auth-start.html')
+    M365_AUTHORITY_HOST: m365OauthAuthorityHost
+    M365_CLIENT_ID: m365ClientId
+    M365_CLIENT_SECRET: m365ClientSecret
+    M365_TENANT_ID: m365TenantId
+    M365_APPLICATION_ID_URI: m365ApplicationIdUri
+    BOT_ID: botAadAppClientId
+    BOT_PASSWORD: botAadAppClientSecret
+    IDENTITY_ID: provisionOutputs.identityOutput.value.identityClientId
+  }, currentAppSettings)
+}

package/templates/azure/teamsFx/simpleAuth.bicep CHANGED Viewed

@@ -8,6 +8,47 @@ param currentAppSettings object
 var webAppName = split(provisionOutputs.simpleAuthOutput.value.webAppResourceId, '/')[8]
+var m365ClientId = provisionParameters['m365ClientId']
+var m365ClientSecret = provisionParameters['m365ClientSecret']
+var m365TenantId = provisionParameters['m365TenantId']
+var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
+var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
+var aadMetadataAddress = uri(m365OauthAuthorityHost, '${m365TenantId}/v2.0/.well-known/openid-configuration')
+var botId = provisionParameters['botAadAppClientId']
+var tabAppDomain = provisionOutputs.frontendHostingOutput.value.domain
+var tabAppEndpoint = provisionOutputs.frontendHostingOutput.value.endpoint
+var m365ApplicationIdUri = 'api://${tabAppDomain}/botid-${botId}'
+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 simpleAuthWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
+  name: '${webAppName}/appsettings'
+  properties: union({
+    AAD_METADATA_ADDRESS: aadMetadataAddress
+    ALLOWED_APP_IDS: authorizedClientApplicationIds
+    IDENTIFIER_URI: m365ApplicationIdUri
+    CLIENT_ID: m365ClientId
+    CLIENT_SECRET: m365ClientSecret
+    OAUTH_AUTHORITY: oauthAuthority
+    TAB_APP_ENDPOINT: tabAppEndpoint
+  }, currentAppSettings)
+}
+// Auto generated content, please customize files under provision folder
+@secure()
+param provisionParameters object
+param provisionOutputs object
+@secure()
+param currentAppSettings object
+var webAppName = split(provisionOutputs.simpleAuthOutput.value.webAppResourceId, '/')[8]
 var m365ClientId = provisionParameters['m365ClientId']
 var m365ClientSecret = provisionParameters['m365ClientSecret']
 var m365TenantId = provisionParameters['m365TenantId']

package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep CHANGED Viewed

@@ -8,11 +8,21 @@ param currentAppSettings object
 var botWebAppName = split(provisionOutputs.botOutput.value.botWebAppResourceId, '/')[8]
 var m365ClientId = provisionParameters['m365ClientId']
+{{#contains 'fx-resource-key-vault' Plugins}}
+var m365ClientSecret = {{../PluginOutput.fx-resource-key-vault.References.m365ClientSecretReference}}
+{{/contains}}
+{{#notContains 'fx-resource-key-vault' Plugins}}
 var m365ClientSecret = provisionParameters['m365ClientSecret']
+{{/notContains}}
 var m365TenantId = provisionParameters['m365TenantId']
 var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
 var botAadAppClientId = provisionParameters['botAadAppClientId']
+{{#contains 'fx-resource-key-vault' Plugins}}
+var botAadAppClientSecret = {{../PluginOutput.fx-resource-key-vault.References.botClientSecretReference}}
+{{/contains}}
+{{#notContains 'fx-resource-key-vault' Plugins}}
 var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
+{{/notContains}}
 var botId = provisionParameters['botAadAppClientId']

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

@@ -11,7 +11,12 @@ param currentAppSettings object
 var functionAppName = split({{PluginOutput.fx-resource-function.References.functionAppResourceId}}, '/')[8]
 var m365ClientId = provisionParameters['m365ClientId']
+{{#contains 'fx-resource-key-vault' Plugins}}
+var m365ClientSecret = {{../PluginOutput.fx-resource-key-vault.References.m365ClientSecretReference}}
+{{/contains}}
+{{#notContains 'fx-resource-key-vault' Plugins}}
 var m365ClientSecret = provisionParameters['m365ClientSecret']
+{{/notContains}}
 var m365TenantId = provisionParameters['m365TenantId']
 var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
 var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)

package/templates/plugins/resource/keyvault/bicep/keyVaultProvision.template.bicep ADDED Viewed

@@ -0,0 +1,53 @@
+@secure()
+param provisionParameters object
+param userAssignedIdentityObjectId string
+var resourceBaseName = provisionParameters.resourceBaseName
+var keyVaultName = contains(provisionParameters, 'keyVaultName') ? provisionParameters['keyVaultName'] : '${resourceBaseName}'
+var tenantId = subscription().tenantId
+var m365ClientSecretName = 'm365ClientSecret'
+var m365ClientSecret = provisionParameters['m365ClientSecret']
+var botClientSecretName = 'botClientSecret'
+var botClientSecret = contains(provisionParameters, 'botAadAppClientSecret') ? provisionParameters['botAadAppClientSecret'] : ''
+resource keyVault 'Microsoft.KeyVault/vaults@2019-09-01' = {
+  name: keyVaultName
+  location: resourceGroup().location
+  properties: {
+    tenantId: tenantId
+    accessPolicies: [
+      {
+        tenantId: tenantId
+        objectId: userAssignedIdentityObjectId
+        permissions: {
+          secrets: [
+            'get'
+          ]
+        }
+      }
+    ]
+    sku: {
+      name: 'standard'
+      family: 'A'
+    }
+  }
+}
+resource clientSecretKv 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = if (length(m365ClientSecret) != 0) {
+  parent: keyVault
+  name: m365ClientSecretName
+  properties: {
+    value: m365ClientSecret
+  }
+}
+resource botVlientSecretKv 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = if (length(botClientSecret) != 0) {
+  parent: keyVault
+  name: botClientSecretName
+  properties: {
+    value: botClientSecret
+  }
+}
+output m365ClientSecretReference string = '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=${m365ClientSecretName})'
+output botClientSecretReference string = '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=${botClientSecretName})'

package/templates/plugins/resource/keyvault/bicep/provision.template.bicep ADDED Viewed

@@ -0,0 +1,13 @@
+// Resources for Azure Key Vault
+module keyVaultProvision '{{PluginOutput.fx-resource-key-vault.Provision.keyVault.ProvisionPath}}' = {
+  name: 'keyVaultProvision'
+  params: {
+    provisionParameters: provisionParameters
+    userAssignedIdentityObjectId: {{PluginOutput.fx-resource-identity.References.identityPrincipalId}}
+  }
+}
+output keyVaultOutput object = {
+  m365ClientSecretReference: keyVaultProvision.outputs.m365ClientSecretReference
+  botClientSecretReference: keyVaultProvision.outputs.botClientSecretReference
+}

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

@@ -9,7 +9,12 @@ param currentAppSettings object
 var webAppName = split(provisionOutputs.simpleAuthOutput.value.webAppResourceId, '/')[8]
 var m365ClientId = provisionParameters['m365ClientId']
+{{#contains 'fx-resource-key-vault' Plugins}}
+var m365ClientSecret = {{../PluginOutput.fx-resource-key-vault.References.m365ClientSecretReference}}
+{{/contains}}
+{{#notContains 'fx-resource-key-vault' Plugins}}
 var m365ClientSecret = provisionParameters['m365ClientSecret']
+{{/notContains}}
 var m365TenantId = provisionParameters['m365TenantId']
 var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
 var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)

package/templates/azure/provision/identity.bicep DELETED Viewed

@@ -1,14 +0,0 @@
-@secure()
-param provisionParameters object
-var resourceBaseName = provisionParameters.resourceBaseName
-var identityName = contains(provisionParameters, 'userAssignedIdentityName') ? provisionParameters['userAssignedIdentityName'] : '${resourceBaseName}'
-resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
-  name: identityName
-  location: resourceGroup().location
-}
-output identityName string = identityName
-output identityClientId string = managedIdentity.properties.clientId
-output identityResourceId string = managedIdentity.id
-output identityPrincipalId string = managedIdentity.properties.principalId