@microsoft/teamsfx-core 1.0.0 → 1.0.1-alpha.04803ca3.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 (194) hide show
  1. package/build/common/armInterface.d.ts +6 -11
  2. package/build/common/armInterface.d.ts.map +1 -1
  3. package/build/common/tools.d.ts +2 -2
  4. package/build/common/tools.d.ts.map +1 -1
  5. package/build/common/tools.js +1 -5
  6. package/build/common/tools.js.map +1 -1
  7. package/build/core/error.d.ts +1 -0
  8. package/build/core/error.d.ts.map +1 -1
  9. package/build/core/error.js +5 -1
  10. package/build/core/error.js.map +1 -1
  11. package/build/core/index.d.ts +1 -0
  12. package/build/core/index.d.ts.map +1 -1
  13. package/build/core/index.js +46 -4
  14. package/build/core/index.js.map +1 -1
  15. package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
  16. package/build/core/middleware/envInfoLoader.js +23 -2
  17. package/build/core/middleware/envInfoLoader.js.map +1 -1
  18. package/build/core/middleware/envInfoWriter.d.ts.map +1 -1
  19. package/build/core/middleware/envInfoWriter.js +2 -0
  20. package/build/core/middleware/envInfoWriter.js.map +1 -1
  21. package/build/core/middleware/projectMigrator.js +1 -1
  22. package/build/core/middleware/projectMigrator.js.map +1 -1
  23. package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
  24. package/build/core/middleware/projectSettingsLoader.js +1 -0
  25. package/build/core/middleware/projectSettingsLoader.js.map +1 -1
  26. package/build/plugins/resource/aad/index.d.ts +2 -3
  27. package/build/plugins/resource/aad/index.d.ts.map +1 -1
  28. package/build/plugins/resource/aad/index.js.map +1 -1
  29. package/build/plugins/resource/aad/v2/index.d.ts +3 -0
  30. package/build/plugins/resource/aad/v2/index.d.ts.map +1 -1
  31. package/build/plugins/resource/aad/v2/index.js +9 -0
  32. package/build/plugins/resource/aad/v2/index.js.map +1 -1
  33. package/build/plugins/resource/apim/index.d.ts.map +1 -1
  34. package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
  35. package/build/plugins/resource/appstudio/index.js +16 -6
  36. package/build/plugins/resource/appstudio/index.js.map +1 -1
  37. package/build/plugins/resource/appstudio/interfaces/IAppDefinition.d.ts +6 -2
  38. package/build/plugins/resource/appstudio/interfaces/IAppDefinition.d.ts.map +1 -1
  39. package/build/plugins/resource/appstudio/plugin.d.ts +1 -1
  40. package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
  41. package/build/plugins/resource/appstudio/plugin.js +123 -36
  42. package/build/plugins/resource/appstudio/plugin.js.map +1 -1
  43. package/build/plugins/resource/appstudio/utils/telemetry.d.ts +1 -0
  44. package/build/plugins/resource/appstudio/utils/telemetry.d.ts.map +1 -1
  45. package/build/plugins/resource/appstudio/utils/telemetry.js +1 -0
  46. package/build/plugins/resource/appstudio/utils/telemetry.js.map +1 -1
  47. package/build/plugins/resource/appstudio/v2/index.d.ts +4 -2
  48. package/build/plugins/resource/appstudio/v2/index.d.ts.map +1 -1
  49. package/build/plugins/resource/appstudio/v2/index.js +9 -3
  50. package/build/plugins/resource/appstudio/v2/index.js.map +1 -1
  51. package/build/plugins/resource/frontend/index.d.ts +1 -2
  52. package/build/plugins/resource/frontend/index.d.ts.map +1 -1
  53. package/build/plugins/resource/frontend/index.js.map +1 -1
  54. package/build/plugins/resource/function/enums.d.ts +1 -0
  55. package/build/plugins/resource/function/enums.d.ts.map +1 -1
  56. package/build/plugins/resource/function/enums.js +1 -0
  57. package/build/plugins/resource/function/enums.js.map +1 -1
  58. package/build/plugins/resource/function/index.d.ts +1 -0
  59. package/build/plugins/resource/function/index.d.ts.map +1 -1
  60. package/build/plugins/resource/function/index.js +5 -0
  61. package/build/plugins/resource/function/index.js.map +1 -1
  62. package/build/plugins/resource/function/plugin.d.ts +1 -0
  63. package/build/plugins/resource/function/plugin.d.ts.map +1 -1
  64. package/build/plugins/resource/function/plugin.js +20 -2
  65. package/build/plugins/resource/function/plugin.js.map +1 -1
  66. package/build/plugins/resource/identity/v2/index.d.ts +2 -1
  67. package/build/plugins/resource/identity/v2/index.d.ts.map +1 -1
  68. package/build/plugins/resource/identity/v2/index.js +3 -0
  69. package/build/plugins/resource/identity/v2/index.js.map +1 -1
  70. package/build/plugins/resource/index.d.ts +1 -0
  71. package/build/plugins/resource/index.d.ts.map +1 -1
  72. package/build/plugins/resource/index.js +1 -0
  73. package/build/plugins/resource/index.js.map +1 -1
  74. package/build/plugins/resource/keyvault/constants.d.ts +35 -0
  75. package/build/plugins/resource/keyvault/constants.d.ts.map +1 -0
  76. package/build/plugins/resource/keyvault/constants.js +42 -0
  77. package/build/plugins/resource/keyvault/constants.js.map +1 -0
  78. package/build/plugins/resource/keyvault/index.d.ts +14 -0
  79. package/build/plugins/resource/keyvault/index.d.ts.map +1 -0
  80. package/build/plugins/resource/keyvault/index.js +60 -0
  81. package/build/plugins/resource/keyvault/index.js.map +1 -0
  82. package/build/plugins/resource/keyvault/plugin.d.ts +6 -0
  83. package/build/plugins/resource/keyvault/plugin.d.ts.map +1 -0
  84. package/build/plugins/resource/keyvault/plugin.js +31 -0
  85. package/build/plugins/resource/keyvault/plugin.js.map +1 -0
  86. package/build/plugins/resource/keyvault/result.d.ts +9 -0
  87. package/build/plugins/resource/keyvault/result.d.ts.map +1 -0
  88. package/build/plugins/resource/keyvault/result.js +21 -0
  89. package/build/plugins/resource/keyvault/result.js.map +1 -0
  90. package/build/plugins/resource/keyvault/utils/telemetry.d.ts +17 -0
  91. package/build/plugins/resource/keyvault/utils/telemetry.d.ts.map +1 -0
  92. package/build/plugins/resource/keyvault/utils/telemetry.js +45 -0
  93. package/build/plugins/resource/keyvault/utils/telemetry.js.map +1 -0
  94. package/build/plugins/resource/localdebug/localEnvMulti.d.ts +0 -2
  95. package/build/plugins/resource/localdebug/localEnvMulti.d.ts.map +1 -1
  96. package/build/plugins/resource/localdebug/localEnvMulti.js +0 -4
  97. package/build/plugins/resource/localdebug/localEnvMulti.js.map +1 -1
  98. package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
  99. package/build/plugins/resource/simpleauth/plugin.js +2 -2
  100. package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
  101. package/build/plugins/resource/simpleauth/v2/index.d.ts +7 -6
  102. package/build/plugins/resource/simpleauth/v2/index.d.ts.map +1 -1
  103. package/build/plugins/resource/simpleauth/v2/index.js +12 -6
  104. package/build/plugins/resource/simpleauth/v2/index.js.map +1 -1
  105. package/build/plugins/resource/utils4v2.d.ts +8 -8
  106. package/build/plugins/resource/utils4v2.d.ts.map +1 -1
  107. package/build/plugins/resource/utils4v2.js +26 -1
  108. package/build/plugins/resource/utils4v2.js.map +1 -1
  109. package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts +1 -0
  110. package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts.map +1 -1
  111. package/build/plugins/solution/fx-solution/ResourcePluginContainer.js +1 -0
  112. package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map +1 -1
  113. package/build/plugins/solution/fx-solution/arm.d.ts +5 -3
  114. package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
  115. package/build/plugins/solution/fx-solution/arm.js +72 -32
  116. package/build/plugins/solution/fx-solution/arm.js.map +1 -1
  117. package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
  118. package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
  119. package/build/plugins/solution/fx-solution/constants.d.ts +1 -1
  120. package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
  121. package/build/plugins/solution/fx-solution/constants.js +2 -2
  122. package/build/plugins/solution/fx-solution/constants.js.map +1 -1
  123. package/build/plugins/solution/fx-solution/question.d.ts +2 -1
  124. package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
  125. package/build/plugins/solution/fx-solution/question.js +10 -3
  126. package/build/plugins/solution/fx-solution/question.js.map +1 -1
  127. package/build/plugins/solution/fx-solution/solution.d.ts +2 -4
  128. package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
  129. package/build/plugins/solution/fx-solution/solution.js +65 -580
  130. package/build/plugins/solution/fx-solution/solution.js.map +1 -1
  131. package/build/plugins/solution/fx-solution/v2/adaptor.d.ts +11 -1
  132. package/build/plugins/solution/fx-solution/v2/adaptor.d.ts.map +1 -1
  133. package/build/plugins/solution/fx-solution/v2/adaptor.js +82 -9
  134. package/build/plugins/solution/fx-solution/v2/adaptor.js.map +1 -1
  135. package/build/plugins/solution/fx-solution/v2/checkPermission.d.ts +5 -0
  136. package/build/plugins/solution/fx-solution/v2/checkPermission.d.ts.map +1 -0
  137. package/build/plugins/solution/fx-solution/v2/checkPermission.js +185 -0
  138. package/build/plugins/solution/fx-solution/v2/checkPermission.js.map +1 -0
  139. package/build/plugins/solution/fx-solution/v2/collaborationUtil.d.ts +24 -0
  140. package/build/plugins/solution/fx-solution/v2/collaborationUtil.d.ts.map +1 -0
  141. package/build/plugins/solution/fx-solution/v2/collaborationUtil.js +110 -0
  142. package/build/plugins/solution/fx-solution/v2/collaborationUtil.js.map +1 -0
  143. package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
  144. package/build/plugins/solution/fx-solution/v2/executeUserTask.js +14 -10
  145. package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
  146. package/build/plugins/solution/fx-solution/v2/executor.d.ts +1 -0
  147. package/build/plugins/solution/fx-solution/v2/executor.d.ts.map +1 -1
  148. package/build/plugins/solution/fx-solution/v2/executor.js +17 -1
  149. package/build/plugins/solution/fx-solution/v2/executor.js.map +1 -1
  150. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts +1 -0
  151. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map +1 -1
  152. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js +12 -1
  153. package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map +1 -1
  154. package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
  155. package/build/plugins/solution/fx-solution/v2/getQuestions.js +5 -8
  156. package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
  157. package/build/plugins/solution/fx-solution/v2/grantPermission.d.ts +5 -0
  158. package/build/plugins/solution/fx-solution/v2/grantPermission.d.ts.map +1 -0
  159. package/build/plugins/solution/fx-solution/v2/grantPermission.js +205 -0
  160. package/build/plugins/solution/fx-solution/v2/grantPermission.js.map +1 -0
  161. package/build/plugins/solution/fx-solution/v2/listAllCollaborators.d.ts +5 -0
  162. package/build/plugins/solution/fx-solution/v2/listAllCollaborators.d.ts.map +1 -0
  163. package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js +118 -0
  164. package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js.map +1 -0
  165. package/build/plugins/solution/fx-solution/v2/listCollaborator.d.ts +8 -0
  166. package/build/plugins/solution/fx-solution/v2/listCollaborator.d.ts.map +1 -0
  167. package/build/plugins/solution/fx-solution/v2/listCollaborator.js +202 -0
  168. package/build/plugins/solution/fx-solution/v2/listCollaborator.js.map +1 -0
  169. package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
  170. package/build/plugins/solution/fx-solution/v2/provision.js +38 -9
  171. package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
  172. package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -1
  173. package/build/plugins/solution/fx-solution/v2/provisionLocal.js +28 -17
  174. package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
  175. package/build/plugins/solution/fx-solution/v2/solution.d.ts +4 -0
  176. package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
  177. package/build/plugins/solution/fx-solution/v2/solution.js +8 -0
  178. package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
  179. package/build/plugins/solution/fx-solution/v2/utils.d.ts +4 -1
  180. package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
  181. package/build/plugins/solution/fx-solution/v2/utils.js +27 -1
  182. package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
  183. package/package.json +5 -3
  184. package/resource/strings.json +1 -0
  185. package/templates/azure/config.bicep +1 -13
  186. package/templates/azure/provision.bicep +8 -36
  187. package/templates/azure/teamsFx/bot.bicep +34 -0
  188. package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep +10 -0
  189. package/templates/plugins/resource/function/bicep/functionConfiguration.template.bicep +5 -0
  190. package/templates/plugins/resource/keyvault/bicep/keyVaultProvision.template.bicep +54 -0
  191. package/templates/plugins/resource/keyvault/bicep/provision.template.bicep +13 -0
  192. package/templates/plugins/resource/simpleauth/bicep/simpleAuthConfiguration.template.bicep +5 -0
  193. package/templates/azure/provision/function.bicep +0 -79
  194. package/templates/azure/provision/identity.bicep +0 -14
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/teamsfx-core",
3
- "version": "1.0.0",
3
+ "version": "1.0.1-alpha.04803ca3.0",
4
4
  "main": "build/index.js",
