@microsoft/teamsfx-core 1.9.0 → 1.9.1-alpha.2cc91ae90.0

package/templates/bicep/azureSql.parameters.json

@@ -0,0 +1,4 @@
+{
+  "azureSqlAdmin": "{{state.azure-sql.admin}}",
+  "azureSqlAdminPassword": "{{state.azure-sql.adminPassword}}"
+}

package/templates/bicep/azureSql.provisionDatabase.module.bicep

@@ -0,0 +1,15 @@
+// database added with name suffix [{{suffix}}]
+var sqlDatabaseName_{{suffix}} = contains(provisionParameters, 'sqlDatabaseName_{{suffix}}') ? provisionParameters['sqlDatabaseName_{{suffix}}'] : '${resourceBaseName}_{{suffix}}'
+var sqlDatabaseSku_{{suffix}} = contains(provisionParameters, 'sqlDatabaseSku_{{suffix}}') ? provisionParameters['sqlDatabaseSku_{{suffix}}'] : 'Basic'
+
+resource sqlDatabase_{{suffix}} 'Microsoft.Sql/servers/databases@2021-05-01-preview' = {
+  // parent should refer to resource symbolic name of SQL server
+  parent: sqlServer
+  location: resourceGroup().location
+  name: sqlDatabaseName_{{suffix}}
+  sku: {
+    name: sqlDatabaseSku_{{suffix}} 
+  }
+}
+
+output databaseName_{{suffix}} string = sqlDatabaseName_{{suffix}}

package/templates/bicep/azureSql.provisionDatabase.orchestration.bicep

@@ -0,0 +1,5 @@
+// output for database with name suffix [{{suffix}}]
+output azureSqlOutput_{{suffix}} object = {
+  teamsFxPluginId: 'fx-resource-azure-sql'
+  databaseName_{{suffix}}: azureSqlProvision.outputs.databaseName_{{suffix}}
+}

package/templates/bicep/azureSql.provisionServer.module.bicep

@@ -0,0 +1,44 @@
+@secure()
+param provisionParameters object
+var resourceBaseName = provisionParameters.resourceBaseName
+var sqlServerName = contains(provisionParameters, 'sqlServerName') ? provisionParameters['sqlServerName'] : '${resourceBaseName}' // Try to read name for SQL Server from parameters
+var sqlDatabaseName = contains(provisionParameters, 'sqlDatabaseName') ? provisionParameters['sqlDatabaseName'] : '${resourceBaseName}' // Try to read name for SQL Database from parameters
+var sqlDatabaseSku = contains(provisionParameters, 'sqlDatabaseSku') ? provisionParameters['sqlDatabaseSku'] : 'Basic' // Try to read SKU for SQL Database from parameters
+var administratorLogin = contains(provisionParameters, 'azureSqlAdmin') ? provisionParameters['azureSqlAdmin'] : '' // Try to read admin name for SQL Server from parameters, the value must be empty or same with the admin name used to create SQL Server
+var administratorLoginPassword = contains(provisionParameters, 'azureSqlAdminPassword') ? provisionParameters['azureSqlAdminPassword'] : '' // Try to read admin password for SQL Server from parameters, empty means do not update admin password
+
+// SQL Server that hosts the databases
+// The symbolic name of SQL Server will be referenced as parent when adding nmultiple databases
+resource sqlServer 'Microsoft.Sql/servers@2021-05-01-preview' = {
+  location: resourceGroup().location
+  name: sqlServerName
+  properties: {
+    minimalTlsVersion:'1.2'
+    administratorLogin: empty(administratorLogin) ? null : administratorLogin
+    administratorLoginPassword: administratorLoginPassword
+  }
+}
+
+// SQL Database
+resource sqlDatabase 'Microsoft.Sql/servers/databases@2021-05-01-preview' = {
+  parent: sqlServer
+  location: resourceGroup().location
+  name: sqlDatabaseName
+  sku: {
+    name: sqlDatabaseSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add sqlDatabaseSku property to provisionParameters to override the default value "Basic".
+  }
+}
+
+// Allow Azure services connect to the SQL Server
+resource sqlFirewallRules 'Microsoft.Sql/servers/firewallRules@2021-05-01-preview' = {
+  parent: sqlServer
+  name: 'AllowAzure'
+  properties: {
+    endIpAddress: '0.0.0.0'
+    startIpAddress: '0.0.0.0'
+  }
+}
+
+output resourceId string = sqlServer.id
+output sqlEndpoint string = sqlServer.properties.fullyQualifiedDomainName
+output sqlDatabaseName string = sqlDatabaseName

