@microsoft/teamsfx-core 1.8.0 → 1.8.1-alpha.324752dff.0

package/templates/plugins/resource/hosting/bicep/botservice/provision.template.bicep

@@ -0,0 +1,8 @@
+// Resources for bot
+module botProvision '\{{fx-resource-bot.Provision.botservice.path}}' = {
+  name: 'botProvision'
+  params: {
+    provisionParameters: provisionParameters
+    botEndpoint: \{{fx-resource-bot.References.endpointAsParam}}
+  }
+}

package/templates/plugins/resource/hosting/bicep/function/config.template.bicep

@@ -0,0 +1,12 @@
+// Get existing app settings for merge
+var functionCurrentAppSettings = list('${provisionOutputs.functionOutput.value.resourceId}/config/appsettings', '2021-02-01').properties
+
+// Merge TeamsFx configurations to Function resources
+module teamsFxFunctionConfig '\{{PluginIdPlaceholder.Configuration.function.path}}' = {
+  name: 'addTeamsFxFunctionConfiguration'
+  params: {
+    provisionParameters: provisionParameters
+    provisionOutputs: provisionOutputs
+    currentAppSettings: functionCurrentAppSettings
+  }
+}

package/templates/plugins/resource/hosting/bicep/function/functionConfiguration.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.functionOutput.value.resourceId, '/')[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.functionOutput.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)
+}

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

@@ -0,0 +1,99 @@
+@secure()
+param provisionParameters object
+param userAssignedIdentityId string
+
+var resourceBaseName = provisionParameters.resourceBaseName
+var serverfarmsName = contains(provisionParameters, 'botServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}bot' // Try to read name for App Service Plan from parameters
+var functionSKU = contains(provisionParameters, 'botFunctionAppSKU') ? provisionParameters['botFunctionAppSKU'] : 'B1' // Try to read SKU for Azure Web App from parameters
+var functionAppName = 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
+
+// Compute resources for your Function App
+resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
+  kind: 'functionapp'
+  location: resourceGroup().location
+  name: serverfarmsName
+  sku: {
+    name: functionSKU
+  }
+}
+
+// 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".
+  }
+}
+
+// Function App that hosts your bot
+resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
+  kind: 'functionapp'
+  location: resourceGroup().location
+  name: functionAppName
+  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
+        }
+        {{#if (contains "running-on-azure" configs)}}
+        {
+          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
+        }
+        {{/if}}
+      ]
+      ftpsState: 'FtpsOnly'
+    }
+  }
+  identity: {
+    type: 'UserAssigned'
+    userAssignedIdentities: {
+      '${userAssignedIdentityId}': {} // The identity is used to access other Azure resources
+    }
+  }
+}
+
+output functionSKU string = functionSKU
+output functionName string = functionAppName
+output domain string = functionApp.properties.defaultHostName
+output appServicePlanName string = serverfarmsName
+output functionResourceId string = functionApp.id
+output functionEndpoint string = 'https://${functionApp.properties.defaultHostName}'

package/templates/plugins/resource/hosting/bicep/function/provision.template.bicep