5
5
  "types": "build/index.d.ts",
6
6
  "license": "MIT",
@@ -19,6 +19,7 @@
19
19
  "test:appstudio": "nyc mocha \"tests/plugins/resource/appstudio/**/*.test.ts\"",
20
20
  "test:spfx": "nyc mocha \"tests/plugins/resource/spfx/**/*.test.ts\"",
21
21
  "test:apim": "nyc mocha \"tests/plugins/resource/apim/**/*.test.ts\"",
22
+ "test:keyvault": "nyc mocha \"tests/plugins/resource/keyvault/**/*.test.ts\"",
22
23
  "test:unit": "nyc --no-clean mocha \"tests/**/*.test.ts\"",
23
24
  "test:solution": "nyc mocha \"tests/plugins/solution/*.test.ts\"",
24
25
  "test:core": "nyc mocha \"tests/core/*.test.ts\"",
@@ -47,7 +48,7 @@
47
48
  "@azure/storage-blob": "^12.7.0",
48
49
  "@dbpiper/timer": "1.0.0-beta.2",
49
50
  "@feathersjs/hooks": "^0.6.5",
50
- "@microsoft/teamsfx-api": "^0.11.0",
51
+ "@microsoft/teamsfx-api": "0.11.1-alpha.04803ca3.0",
51
52
  "@npmcli/package-json": "^1.0.1",
