@microsoft/teamsfx-core 1.6.1 → 1.6.2-alpha.6399c5efb.0

package/templates/plugins/resource/aad/manifest/aad.template.json

@@ -18,7 +18,7 @@
     },
     "requiredResourceAccess": [
         {
-            "resourceAppId": "00000003-0000-0000-c000-000000000000",
+            "resourceAppId": "Microsoft Graph",
             "resourceAccess": [
                 {
                     "id": "User.Read",
@@ -33,8 +33,6 @@
             "adminConsentDisplayName": "Teams can access app's web APIs",
             "id": "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}",
             "isEnabled": true,
-            "lang": null,
-            "origin": "Application",
             "type": "User",
             "userConsentDescription": "Enable Teams to call this app's web APIs with the same rights that you have",
             "userConsentDisplayName": "Teams can access app's web APIs and make requests on your behalf",
@@ -43,13 +41,13 @@
     ],
     "preAuthorizedApplications": [
         {
-            "appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3",
+            "appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264",
             "permissionIds": [
                 "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
             ]
         },
         {
-            "appId": "00000002-0000-0ff1-ce00-000000000000",
+            "appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346",
             "permissionIds": [
                 "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
             ]
@@ -61,13 +59,13 @@
             ]
         },
         {
-            "appId": "4765445b-32c6-49b0-83e6-1d93765276ca",
+            "appId": "00000002-0000-0ff1-ce00-000000000000",
             "permissionIds": [
                 "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
             ]
         },
         {
-            "appId": "4345a7b9-9a63-4910-a426-35363201d503",
+            "appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3",
             "permissionIds": [
                 "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
             ]
@@ -79,23 +77,18 @@
             ]
         },
         {
-            "appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346",
+            "appId": "4765445b-32c6-49b0-83e6-1d93765276ca",
             "permissionIds": [
                 "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
             ]
         },
         {
-            "appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264",
+            "appId": "4345a7b9-9a63-4910-a426-35363201d503",
             "permissionIds": [
                 "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
             ]
         }
     ],
-    "passwordCredentials": [
-        {
-            "displayName": "default"
-        }
-    ],
     "identifierUris": [
         "{{state.fx-resource-aad-app-for-teams.applicationIdUris}}"
     ],

package/templates/plugins/resource/apiconnector/sample/js/api-connector.template

@@ -0,0 +1,30 @@
+const teamsfxSdk = require("@microsoft/teamsfx");
+
+// Loads current app's configuration
+const teamsFx = new teamsfxSdk.TeamsFx();
+// Initializes a new axios instance to call {{config.APIName}} API
+const authProvider = new teamsfxSdk.BasicAuthProvider(
+  teamsFx.getConfig("API_{{capitalName}}_USERNAME"),
+  teamsFx.getConfig("API_{{capitalName}}_PASSWORD")
+);
+const {{config.APIName}}Client = teamsfxSdk.createApiClient(teamsFx.getConfig("API_{{capitalName}}_ENDPOINT"), authProvider);
+export { {{config.APIName}}Client };
+
+/* 
+You can now call {{config.APIName}} APIs without worrying about authentication. 
+Here is an example for a GET request to "relative_path_of_target_api": 
+const result = await {{config.APIName}}Client.get("relative_path_of_target_api"); 
+
+You can refer https://aka.ms/teamsfx-connect-api to learn more. 
+*/
+
+/* 
+Setting API configuration for cloud environment: 
+We have already set the configuration to .env.teamsfx.local based on your answers. 
+Before you deploy your code to cloud using TeamsFx, please follow https://aka.ms/teamsfx-add-appsettings to add following app settings with appropriate value to your Azure environment: 
+API_{{capitalName}}_ENDPOINT 
+API_{{capitalName}}_USERNAME 
+API_{{capitalName}}_PASSWORD 
+
+You can refer https://aka.ms/teamsfx-connet-api to learn more. 
+*/

package/templates/plugins/resource/apiconnector/sample/ts/api-connector.template

@@ -0,0 +1,30 @@
+import { TeamsFx, createApiClient, BasicAuthProvider } from "@microsoft/teamsfx";
+
+// Loads current app's configuration
+const teamsFx = new TeamsFx();
+// Initializes a new axios instance to call {{config.APIName}} API
+const authProvider = new BasicAuthProvider(
+  teamsFx.getConfig("API_{{capitalName}}_USERNAME"),
+  teamsFx.getConfig("API_{{capitalName}}_PASSWORD")
+);
+const {{config.APIName}}Client = createApiClient(teamsFx.getConfig("API_{{capitalName}}_ENDPOINT"), authProvider);
+export { {{config.APIName}}Client };
+
+/* 
+You can now call {{config.APIName}} APIs without worrying about authentication. 
+Here is an example for a GET request to "relative_path_of_target_api": 
+const result = await {{config.APIName}}Client.get("relative_path_of_target_api"); 
+
+You can refer https://aka.ms/teamsfx-connect-api to learn more. 
+*/
+
+/* 
+Setting API configuration for cloud environment: 
+We have already set the configuration to .env.teamsfx.local based on your answers. 
+Before you deploy your code to cloud using TeamsFx, please follow https://aka.ms/teamsfx-add-appsettings to add following app settings with appropriate value to your Azure environment: 
+API_{{capitalName}}_ENDPOINT 
+API_{{capitalName}}_USERNAME 
+API_{{capitalName}}_PASSWORD 
+
+You can refer https://aka.ms/teamsfx-connet-api to learn more. 
+*/

package/templates/plugins/resource/bot/bicep/botProvision.template.bicep

@@ -54,6 +54,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   properties: {
     serverFarmId: serverfarm.id
     keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    httpsOnly: true
     siteConfig: {
       appSettings: [
         {
@@ -64,7 +65,12 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
           name: 'WEBSITE_NODE_DEFAULT_VERSION'
           value: '~14' // Set NodeJS version to 14.x for your site
         }
+        {
+          name: 'RUNNING_ON_AZURE'
+          value: '1'
+        }
       ]
+      ftpsState: 'FtpsOnly'
     }
   }
   identity: {

package/templates/plugins/resource/bot/bicep/funcHostedBotProvision.template.bicep

@@ -0,0 +1,127 @@
+@secure()
+param provisionParameters object
+param userAssignedIdentityId string
+
+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
+var serverfarmsName = contains(provisionParameters, 'botServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}bot' // Try to read name for App Service Plan from parameters
+var webAppSKU = contains(provisionParameters, 'botWebAppSKU') ? provisionParameters['botWebAppSKU'] : 'B1' // Try to read SKU for Azure Web App from parameters
+var webAppName = contains(provisionParameters, 'botSitesName') ? provisionParameters['botSitesName'] : '${resourceBaseName}bot' // Try to read name for Azure Web App from parameters
+var storageName = contains(provisionParameters, 'botStorageName') ? provisionParameters['botStorageName'] : '${resourceBaseName}bot' // Try to read name for Azure Storage from parameters
+var storageSku = contains(provisionParameters, 'botStorageSku') ? provisionParameters['botStorageSku'] : 'Standard_LRS' // Try to read SKU for Azure Storage from parameters
+
+// Register your web service as a bot with the Bot Framework
+resource botService 'Microsoft.BotService/botServices@2021-03-01' = {
+  kind: 'azurebot'
+  location: 'global'
+  name: botServiceName
+  properties: {
+    displayName: botDisplayName
+    endpoint: uri('https://${functionApp.properties.defaultHostName}', '/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: botService
+  location: 'global'
+  name: 'MsTeamsChannel'
+  properties: {
+    channelName: 'MsTeamsChannel'
+  }
+}
+
+// Compute resources for your Web App
+resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
+  kind: 'functionapp'
+  location: resourceGroup().location
+  name: serverfarmsName
+  sku: {
+    name: webAppSKU
+  }
+}
+
+// Web App that hosts your bot
+resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
+  kind: 'functionapp'
+  location: resourceGroup().location
+  name: webAppName
+  properties: {
+    serverFarmId: serverfarm.id
+    keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    httpsOnly: true
+    siteConfig: {
+      alwaysOn: true
+      appSettings: [
+        {
+          name: 'AzureWebJobsDashboard'
+          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
+        }
+        {
+          name: 'AzureWebJobsStorage'
+          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
+        }
+        {
+          name: 'FUNCTIONS_EXTENSION_VERSION'
+          value: '~3' // Use Azure Functions runtime v3
+        }
+        {
+          name: 'FUNCTIONS_WORKER_RUNTIME'
+          value: 'node' // Set runtime to NodeJS
+        }
+        {
+          name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
+          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
+        }
+        {
+          name: 'WEBSITE_RUN_FROM_PACKAGE'
+          value: '1' // Run Azure Functions from a package file
+        }
+        {
+          name: 'WEBSITE_NODE_DEFAULT_VERSION'
+          value: '~14' // Set NodeJS version to 14.x
+        }
+        {
+          name: 'RUNNING_ON_AZURE'
+          value: '1'
+        }
+        {
+          name: 'SCM_ZIPDEPLOY_DONOT_PRESERVE_FILETIME'
+          value: '1' // Zipdeploy files will always be updated. Detail: https://aka.ms/teamsfx-zipdeploy-donot-preserve-filetime
+        }
+      ]
+      ftpsState: 'FtpsOnly'
+    }
+  }
+  identity: {
+    type: 'UserAssigned'
+    userAssignedIdentities: {
+      '${userAssignedIdentityId}': {} // The identity is used to access other Azure resources
+    }
+  }
+}
+
+// Azure Storage is required when creating Azure Functions instance
+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 botWebAppSKU string = webAppSKU
+output botWebAppName string = webAppName
+output botDomain string = functionApp.properties.defaultHostName
+output appServicePlanName string = serverfarmsName
+output botServiceName string = botServiceName
+output botWebAppResourceId string = functionApp.id
+output botWebAppEndpoint string = 'https://${functionApp.properties.defaultHostName}'

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

@@ -27,6 +27,7 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
   properties: {
     serverFarmId: serverfarms.id
     keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    httpsOnly: true
     siteConfig: {
       appSettings: [
         {
@@ -58,6 +59,7 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
           value: '~14' // Set NodeJS version to 14.x
         }
       ]
+      ftpsState: 'FtpsOnly'
     }
   }
   identity: {

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

@@ -25,6 +25,10 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   properties: {
     serverFarmId: serverFarms.id
     keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    httpsOnly: true
+    siteConfig:{
+      ftpsState: 'FtpsOnly'
+    }
   }
   identity: {
     type: 'UserAssigned'

package/templates/plugins/resource/spfx/solution/README.md

@@ -6,7 +6,7 @@ The SharePoint Framework (SPFx) is a page and web part model that provides full
 
 ## Used SharePoint Framework Version
 
-![version](https://img.shields.io/badge/version-1.12.1-green.svg)
+![version](https://img.shields.io/badge/version-1.14.0-green.svg)
 
 ## Applies to
 
@@ -15,7 +15,7 @@ The SharePoint Framework (SPFx) is a page and web part model that provides full
 
 ## Prerequisites
 
-> - Node.js v10/12/14
+> - Node.js v12/14
 > - An M365 account. Get your own free Microsoft 365 tenant from [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program)
 
 ## Solution

package/templates/plugins/resource/sql/bicep/sqlProvision.template.bicep

@@ -13,6 +13,7 @@ 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
   }

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

@@ -23,6 +23,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   properties: {
     serverFarmId: serverFarms.id
     keyVaultReferenceIdentity: userAssignedIdentityId
+    httpsOnly: true
     siteConfig: {
       appSettings: [
         {
@@ -30,6 +31,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
           value: '1'
         }
       ]
+      ftpsState: 'FtpsOnly'
     }
   }
   identity: {