@@ -0,0 +1,20 @@
+// Resources for bot
+module functionProvision '\{{PluginIdPlaceholder.Provision.function.path}}' = {
+  name: 'function.Provision'
+  params: {
+    provisionParameters: provisionParameters
+    {{#if (contains "fx-resource-identity" plugins)}}
+    userAssignedIdentityId: \{{fx-resource-identity.References.identityResourceId}}
+    {{/if}}
+  }
+}
+
+output functionOutput object = {
+  teamsFxPluginId: 'PluginIdPlaceholder'
+  skuName: functionProvision.outputs.functionSKU
+  siteName: functionProvision.outputs.functionName
+  validDomain: functionProvision.outputs.domain
+  appServicePlanName: functionProvision.outputs.appServicePlanName
+  resourceId: functionProvision.outputs.functionResourceId
+  siteEndpoint: functionProvision.outputs.functionEndpoint
+}

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

@@ -6,7 +6,7 @@ var resourceBaseName = provisionParameters.resourceBaseName
 var keyVaultName = contains(provisionParameters, 'keyVaultName') ? provisionParameters['keyVaultName'] : '${resourceBaseName}' // Try to read name for Key Vault from parameters
 var tenantId = subscription().tenantId
 var m365ClientSecretName = 'm365ClientSecret' // Secret name of AAD app client secret
-var m365ClientSecret = provisionParameters['m365ClientSecret'] // Read AAD app client secret from parameters
+var m365ClientSecret = contains(provisionParameters, 'm365ClientSecret') ? provisionParameters['m365ClientSecret'] : '' // Try to read AAD app client secret from parameters
 var botClientSecretName = 'botClientSecret' // Secret name of bot's AAD app client secret
 var botClientSecret = contains(provisionParameters, 'botAadAppClientSecret') ? provisionParameters['botAadAppClientSecret'] : '' // Try to read bot's AAD app client secret from parameters
 var keyVaultSkuName = contains(provisionParameters, 'keyVaultSkuName') ? provisionParameters['keyVaultSkuName'] : 'standard' // Try to read SKU for Key Vault from parameters

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

@@ -1,4 +1,4 @@
-# SPFx(SharePoint Framework) APP
+# SPFx (SharePoint Framework) App
 
 ## Summary
 
@@ -39,7 +39,7 @@ Version|Date|Comments
 
 ## Minimal Path to Awesome
 
-1. <b>Install the latest version of [Node.js LTS 14.x]</b>(https://nodejs.org/en/download/releases/)(Note: SPFx v1.14.0 support Node.js v12/14)
+1. Install the latest version of [Node.js LTS 14.x](https://nodejs.org/en/download/releases/) (Note: SPFx v1.14.0 support Node.js v12/14).
 2. You can either download [Visual Studio Code](https://code.visualstudio.com) and install [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) or download TeamsFx CLI.
 3. Open the project with VSCode, click `Provision in the cloud` in DEPLOYMENT panel of Teams Toolkit extension.
 
@@ -49,7 +49,7 @@ Version|Date|Comments
     It will provision an app in Teams App Studio. You may need to login with your M365 tenant admin account.
 
 4. Build and Deploy your SharePoint Package.
-    - Click `Deploy to the cloud` in DEPLOYMENT panel of Teams Toolkit extension, or run `Teams: Deploy to the cloud` from command palette. This will generate a SharePoint package(*.sppkg) under sharepoint/solution folder.
+    - Click `Deploy to the cloud` in DEPLOYMENT panel of Teams Toolkit extension, or run `Teams: Deploy to the cloud` from command palette. This will generate a SharePoint package (*.sppkg) under sharepoint/solution folder.
   
     Or you can use TeamsFx CLI with running this cmd under your project path:
         `teamsfx deploy`

package/build/plugins/resource/function/utils/node-version.d.ts

@@ -1,2 +0,0 @@
-export declare function getNodeVersion(workingDir?: string): Promise<string | undefined>;
-//# sourceMappingURL=node-version.d.ts.map

package/build/plugins/resource/function/utils/node-version.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"node-version.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/function/utils/node-version.ts"],"names":[],"mappings":"AAOA,wBAAsB,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CASrF"}

package/build/plugins/resource/function/utils/node-version.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeVersion = void 0;
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-const semver_1 = require("semver");
-const execute_1 = require("./execute");
-const logger_1 = require("./logger");
-async function getNodeVersion(workingDir) {
-    try {
-        const output = await execute_1.execute("node -v", workingDir);
-        const ver = new semver_1.SemVer(output);
-        return ver.major.toString();
-    }
-    catch (e) {
-        logger_1.Logger.error(`Failed to query node version: ${e}`);
-        return undefined;
-    }
-}
-exports.getNodeVersion = getNodeVersion;
-//# sourceMappingURL=node-version.js.map

package/build/plugins/resource/function/utils/node-version.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"node-version.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/function/utils/node-version.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mCAAgC;AAEhC,uCAAoC;AACpC,qCAAkC;AAE3B,KAAK,UAAU,cAAc,CAAC,UAAmB;IACtD,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACpD,MAAM,GAAG,GAAG,IAAI,eAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,OAAO,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,EAAE,CAAC,CAAC;QACnD,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AATD,wCASC"}