52
53
  "@types/jwt-decode": "3.1.0",
53
54
  "@types/proper-lockfile": "^4.1.1",
@@ -61,6 +62,7 @@
61
62
  "fs-extra": "^9.1.0",
62
63
  "glob": "^7.1.6",
63
64
  "got": "^11.8.2",
65
+ "handlebars": "^4.7.7",
64
66
  "http-close": "^1.0.0",
65
67
  "ignore": "^5.1.8",
66
68
  "install": "^0.13.0",
@@ -153,7 +155,7 @@
153
155
  "resource/**/*",
154
156
  "templates/**/*"
155
157
  ],
156
- "gitHead": "ede858b9747681a1bbf87bb3c80b0d770f2cafb5",
158
+ "gitHead": "041582de61285b0b3252ea2c5ad710844789f3e7",
157
159
  "publishConfig": {
158
160
  "access": "public"
159
161
  },
@@ -23,6 +23,7 @@
23
23
  "AlreadyProvisionNotice": "'%s' is already provisioned in the cloud, will create the teams app again if it has been removed.",
24
24
  "NotProvisionedNotice": "'%s' is not provisioned in the cloud yet. Please provision first.",
25
25
  "GenerateArmTemplateFailNotice": "'%s' Failed to create ARM template for required Azure services.",
