@microsoft/teamsfx-core 1.0.0 → 1.0.1-alpha.389dbb3f.0

package/templates/azure/provision.bicep

@@ -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' = {
@@ -41,32 +41,4 @@ output azureSqlOutput object = {
   sqlResourceId: azureSqlProvision.outputs.resourceId
   sqlEndpoint: azureSqlProvision.outputs.sqlEndpoint
   databaseName: azureSqlProvision.outputs.databaseName
-}
-// Resources for Azure Functions
-module functionProvision './provision/function.bicep' = {
-  name: 'functionProvision'
-  params: {
-    provisionParameters: provisionParameters
-    userAssignedIdentityId: userAssignedIdentityProvision.outputs.identityResourceId
-  }
-}
-
-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

@@ -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/plugins/resource/bot/bicep/botConfiguration.template.bicep

@@ -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

@@ -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

@@ -0,0 +1,54 @@
+@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'] : ''
+var keyVaultSkuName = contains(provisionParameters, 'keyVaultSkuName') ? provisionParameters['keyVaultSkuName'] : 'standard'
+
+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: keyVaultSkuName // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add "keyVaultSkuName" property to provisionParameters to override the default value "standard".
+      family: 'A'
+    }
+  }
+}
+
+resource clientSecretKv 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = if (length(m365ClientSecret) != 0) {
+  parent: keyVault
+  name: m365ClientSecretName
+  properties: {
+    value: m365ClientSecret
+  }
+}
+
+resource botClientSecretKv '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

@@ -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

@@ -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/function.bicep

@@ -1,79 +0,0 @@
-@secure()
-param provisionParameters object
-param userAssignedIdentityId string
-
-var resourceBaseName = provisionParameters.resourceBaseName
-var serverfarmsName = contains(provisionParameters, 'functionServerfarmsName') ? provisionParameters['functionServerfarmsName'] : '${resourceBaseName}api'
-var serverfarmsSku = contains(provisionParameters, 'functionServerfarmsSku') ? provisionParameters['functionServerfarmsSku'] : 'Y1'
-var functionAppName = contains(provisionParameters, 'functionWebappName') ? provisionParameters['functionWebappName'] : '${resourceBaseName}api'
-var storageName = contains(provisionParameters, 'functionStorageName') ? provisionParameters['functionStorageName'] : '${resourceBaseName}api'
-var storageSku = contains(provisionParameters, 'functionStorageSku') ? provisionParameters['functionStorageSku'] : 'Standard_LRS'
-
-resource serverfarms 'Microsoft.Web/serverfarms@2021-02-01' = {
-  name: serverfarmsName
-  kind: 'functionapp'
-  location: resourceGroup().location
-  sku: {
-    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".
-  }
-}
-
-resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
-  name: functionAppName
-  kind: 'functionapp'
-  location: resourceGroup().location
-  properties: {
-    serverFarmId: serverfarms.id
-    keyVaultReferenceIdentity: userAssignedIdentityId
-    siteConfig: {
-      appSettings: [
-        {
-          name: 'AzureWebJobsDashboard'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
-        }
-        {
-          name: 'AzureWebJobsStorage'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
-        }
-        {
-          name: 'FUNCTIONS_EXTENSION_VERSION'
-          value: '~3'
-        }
-        {
-          name: 'FUNCTIONS_WORKER_RUNTIME'
-          value: 'node'
-        }
-        {
-          name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
-        }
-        {
-          name: 'WEBSITE_RUN_FROM_PACKAGE'
-          value: '1'
-        }
-        {
-          name: 'WEBSITE_NODE_DEFAULT_VERSION'
-          value: '~14'
-        }
-      ]
-    }
-  }
-  identity: {
-    type: 'UserAssigned'
-    userAssignedIdentities: {
-      '${userAssignedIdentityId}': {}
-    }
-  }
-}
-
-resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
-  name: storageName
-  kind: 'StorageV2'
-  location: resourceGroup().location
-  sku: {
-    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".
-  }
-}
-
-output functionEndpoint string = 'https://${functionApp.properties.defaultHostName}'
-output functionAppResourceId string = functionApp.id

package/templates/azure/provision/identity.bicep

@@ -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