package/templates/bicep/azureSql.provisionServer.orchestration.bicep

@@ -0,0 +1,14 @@
+// Resources for Azure SQL
+module azureSqlProvision './provision/azureSql.bicep' = {
+  name: 'azureSqlProvision'
+  params: {
+    provisionParameters: provisionParameters
+  }
+}
+
+output azureSqlOutput object = {
+  teamsFxPluginId: 'azure-sql'
+  sqlResourceId: azureSqlProvision.outputs.resourceId
+  sqlEndpoint: azureSqlProvision.outputs.sqlEndpoint
+  sqlDatabaseName: azureSqlProvision.outputs.sqlDatabaseName
+}

package/templates/bicep/azureWebApp.config.module.bicep

@@ -0,0 +1,63 @@
+// Auto generated content, please customize files under provision folder
+
+@secure()
+param provisionParameters object
+param provisionOutputs object
+@secure()
+param currentAppSettings object
+
+var webAppName = split({{azure-web-app.outputs.resourceId}} , '/')[8]
+{{#if (contains "aad" connections)}}
+var m365ClientId = provisionParameters['m365ClientId']
+  {{#if (contains "key-vault" connections) }}
+var m365ClientSecret = {{key-vault.outputs.m365ClientSecretReference}} 
+  {{else}}
+var m365ClientSecret = provisionParameters['m365ClientSecret']
+  {{/if}}
+var m365TenantId = provisionParameters['m365TenantId']
+var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
+var botId = provisionParameters['botAadAppClientId']
+  {{#if (contains "teams-tab" connections)}}
+    {{#if (contains "bot-service" connections) }}
+var m365ApplicationIdUri = 'api://${ {{tabDomainVarName}} }/botid-${botId}'
+    {{/if}}
+  {{else}}
+var m365ApplicationIdUri = 'api://botid-${botId}'
+  {{/if}}
+{{/if}}
+{{#if (contains "teams-bot" connections)}}
+var botAadAppClientId = provisionParameters['botAadAppClientId']
+  {{#if (contains "key-vault" connections) }}
+var botAadAppClientSecret = {{key-vault.outputs.botClientSecretReference}}
+  {{else}}
+var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
+  {{/if}}
+{{/if}}
+
+resource webAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
+  name: '${webAppName}/appsettings'
+  properties: union({
+    {{#if (contains "aad" connections)}}
+    INITIATE_LOGIN_ENDPOINT: uri({{azure-web-app.outputs.endpoint}}, 'auth-start.html') // The page is used to let users consent required OAuth permissions during bot SSO process
+    M365_AUTHORITY_HOST: m365OauthAuthorityHost // AAD authority host
+    M365_CLIENT_ID: m365ClientId // Client id of AAD application
+    M365_CLIENT_SECRET: m365ClientSecret // Client secret of AAD application
+    M365_TENANT_ID: m365TenantId // Tenant id of AAD application
+    M365_APPLICATION_ID_URI: m365ApplicationIdUri // Application ID URI of AAD application
+    {{/if}}
+    {{#if (contains "teams-bot" connections)}}
+    BOT_ID: botAadAppClientId // ID of your bot
+    BOT_PASSWORD: botAadAppClientSecret // Secret of your bot
+    {{/if}}
+    {{#if (contains "azure-function" connections) }}
+    API_ENDPOINT: {{azure-function.outputs.functionEndpoint}} // Azure Function endpoint
+    {{/if}}
+    {{#if (contains "azure-sql" connections)}}
+    SQL_DATABASE_NAME: {{azure-sql.outputs.sqlDatabaseName}} // SQL database name
+    SQL_ENDPOINT: {{azure-sql.outputs.sqlEndpoint}} // SQL server endpoint
+    {{/if}}
+    {{#if (contains "identity" connections)}}
+    IDENTITY_ID: {{identity.outputs.identityClientId}} // User assigned identity id, the identity is used to access other Azure resources
+    {{/if}}
+  }, currentAppSettings)
+}

package/templates/bicep/azureWebApp.config.orchestration.bicep

@@ -0,0 +1,12 @@
+// Get existing app settings for merge
+var currentAppSettings = list('${provisionOutputs.azureWebAppOutput.value.resourceId}/config/appsettings', '2021-02-01').properties
+
+// Merge TeamsFx configurations to Bot resources
+module teamsFxAzureWebAppConfig './teamsFx/azureWebAppConfig.bicep' = {
+  name: 'teamsFxAzureWebAppConfig'
+  params: {
+    provisionParameters: provisionParameters
+    provisionOutputs: provisionOutputs
+    currentAppSettings: currentAppSettings
+  }
+}

package/templates/bicep/azureWebApp.parameters.json

@@ -0,0 +1,4 @@
+{
+  "botAadAppClientId": "{{state.bot-service.botId}}",
+  "botAadAppClientSecret": "{{state.bot-service.botPassword}}"
+}

package/templates/bicep/azureWebApp.provision.module.bicep

@@ -0,0 +1,50 @@
+@secure()
+param provisionParameters object
+
+var resourceBaseName = provisionParameters.resourceBaseName
+var serverfarmsName = contains(provisionParameters, 'webAppServerfarmsName') ? provisionParameters['webAppServerfarmsName'] : '${resourceBaseName}webApp' // Try to read name for App Service Plan from parameters
+var webAppSKU = contains(provisionParameters, 'webAppSKU') ? provisionParameters['webAppSKU'] : 'F1' // Try to read SKU for Azure Web App from parameters
+var webAppName = contains(provisionParameters, 'webAppSitesName') ? provisionParameters['webAppSitesName'] : '${resourceBaseName}webApp' // Try to read name for Azure Web App from parameters
+ 
+// Compute resources for your Web App
+resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
+  kind: 'app'
+  location: resourceGroup().location
+  name: serverfarmsName
+  sku: {
+    name: webAppSKU
+  }
+}
+
+// Web App that hosts your bot
+resource webApp 'Microsoft.Web/sites@2021-02-01' = {
+  kind: 'app'
+  location: resourceGroup().location
+  name: webAppName
+  properties: {
+    serverFarmId: serverfarm.id
+    siteConfig: {
+      appSettings: [
+        {
+          name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
+          value: 'true' // Execute build steps on your site during deployment
+        }
+        {
+          name: 'WEBSITE_NODE_DEFAULT_VERSION'
+          value: '~14' // Set NodeJS version to 14.x for your site
+        }
+        {
+          name: 'RUNNING_ON_AZURE'
+          value: '1'
+        }
+      ]
+    }
+  }
+}
+
+output sku string = webAppSKU
+output appName string = webAppName
+output domain string = webApp.properties.defaultHostName
+output appServicePlanName string = serverfarmsName
+output resourceId string = webApp.id
+output endpoint string = 'https://${webApp.properties.defaultHostName}'

package/templates/bicep/azureWebApp.provision.orchestration.bicep

@@ -0,0 +1,18 @@
+// Resources web app
+module azureWebAppProvision './provision/azureWebApp.bicep' = {
+  name: 'azureWebAppProvision'
+  params: {
+    provisionParameters: provisionParameters
+  }
+}
+
+
+output azureWebAppOutput object = {
+  teamsFxPluginId: 'azure-web-app'
+  sku: azureWebAppProvision.outputs.sku
+  appName: azureWebAppProvision.outputs.appName
+  domain: azureWebAppProvision.outputs.domain
+  appServicePlanName: azureWebAppProvision.outputs.appServicePlanName
+  resourceId: azureWebAppProvision.outputs.resourceId
+  endpoint: azureWebAppProvision.outputs.endpoint
+}

package/templates/bicep/botService.config.module.bicep

@@ -0,0 +1,33 @@
+@secure()
+param provisionParameters object
+param provisionOutputs object
+var resourceBaseName = provisionParameters.resourceBaseName
+var botAadAppClientId = provisionParameters['botAadAppClientId'] // Read AAD app client id for Azure Bot Service from parameters
+var botServiceName = contains(provisionParameters, 'botServiceName') ? provisionParameters['botServiceName'] : '${resourceBaseName}' // Try to read name for Azure Bot Service from parameters
+var botServiceSku = contains(provisionParameters, 'botServiceSku') ? provisionParameters['botServiceSku'] : 'F0' // Try to read SKU for Azure Bot Service from parameters
+var botDisplayName = contains(provisionParameters, 'botDisplayName') ? provisionParameters['botDisplayName'] : '${resourceBaseName}' // Try to read display name for Azure Bot Service from parameters
+
+// Register your web service as a bot with the Bot Framework
+resource azureBot 'Microsoft.BotService/botServices@2021-03-01' = {
+  kind: 'azurebot'
+  location: 'global'
+  name: botServiceName
+  properties: {
+    displayName: botDisplayName
+    endpoint: uri({{endpointVarName}} , '/api/messages')
+    msaAppId: botAadAppClientId
+  }
+  sku: {
+    name: botServiceSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add botServiceSku property to provisionParameters to override the default value "F0".
+  }
+}
+
+// Connect the bot service to Microsoft Teams
+resource botServiceMsTeamsChannel 'Microsoft.BotService/botServices/channels@2021-03-01' = {
+  parent: azureBot
+  location: 'global'
+  name: 'MsTeamsChannel'
+  properties: {
+    channelName: 'MsTeamsChannel'
+  }
+}

package/templates/bicep/botService.config.orchestration.bicep

@@ -0,0 +1,8 @@
+// Merge TeamsFx configurations to Bot service
+module teamsFxBotServiceConfig './teamsFx/botService.bicep' = {
+  name: 'teamsFxBotServiceConfig'
+  params: {
+    provisionParameters: provisionParameters
+    provisionOutputs: provisionOutputs
+  }
+}

package/templates/bicep/config.bicep

@@ -0,0 +1,3 @@
+@secure()
+param provisionParameters object
+param provisionOutputs object

package/templates/bicep/main.bicep

@@ -0,0 +1,18 @@
+@secure()
+param provisionParameters object
+
+module provision './provision.bicep' = {
+  name: 'provisionResources'
+  params: {
+    provisionParameters: provisionParameters
+  }
+}
+output provisionOutput object = provision
+module config './config.bicep' = {
+  name: 'config'
+  params: {
+    provisionParameters: provisionParameters
+    provisionOutputs: provision
+  }
+}
+output configOutput object = contains(reference(resourceId('Microsoft.Resources/deployments', config.name), '2020-06-01'), 'outputs') ? config : {}

package/templates/bicep/provision.bicep

@@ -0,0 +1,2 @@
+@secure()
+param provisionParameters object

package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html

@@ -18,13 +18,13 @@
       microsoftTeams.initialize();
       let hashParams = getHashParameters();
 
-      if (hashParams["error"]) {
+      if (hashParams.get("error")) {
         // Authentication failed
-        handleAuthError(hashParams["error"], hashParams);
-      } else if (hashParams["code"]) {
+        handleAuthError(hashParams.get("error"), hashParams);
+      } else if (hashParams.get("code")) {
         // Get the stored state parameter and compare with incoming state
         let expectedState = localStorage.getItem("state");
-        if (expectedState !== hashParams["state"]) {
+        if (expectedState !== hashParams.get("state")) {
           // State does not match, report error
           handleAuthError("StateDoesNotMatch", hashParams);
         } else {
@@ -37,7 +37,7 @@
 
       // Parse hash parameters into key-value pairs
       function getHashParameters() {
-        let hashParams = {};
+        let hashParams = new Map();
         location.hash
           .substr(1)
           .split("&")
@@ -45,7 +45,7 @@
             let s = item.split("="),
               k = s[0],
               v = s[1] && decodeURIComponent(s[1]);
-            hashParams[k] = v;
+            hashParams.set(k, v);
           });
         return hashParams;
       }
@@ -53,8 +53,8 @@
       // Show error information
       function handleAuthError(errorType, errorMessage) {
         const err = JSON.stringify({
-          error: errorType,
-          message: JSON.stringify(errorMessage),
+          error: encodeURIComponent(errorType),
+          message: encodeURIComponent(JSON.stringify(errorMessage)),
         });
         let para = document.createElement("p");
         let node = document.createTextNode(err);

package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html

@@ -18,13 +18,13 @@
       microsoftTeams.initialize();
       let hashParams = getHashParameters();
 
-      if (hashParams["error"]) {
+      if (hashParams.get("error")) {
         // Authentication failed
-        handleAuthError(hashParams["error"], hashParams);
-      } else if (hashParams["code"]) {
+        handleAuthError(hashParams.get("error"), hashParams);
+      } else if (hashParams.get("code")) {
         // Get the stored state parameter and compare with incoming state
         let expectedState = localStorage.getItem("state");
-        if (expectedState !== hashParams["state"]) {
+        if (expectedState !== hashParams.get("state")) {
           // State does not match, report error
           handleAuthError("StateDoesNotMatch", hashParams);
         } else {
@@ -37,7 +37,7 @@
 
       // Parse hash parameters into key-value pairs
       function getHashParameters() {
-        let hashParams = {};
+        let hashParams = new Map();
         location.hash
           .substr(1)
           .split("&")
@@ -45,7 +45,7 @@
             let s = item.split("="),
               k = s[0],
               v = s[1] && decodeURIComponent(s[1]);
-            hashParams[k] = v;
+            hashParams.set(k, v);
           });
         return hashParams;
       }
@@ -53,8 +53,8 @@
       // Show error information
       function handleAuthError(errorType, errorMessage) {
         const err = JSON.stringify({
-          error: errorType,
-          message: JSON.stringify(errorMessage),
+          error: encodeURIComponent(errorType),
+          message: encodeURIComponent(JSON.stringify(errorMessage)),
         });
         let para = document.createElement("p");
         let node = document.createTextNode(err);

package/templates/plugins/resource/hosting/bicep/botFunction/botFunctionConfiguration.template.bicep

@@ -0,0 +1,71 @@
+// Auto generated content, please customize files under provision folder
+
+@secure()
+param provisionParameters object
+param provisionOutputs object
+@secure()
+param currentAppSettings object
+
+var functionName = split(provisionOutputs.botFunctionOutput.value.botWebAppResourceId, '/')[8]
+
+{{#if (contains "fx-resource-aad-app-for-teams" plugins)}}
+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']
+  {{#if (contains "fx-resource-frontend-hosting" plugins)}}
+    {{#if (contains "fx-resource-bot" plugins) }}
+var m365ApplicationIdUri = 'api://${ \{{fx-resource-frontend-hosting.References.domain}} }/botid-${botAadAppClientId}'
+    {{/if}}
+  {{else}}
+var m365ApplicationIdUri = 'api://botid-${botAadAppClientId}'
+  {{/if}}
+{{/if}}
+
+{{#if (contains "fx-resource-bot" plugins) }}
+var botAadAppClientId = provisionParameters['botAadAppClientId']
+  {{#if (contains "fx-resource-key-vault" plugins) }}
+var botAadAppClientSecret = \{{fx-resource-key-vault.References.botClientSecretReference}}
+  {{else}}
+var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
+  {{/if}}
+{{/if}}
+
+resource botFunctionSettings 'Microsoft.Web/sites/config@2021-02-01' = {
+  name: '${functionName}/appsettings'
+  properties: union({
+{{#if (contains "fx-resource-aad-app-for-teams" plugins)}}
+  {{#if (contains "dotnet" configs)}}
+    TeamsFx__Authentication__ClientId: m365ClientId
+    TeamsFx__Authentication__ClientSecret: m365ClientSecret
+    TeamsFx__Authentication__OAuthAuthority: m365OauthAuthorityHost
+  {{/if}}
+  {{#if (contains "node" configs)}}
+    INITIATE_LOGIN_ENDPOINT: uri(provisionOutputs.botFunctionOutput.value.siteEndpoint, 'auth-start.html') // The page is used to let users consent required OAuth permissions during bot SSO process
+    M365_AUTHORITY_HOST: m365OauthAuthorityHost // AAD authority host
+    M365_CLIENT_ID: m365ClientId // Client id of AAD application
+    M365_CLIENT_SECRET: m365ClientSecret // Client secret of AAD application
+    M365_TENANT_ID: m365TenantId // Tenant id of AAD application
+    M365_APPLICATION_ID_URI: m365ApplicationIdUri // Application ID URI of AAD application
+  {{/if}}
+{{/if}}
+{{#if (contains "fx-resource-bot" plugins) }}
+    BOT_ID: botAadAppClientId // ID of your bot
+    BOT_PASSWORD: botAadAppClientSecret // Secret of your bot
+{{/if}}
+{{#if (contains "fx-resource-function" plugins) }}
+    API_ENDPOINT: provisionOutputs.functionOutput.value.functionEndpoint // Azure Function endpoint
+{{/if}}
+{{#if (contains "fx-resource-azure-sql" plugins)}}
+    SQL_DATABASE_NAME: \{{fx-resource-azure-sql.References.databaseName}} // SQL database name
+    SQL_ENDPOINT: \{{fx-resource-azure-sql.References.sqlEndpoint}} // SQL server endpoint
+{{/if}}
+{{#if (contains "fx-resource-identity" plugins)}}
+    IDENTITY_ID: \{{fx-resource-identity.References.identityClientId}} // User assigned identity id, the identity is used to access other Azure resources
+{{/if}}
+  }, currentAppSettings)
+}