26
+ "UpdateArmTemplateFailNotice": "'%s' Failed to update ARM template for required Azure services.",
26
27
  "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.",
27
28
  "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.",
28
29
  "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",
@@ -1,18 +1,6 @@
1
1
  @secure()
2
2
  param provisionParameters object
3
3
  param provisionOutputs object
4
- var functionCurrentConfigs = reference('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/web', '2021-02-01')
5
- var functionCurrentAppSettings = list('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/appsettings', '2021-02-01').properties
6
-
7
- module teamsFxFunctionConfig './teamsFx/function.bicep' = {
8
- name: 'addTeamsFxFunctionConfiguration'
9
- params: {
10
- provisionParameters: provisionParameters
11
- provisionOutputs: provisionOutputs
12
- currentConfigs: functionCurrentConfigs
13
- currentAppSettings: functionCurrentAppSettings
14
- }
15
- }
16
4
  var simpleAuthCurrentAppSettings = list('${provisionOutputs.simpleAuthOutput.value.webAppResourceId}/config/appsettings', '2021-02-01').properties
17
5
 
18
6
  module teamsFxSimpleAuthConfig './teamsFx/simpleAuth.bicep' = {
@@ -22,4 +10,4 @@ module teamsFxSimpleAuthConfig './teamsFx/simpleAuth.bicep' = {
22
10
  provisionOutputs: provisionOutputs
23
11
  currentAppSettings: simpleAuthCurrentAppSettings
24
12
  }
25
- }
13
+ }
@@ -14,19 +14,19 @@ output frontendHostingOutput object = {
14
14
  endpoint: frontendHostingProvision.outputs.endpoint
15
15
  storageResourceId: frontendHostingProvision.outputs.resourceId
16
16
  }
17
- // Resources for identity
18
- module userAssignedIdentityProvision './provision/identity.bicep' = {
19
- name: 'userAssignedIdentityProvision'
17
+ // Resources for Simple Auth
18
+ module simpleAuthProvision './provision/simpleAuth.bicep' = {
19
+ name: 'simpleAuthProvision'
20
20
  params: {
21
21
  provisionParameters: provisionParameters
22
+ userAssignedIdentityId: userAssignedIdentityProvision.outputs.identityResourceId
22
23
  }
23
24
  }
24
25
 
25
- output identityOutput object = {
26
- teamsFxPluginId: 'fx-resource-identity'
27
- identityName: userAssignedIdentityProvision.outputs.identityName
28
- identityResourceId: userAssignedIdentityProvision.outputs.identityResourceId
29
- identityClientId: userAssignedIdentityProvision.outputs.identityClientId
26
+ output simpleAuthOutput object = {
27
+ teamsFxPluginId: 'fx-resource-simple-auth'
28
+ endpoint: simpleAuthProvision.outputs.endpoint
29
+ webAppResourceId: simpleAuthProvision.outputs.webAppResourceId
30
30
  }
31
31
  // Resources for Azure SQL
32
32
  module azureSqlProvision './provision/azureSql.bicep' = {
@@ -41,32 +41,4 @@ output azureSqlOutput object = {
41
41
  sqlResourceId: azureSqlProvision.outputs.resourceId
42
42
  sqlEndpoint: azureSqlProvision.outputs.sqlEndpoint
43
43
  databaseName: azureSqlProvision.outputs.databaseName
44
- }
45
- // Resources for Azure Functions
46
- module functionProvision './provision/function.bicep' = {
47
- name: 'functionProvision'
48
- params: {
49
- provisionParameters: provisionParameters
50
- userAssignedIdentityId: userAssignedIdentityProvision.outputs.identityResourceId
51
- }
52
- }
53
-
54
- output functionOutput object = {
55
- teamsFxPluginId: 'fx-resource-function'
56
- functionAppResourceId: functionProvision.outputs.functionAppResourceId
57
- functionEndpoint: functionProvision.outputs.functionEndpoint
58
- }
59
- // Resources for Simple Auth
60
- module simpleAuthProvision './provision/simpleAuth.bicep' = {
61
- name: 'simpleAuthProvision'
62
- params: {
63
- provisionParameters: provisionParameters
64
- userAssignedIdentityId: userAssignedIdentityProvision.outputs.identityResourceId
65
- }
66
- }
67
-
68
- output simpleAuthOutput object = {
69
- teamsFxPluginId: 'fx-resource-simple-auth'
70
- endpoint: simpleAuthProvision.outputs.endpoint
71
- webAppResourceId: simpleAuthProvision.outputs.webAppResourceId
72
44
  }
@@ -0,0 +1,34 @@
1
+ // Auto generated content, please customize files under provision folder
2
+
3
+ @secure()
4
+ param provisionParameters object
5
+ param provisionOutputs object
6
+ @secure()
7
+ param currentAppSettings object
8
+
9
+ var botWebAppName = split(provisionOutputs.botOutput.value.botWebAppResourceId, '/')[8]
10
+ var m365ClientId = provisionParameters['m365ClientId']
11
+ var m365ClientSecret = provisionParameters['m365ClientSecret']
12
+ var m365TenantId = provisionParameters['m365TenantId']
13
+ var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
14
+ var botAadAppClientId = provisionParameters['botAadAppClientId']
15
+ var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
16
+
17
+ var botId = provisionParameters['botAadAppClientId']
18
+
19
+ var m365ApplicationIdUri = 'api://${provisionOutputs.frontendHostingOutput.value.domain}/botid-${botId}'
20
+
21
+ resource botWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
22
+ name: '${botWebAppName}/appsettings'
23
+ properties: union({
24
+ INITIATE_LOGIN_ENDPOINT: uri(provisionOutputs.botOutput.value.siteEndpoint, 'auth-start.html')
25
+ M365_AUTHORITY_HOST: m365OauthAuthorityHost
26
+ M365_CLIENT_ID: m365ClientId
27
+ M365_CLIENT_SECRET: m365ClientSecret
28
+ M365_TENANT_ID: m365TenantId
29
+ M365_APPLICATION_ID_URI: m365ApplicationIdUri
30
+ BOT_ID: botAadAppClientId
31
+ BOT_PASSWORD: botAadAppClientSecret
32
+ IDENTITY_ID: provisionOutputs.identityOutput.value.identityClientId
33
+ }, currentAppSettings)
34
+ }
@@ -8,11 +8,21 @@ param currentAppSettings object
8
8
 
9
9
  var botWebAppName = split(provisionOutputs.botOutput.value.botWebAppResourceId, '/')[8]
10
10
  var m365ClientId = provisionParameters['m365ClientId']
11
+ {{#contains 'fx-resource-key-vault' Plugins}}
12
+ var m365ClientSecret = {{../PluginOutput.fx-resource-key-vault.References.m365ClientSecretReference}}
13
+ {{/contains}}
14
+ {{#notContains 'fx-resource-key-vault' Plugins}}
11
15
  var m365ClientSecret = provisionParameters['m365ClientSecret']
16
+ {{/notContains}}
12
17
  var m365TenantId = provisionParameters['m365TenantId']
13
18
  var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
14
19
  var botAadAppClientId = provisionParameters['botAadAppClientId']
20
+ {{#contains 'fx-resource-key-vault' Plugins}}
21
+ var botAadAppClientSecret = {{../PluginOutput.fx-resource-key-vault.References.botClientSecretReference}}
22
+ {{/contains}}
23
+ {{#notContains 'fx-resource-key-vault' Plugins}}
15
24
  var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
25
+ {{/notContains}}
16
26
 
17
27
  var botId = provisionParameters['botAadAppClientId']
18
28
 
@@ -11,7 +11,12 @@ param currentAppSettings object
11
11
  var functionAppName = split({{PluginOutput.fx-resource-function.References.functionAppResourceId}}, '/')[8]
12
12
 
13
13
  var m365ClientId = provisionParameters['m365ClientId']
14
+ {{#contains 'fx-resource-key-vault' Plugins}}
15
+ var m365ClientSecret = {{../PluginOutput.fx-resource-key-vault.References.m365ClientSecretReference}}
16
+ {{/contains}}
17
+ {{#notContains 'fx-resource-key-vault' Plugins}}
14
18
  var m365ClientSecret = provisionParameters['m365ClientSecret']
19
+ {{/notContains}}
15
20
  var m365TenantId = provisionParameters['m365TenantId']
16
21
  var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
17
22
  var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
@@ -0,0 +1,54 @@
1
+ @secure()
2
+ param provisionParameters object
3
+ param userAssignedIdentityObjectId string
4
+
5
+ var resourceBaseName = provisionParameters.resourceBaseName
6
+ var keyVaultName = contains(provisionParameters, 'keyVaultName') ? provisionParameters['keyVaultName'] : '${resourceBaseName}'
7
+ var tenantId = subscription().tenantId
8
+ var m365ClientSecretName = 'm365ClientSecret'
9
+ var m365ClientSecret = provisionParameters['m365ClientSecret']
10
+ var botClientSecretName = 'botClientSecret'
11
+ var botClientSecret = contains(provisionParameters, 'botAadAppClientSecret') ? provisionParameters['botAadAppClientSecret'] : ''
12
+ var keyVaultSkuName = contains(provisionParameters, 'keyVaultSkuName') ? provisionParameters['keyVaultSkuName'] : 'standard'
13
+
14
+ resource keyVault 'Microsoft.KeyVault/vaults@2019-09-01' = {
15
+ name: keyVaultName
16
+ location: resourceGroup().location
17
+ properties: {
18
+ tenantId: tenantId
19
+ accessPolicies: [
20
+ {
21
+ tenantId: tenantId
22
+ objectId: userAssignedIdentityObjectId
23
+ permissions: {
24
+ secrets: [
25
+ 'get'
26
+ ]
27
+ }
28
+ }
29
+ ]
30
+ sku: {
31
+ name: keyVaultSkuName // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add "keyVaultSkuName" property to provisionParameters to override the default value "standard".
32
+ family: 'A'
33
+ }
34
+ }
35
+ }
36
+
37
+ resource clientSecretKv 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = if (length(m365ClientSecret) != 0) {
38
+ parent: keyVault
39
+ name: m365ClientSecretName
40
+ properties: {
41
+ value: m365ClientSecret
42
+ }
43
+ }
44
+
45
+ resource botClientSecretKv 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = if (length(botClientSecret) != 0) {
46
+ parent: keyVault
47
+ name: botClientSecretName
48
+ properties: {
49
+ value: botClientSecret
50
+ }
51
+ }
52
+
53
+ output m365ClientSecretReference string = '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=${m365ClientSecretName})'
54
+ output botClientSecretReference string = '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=${botClientSecretName})'
@@ -0,0 +1,13 @@
1
+ // Resources for Azure Key Vault
2
+ module keyVaultProvision '{{PluginOutput.fx-resource-key-vault.Provision.keyVault.ProvisionPath}}' = {
3
+ name: 'keyVaultProvision'
4
+ params: {
5
+ provisionParameters: provisionParameters
6
+ userAssignedIdentityObjectId: {{PluginOutput.fx-resource-identity.References.identityPrincipalId}}
7
+ }
8
+ }
9
+
10
+ output keyVaultOutput object = {
11
+ m365ClientSecretReference: keyVaultProvision.outputs.m365ClientSecretReference
12
+ botClientSecretReference: keyVaultProvision.outputs.botClientSecretReference
13
+ }
@@ -9,7 +9,12 @@ param currentAppSettings object
9
9
  var webAppName = split(provisionOutputs.simpleAuthOutput.value.webAppResourceId, '/')[8]
10
10
 
11
11
  var m365ClientId = provisionParameters['m365ClientId']
12
+ {{#contains 'fx-resource-key-vault' Plugins}}
13
+ var m365ClientSecret = {{../PluginOutput.fx-resource-key-vault.References.m365ClientSecretReference}}
14
+ {{/contains}}
15
+ {{#notContains 'fx-resource-key-vault' Plugins}}
12
16
  var m365ClientSecret = provisionParameters['m365ClientSecret']
17
+ {{/notContains}}
13
18
  var m365TenantId = provisionParameters['m365TenantId']
14
19
  var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
15
20
  var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
@@ -1,79 +0,0 @@
1
- @secure()
2
- param provisionParameters object
3
- param userAssignedIdentityId string
4
-
5
- var resourceBaseName = provisionParameters.resourceBaseName
6
- var serverfarmsName = contains(provisionParameters, 'functionServerfarmsName') ? provisionParameters['functionServerfarmsName'] : '${resourceBaseName}api'
7
- var serverfarmsSku = contains(provisionParameters, 'functionServerfarmsSku') ? provisionParameters['functionServerfarmsSku'] : 'Y1'
8
- var functionAppName = contains(provisionParameters, 'functionWebappName') ? provisionParameters['functionWebappName'] : '${resourceBaseName}api'
9
- var storageName = contains(provisionParameters, 'functionStorageName') ? provisionParameters['functionStorageName'] : '${resourceBaseName}api'
10
- var storageSku = contains(provisionParameters, 'functionStorageSku') ? provisionParameters['functionStorageSku'] : 'Standard_LRS'
11
-
12
- resource serverfarms 'Microsoft.Web/serverfarms@2021-02-01' = {
13
- name: serverfarmsName
14
- kind: 'functionapp'
15
- location: resourceGroup().location
16
- sku: {
17
- name: serverfarmsSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add functionServerfarmsSku property to provisionParameters to override the default value "Y1".
18
- }
19
- }
20
-
21
- resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
22
- name: functionAppName
23
- kind: 'functionapp'
24
- location: resourceGroup().location
25
- properties: {
26
- serverFarmId: serverfarms.id
27
- keyVaultReferenceIdentity: userAssignedIdentityId
28
- siteConfig: {
29
- appSettings: [
30
- {
31
- name: 'AzureWebJobsDashboard'
32
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
33
- }
34
- {
35
- name: 'AzureWebJobsStorage'
36
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
37
- }
38
- {
39
- name: 'FUNCTIONS_EXTENSION_VERSION'
40
- value: '~3'
41
- }
42
- {
43
- name: 'FUNCTIONS_WORKER_RUNTIME'
44
- value: 'node'
45
- }
46
- {
47
- name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
48
- value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
49
- }
50
- {
51
- name: 'WEBSITE_RUN_FROM_PACKAGE'
52
- value: '1'
53
- }
54
- {
55
- name: 'WEBSITE_NODE_DEFAULT_VERSION'
56
- value: '~14'
57
- }
58
- ]
59
- }
60
- }
61
- identity: {
62
- type: 'UserAssigned'
63
- userAssignedIdentities: {
64
- '${userAssignedIdentityId}': {}
65
- }
66
- }
67
- }
68
-
69
- resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
70
- name: storageName
71
- kind: 'StorageV2'
72
- location: resourceGroup().location
73
- sku: {
74
- name: storageSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add functionStorageSku property to provisionParameters to override the default value "Standard_LRS".
75
- }
76
- }
77
-
78
- output functionEndpoint string = 'https://${functionApp.properties.defaultHostName}'
79
- output functionAppResourceId string = functionApp.id
@@ -1,14 +0,0 @@
1
- @secure()
2
- param provisionParameters object
3
- var resourceBaseName = provisionParameters.resourceBaseName
4
- var identityName = contains(provisionParameters, 'userAssignedIdentityName') ? provisionParameters['userAssignedIdentityName'] : '${resourceBaseName}'
5
-
6
- resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
7
- name: identityName
8
- location: resourceGroup().location
9
- }
10
-
11
- output identityName string = identityName
12
- output identityClientId string = managedIdentity.properties.clientId
13
- output identityResourceId string = managedIdentity.id
14
- output identityPrincipalId string = managedIdentity.properties.principalId