@microsoft/teamsfx-core 2.0.2-alpha.8828ab140.0 → 2.0.2-alpha.a32ea10b4.0

package/build/core/generateAadManifestTemplate.js

@@ -1,136 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateAadManifestTemplate = void 0;
-const tslib_1 = require("tslib");
-const folder_1 = require("../folder");
-const fs = tslib_1.__importStar(require("fs-extra"));
-const os = tslib_1.__importStar(require("os"));
-const tools_1 = require("../common/tools");
-const constants_1 = require("../component/constants");
-const workflow_1 = require("../component/workflow");
-const projectSettingsHelper_1 = require("../common/local/projectSettingsHelper");
-const projectSettingsHelper_2 = require("../common/projectSettingsHelper");
-const constants_2 = require("../component/resource/aadApp/constants");
-async function generateAadManifestTemplate(projectFolder, projectSettings, requiredResourceAccess = undefined, updateCapabilities = false) {
-    const templatesFolder = folder_1.getTemplatesFolder();
-    const appDir = await tools_1.getAppDirectory(projectFolder);
-    const aadManifestTemplate = `${templatesFolder}/${constants_2.Constants.aadManifestTemplateFolder}/${constants_2.Constants.aadManifestTemplateName}`;
-    await fs.ensureDir(appDir);
-    const isVs = projectSettingsHelper_2.isVSProject(projectSettings);
-    const aadManifestPath = `${appDir}/${constants_2.Constants.aadManifestTemplateName}`;
-    let aadJson;
-    if (await fs.pathExists(aadManifestPath)) {
-        aadJson = await fs.readJSON(aadManifestPath);
-    }
-    else {
-        aadJson = await fs.readJSON(aadManifestTemplate);
-    }
-    if (!aadJson.replyUrlsWithType) {
-        aadJson.replyUrlsWithType = [];
-    }
-    if (requiredResourceAccess) {
-        aadJson.requiredResourceAccess = requiredResourceAccess;
-    }
-    const hasTab = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
-    if (hasTab) {
-        const tabRedirectUrl1 = "{{state.fx-resource-aad-app-for-teams.frontendEndpoint}}/auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl1, "Web")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl1,
-                type: "Web",
-            });
-        }
-        const tabRedirectUrl2 = "{{state.fx-resource-aad-app-for-teams.frontendEndpoint}}/auth-end.html?clientId={{state.fx-resource-aad-app-for-teams.clientId}}";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl2, "Spa")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl2,
-                type: "Spa",
-            });
-        }
-        const tabRedirectUrl3 = "{{state.fx-resource-aad-app-for-teams.frontendEndpoint}}/blank-auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl3, "Spa")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl3,
-                type: "Spa",
-            });
-        }
-    }
-    const hasBot = projectSettingsHelper_1.ProjectSettingsHelper.includeBot(projectSettings);
-    if (hasBot) {
-        const botRedirectUrl = isVs
-            ? "{{state.fx-resource-aad-app-for-teams.botEndpoint}}/bot-auth-end.html"
-            : "{{state.fx-resource-aad-app-for-teams.botEndpoint}}/auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, botRedirectUrl, "Web")) {
-            aadJson.replyUrlsWithType.push({
-                url: botRedirectUrl,
-                type: "Web",
-            });
-        }
-    }
-    // }
-    if (updateCapabilities) {
-        if (projectSettings.solutionSettings.capabilities.includes("Tab") &&
-            !projectSettings.solutionSettings.capabilities.includes("TabSSO")) {
-            projectSettings.solutionSettings.capabilities.push("TabSSO");
-        }
-        if (projectSettings.solutionSettings.capabilities.includes("Bot") &&
-            !projectSettings.solutionSettings.capabilities.includes("BotSSO")) {
-            projectSettings.solutionSettings.capabilities.push("BotSSO");
-        }
-        const tabConfig = workflow_1.getComponent(projectSettings, constants_1.ComponentNames.TeamsTab);
-        if (tabConfig) {
-            tabConfig.sso = true;
-        }
-        const botConfig = workflow_1.getComponent(projectSettings, constants_1.ComponentNames.TeamsTab);
-        if (botConfig) {
-            botConfig.sso = true;
-        }
-    }
-    await fs.writeJSON(`${appDir}/${constants_2.Constants.aadManifestTemplateName}`, aadJson, {
-        spaces: 4,
-        EOL: os.EOL,
-    });
-}
-exports.generateAadManifestTemplate = generateAadManifestTemplate;
-function isRedirectUrlExist(replyUrls, url, type) {
-    return (replyUrls.filter((item) => item.url === url && item.type === type).length > 0);
-}
-function updateRedirectUrlV3(aadJson, projectSetting) {
-    const teamsTabComponent = workflow_1.getComponent(projectSetting, constants_1.ComponentNames.TeamsTab);
-    if (teamsTabComponent) {
-        const tabRedirectUrl1 = "{{state.aad-app.frontendEndpoint}}/auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl1, "Web")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl1,
-                type: "Web",
-            });
-        }
-        const tabRedirectUrl2 = "{{state.aad-app.frontendEndpoint}}/auth-end.html?clientId={{state.aad-app.clientId}}";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl2, "Spa")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl2,
-                type: "Spa",
-            });
-        }
-        const tabRedirectUrl3 = "{{state.aad-app.frontendEndpoint}}/blank-auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl3, "Spa")) {
-            aadJson.replyUrlsWithType.push({
-                url: tabRedirectUrl3,
-                type: "Spa",
-            });
-        }
-    }
-    const teamsBotComponent = workflow_1.getComponent(projectSetting, constants_1.ComponentNames.TeamsBot);
-    if (teamsBotComponent) {
-        const botRedirectUrl = "{{state.aad-app.botEndpoint}}/auth-end.html";
-        if (!isRedirectUrlExist(aadJson.replyUrlsWithType, botRedirectUrl, "Web")) {
-            aadJson.replyUrlsWithType.push({
-                url: botRedirectUrl,
-                type: "Web",
-            });
-        }
-    }
-}
-//# sourceMappingURL=generateAadManifestTemplate.js.map

package/build/core/generateAadManifestTemplate.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateAadManifestTemplate.js","sourceRoot":"","sources":["../../src/core/generateAadManifestTemplate.ts"],"names":[],"mappings":"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"}

package/templates/bicep/aadApp.parameters.json

@@ -1,6 +0,0 @@
-{
-  "m365ClientId": "{{state.aad-app.clientId}}",
-  "m365ClientSecret": "{{state.aad-app.clientSecret}}",
-  "m365TenantId": "{{state.aad-app.tenantId}}",
-  "m365OauthAuthorityHost": "{{state.aad-app.oauthHost}}"
-}

package/templates/bicep/apim.config.module.bicep

@@ -1,65 +0,0 @@
-// Auto generated content, please customize files under provision folder
-
-@secure()
-param provisionParameters object
-param provisionOutputs object
-
-var apimServiceName = split(provisionOutputs.apimOutput.value.serviceResourceId, '/')[8]
-
-var resourceBaseName = provisionParameters['resourceBaseName']
-var m365TenantId = provisionParameters['m365TenantId']
-var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
-var oauthServerName = contains(provisionParameters, 'apimOauthServerName') ? provisionParameters['apimOauthServerName'] : '${resourceBaseName}'
-var clientId = provisionParameters['apimClientId']
-var clientSecret = provisionParameters['apimClientSecret']
-
-{{#if (contains "teams-bot" connections) }}
-var botId = provisionParameters['botAadAppClientId']
-{{/if}}
-
-{{#if (contains "teams-tab" connections) }}
-  {{#if (contains "teams-bot" connections)}}
-var m365ApplicationIdUri = 'api://${ provisionOutputs.TabOutput.value.domain }/botid-${botId}'
-  {{else}}
-var m365ClientId = provisionParameters['m365ClientId']
-var m365ApplicationIdUri = 'api://${ provisionOutputs.TabOutput.value.domain }/${m365ClientId}'
-  {{/if}}
-{{else}}
-  {{#if (contains "teams-bot" connections) }}
-var m365ApplicationIdUri = 'api://botid-${botId}'
-  {{/if}}
-{{/if}}
-
-var scope = '${m365ApplicationIdUri}/.default'
-var authorizationEndpoint = uri(m365OauthAuthorityHost, '${m365TenantId}/oauth2/v2.0/authorize')
-var tokenEndpoint = uri(m365OauthAuthorityHost, '${m365TenantId}/oauth2/v2.0/token')
-
-//Enables Microsoft Power Platform to access your APIs hosted in Function App
-resource apimServiceAuthServer 'Microsoft.ApiManagement/service/authorizationServers@2020-12-01' = {
-  name: '${apimServiceName}/${oauthServerName}'
-  properties: {
-    displayName: oauthServerName
-    description: 'Created by TeamsFx.'
-    clientRegistrationEndpoint: 'http://localhost'
-    authorizationEndpoint: authorizationEndpoint
-    authorizationMethods: [
-      'GET'
-      'POST'
-    ]
-    clientAuthenticationMethod: [
-      'Body'
-    ]
-    tokenEndpoint: tokenEndpoint
-    defaultScope: scope
-    grantTypes: [
-      'authorizationCode'
-    ]
-    bearerTokenSendingMethods: [
-      'authorizationHeader'
-    ]
-    clientId: clientId
-    clientSecret: clientSecret
-  }
-}
-
-output authServerResourceId string = apimServiceAuthServer.id

package/templates/bicep/apim.config.orchestration.bicep

@@ -1,13 +0,0 @@
-// Add TeamsFx configurations to APIM resources
-module teamsFxApimConfig './teamsFx/apimConfig.bicep' = {
-  name: 'teamsFxApimConfig'
-  params: {
-    provisionParameters: provisionParameters
-    provisionOutputs: provisionOutputs
-  }
-}
-
-output apimConfigOutput object = {
-  teamsFxPluginId: 'apim'
-  authServerResourceId: teamsFxApimConfig.outputs.authServerResourceId
-}

package/templates/bicep/apim.parameters.json

@@ -1,6 +0,0 @@
-{
-  "apimClientId": "{{state.apim.apimClientAADClientId}}",
-  "apimClientSecret": "{{state.apim.apimClientAADClientSecret}}",
-  "apimPublisherEmail": "{{state.apim.publisherEmail}}",
-  "apimPublisherName": "{{state.apim.publisherName}}"
-}

package/templates/bicep/apim.provision.module.bicep

@@ -1,38 +0,0 @@
-@secure()
-param provisionParameters object
-
-var resourceBaseName = provisionParameters['resourceBaseName']
-var apimServiceName = contains(provisionParameters, 'apimServiceName') ? provisionParameters['apimServiceName'] : '${resourceBaseName}' // Try to read name for APIM Service from parameters
-var apimServiceSku = contains(provisionParameters, 'apimServiceSku') ? provisionParameters['apimServiceSku'] : 'Consumption'  // Try to read SKU for APIM Service from parameters
-var productName = contains(provisionParameters, 'apimProductName') ? provisionParameters['apimProductName'] : '${resourceBaseName}'  // Try to read name for APIM Product from parameters
-var publisherEmail = provisionParameters['apimPublisherEmail']  // Read publisher email for APIM Service from parameters, this parameter is required
-var publisherName = provisionParameters['apimPublisherName'] // Read publisher name for APIM Service from parameters, this parameter is required
-
-// APIM Service that helps manage your APIs
-resource apimService 'Microsoft.ApiManagement/service@2020-12-01' = {
-  name: apimServiceName
-  location: resourceGroup().location
-  sku: {
-    name: apimServiceSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add apimServiceSku property to provisionParameters to override the default value "Consumption".
-    capacity: 0
-  }
-  properties: {
-    publisherEmail: publisherEmail
-    publisherName: publisherName
-  }
-}
-
-// Group your APIs, define terms of use and runtime policies
-resource apimServiceProduct 'Microsoft.ApiManagement/service/products@2020-12-01' = {
-  parent: apimService
-  name: productName
-  properties: {
-    displayName: productName
-    description: 'Created by TeamsFx.'
-    subscriptionRequired: false
-    state: 'published'
-  }
-}
-
-output serviceResourceId string = apimService.id
-output productResourceId string = apimServiceProduct.id

package/templates/bicep/apim.provision.orchestration.bicep

@@ -1,13 +0,0 @@
-// Resources for APIM
-module apimProvision './provision/apim.bicep'  = {
-  name: 'apimProvision'
-  params: {
-    provisionParameters: provisionParameters
-  }
-}
-
-output apimOutput object = {
-  teamsFxPluginId: 'apim'
-  serviceResourceId: apimProvision.outputs.serviceResourceId
-  productResourceId: apimProvision.outputs.productResourceId
-}

package/templates/bicep/azureFunction.config.module.bicep

@@ -1,121 +0,0 @@
-// Auto generated content, please customize files under provision folder
-
-@secure()
-param provisionParameters object
-param provisionOutputs object
-@secure()
-param currentConfigs object
-@secure()
-param currentAppSettings object
-
-var functionAppName = split(provisionOutputs.azureFunction{{scenario}}Output.value.functionAppResourceId, '/')[8]
-{{#if (contains "aad-app" 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 oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
-  {{#if (contains "teams-bot" connections) }}
-var botId = provisionParameters['botAadAppClientId']
-    {{#if (contains "teams-tab" connections)}}
-var m365ApplicationIdUri = 'api://${ provisionOutputs.TabOutput.value.domain }/botid-${botId}'
-    {{else}}
-var m365ApplicationIdUri = 'api://botid-${botId}'
-    {{/if}}
-  {{else}}
-var m365ApplicationIdUri = 'api://${ provisionOutputs.TabOutput.value.domain }/${m365ClientId}'
-  {{/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}}
-
-{{#if (contains "aad-app" connections)}}
-var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
-var teamsWebAppClientId = '5e3ce6c0-2b1f-4285-8d4b-75ee78787346'
-var officeWebAppClientId1 = '4345a7b9-9a63-4910-a426-35363201d503'
-var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
-var officeDesktopAppClientId = '0ec893e0-5785-4de6-99da-4ed124e5296c'
-var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
-var outlookWebAppClientId1 = '00000002-0000-0ff1-ce00-000000000000'
-var outlookWebAppClientId2 = 'bc59ab01-8403-45c6-8796-ac3ef710b3e3'
-  {{#if (contains "apim" connections)}}
-var authorizedClientApplicationIds = '${provisionParameters['apimClientId']};${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${officeDesktopAppClientId};${outlookDesktopAppClientId};${outlookWebAppClientId1};${outlookWebAppClientId2}'
-  {{else}}
-var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${officeDesktopAppClientId};${outlookDesktopAppClientId};${outlookWebAppClientId1};${outlookWebAppClientId2}'
-  {{/if}}
-
-{{/if}}
-{{#if (contains "teams-tab" connections) }}
-var tabEndpoint = provisionOutputs.TabOutput.value.endpoint
-var currentAllowedOrigins = empty(currentConfigs.cors) ? [] : currentConfigs.cors.allowedOrigins
-resource appConfig 'Microsoft.Web/sites/config@2021-02-01' = {
-  name: '${functionAppName}/web'
-  kind: 'functionapp'
-  properties: {
-    cors: {
-      allowedOrigins: union(currentAllowedOrigins, [
-        tabEndpoint // allow requests from tab app
-      ])
-    }
-  }
-}
-
-{{/if}}
-resource functionAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
-  name: '${functionAppName}/appsettings'
-  properties: union({
-    {{#if (contains "aad-app" connections)}}
-      {{#if (contains "teams-tab" connections)}}
-    INITIATE_LOGIN_ENDPOINT: uri(tabEndpoint, 'auth-start.html') // The page is used to let users consent required OAuth permissions during bot SSO process
-      {{/if}}
-    ALLOWED_APP_IDS: authorizedClientApplicationIds // Only allow tokens issued by these AAD applications
-    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 "teams-api" connections) }}
-    API_ENDPOINT: provisionOutputs.azureFunctionApiOutput.value.functionEndpoint // Azure Function API endpoint
-    {{/if}}
-    {{#if (contains "azure-sql" connections)}}
-    SQL_DATABASE_NAME: {{azure-sql.outputs.databaseName}} // 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)
-}
-
-{{#if (contains "aad-app" connections)}}
-  {{#if (contains "teams-tab" connections)}}
-resource authSettings 'Microsoft.Web/sites/config@2021-02-01' = {
-  name: '${functionAppName}/authsettings'
-  properties: {
-    enabled: true // Validate access token in request authorization header
-    defaultProvider: 'AzureActiveDirectory'
-    clientId: m365ClientId
-    issuer: '${oauthAuthority}/v2.0' // Issuer of access token
-    allowedAudiences: [ // Only allow tokens with following audiences
-      m365ClientId
-      m365ApplicationIdUri
-    ]
-  }
-}
-  {{/if}}
-{{/if}}

package/templates/bicep/azureFunction.config.orchestration.bicep

@@ -1,14 +0,0 @@
-// Get existing app settings for merge
-var function{{scenario}}CurrentConfigs = reference('${ provisionOutputs.azureFunction{{scenario}}Output.value.functionAppResourceId }/config/web', '2021-02-01')
-var function{{scenario}}CurrentAppSettings = list('${ provisionOutputs.azureFunction{{scenario}}Output.value.functionAppResourceId }/config/appsettings', '2021-02-01').properties
-
-// Merge TeamsFx configurations to Azure Function App
-module teamsFxAzureFunction{{scenario}}Config './teamsFx/azureFunction{{scenario}}Config.bicep' = {
-  name: 'teamsFxAzureFunction{{scenario}}Config'
-  params: {
-    provisionParameters: provisionParameters
-    provisionOutputs: provisionOutputs
-    currentConfigs: function{{scenario}}CurrentConfigs
-    currentAppSettings: function{{scenario}}CurrentAppSettings
-  }
-}

package/templates/bicep/azureFunction.provision.module.bicep

@@ -1,108 +0,0 @@
-@secure()
-param provisionParameters object
-param userAssignedIdentityId string
-
-var resourceBaseName = provisionParameters.resourceBaseName
-var serverfarmsName = contains(provisionParameters, 'functionServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}{{scenarioInLowerCase}}' // Try to read name for App Service Plan from parameters
-var functionAppSKU = contains(provisionParameters, 'functionAppSKU') ? provisionParameters['botfunctionAppSKU'] : 'B1' // Try to read SKU for Azure Web App from parameters
-var functionAppName = contains(provisionParameters, 'SitesName') ? provisionParameters['botSitesName'] : '${resourceBaseName}{{scenarioInLowerCase}}' // Try to read name for Azure Web App from parameters
-var storageName = contains(provisionParameters, 'StorageName') ? provisionParameters['botStorageName'] : '${resourceBaseName}{{scenarioInLowerCase}}' // Try to read name for Azure Storage from parameters
-var storageSku = contains(provisionParameters, 'StorageSku') ? provisionParameters['botStorageSku'] : 'Standard_LRS' // Try to read SKU for Azure Storage from parameters
-
-// Compute resources for your Web App
-resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
-  kind: 'functionapp'
-  location: resourceGroup().location
-  name: serverfarmsName
-  sku: {
-    name: functionAppSKU
-  }
-  properties: {}
-}
-
-// Azure Function that host your app
-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 Function internal setting
-        }
-        {
-          name: 'AzureWebJobsStorage'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Function internal setting
-        }
-        {
-          name: 'FUNCTIONS_EXTENSION_VERSION'
-          value: '~4' // Use Azure Function runtime v4
-        }
-        {{#if (contains "node" configs)}}
-        {
-          name: 'FUNCTIONS_WORKER_RUNTIME'
-          value: 'node' // Set runtime to NodeJS
-        }
-        {
-          name: 'WEBSITE_NODE_DEFAULT_VERSION'
-          value: '~16' // Set NodeJS version to 16.x
-        }
-        {{/if}}
-        {{#if (contains "dotnet" configs)}}
-        {
-          name: 'FUNCTIONS_WORKER_RUNTIME'
-          value: 'dotnet' // Set runtime to .NET
-        }
-        {{/if}}
-        {
-          name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Function internal setting
-        }
-        {
-          name: 'WEBSITE_RUN_FROM_PACKAGE'
-          value: '1' // Run Azure Function from a package file
-        }
-        {{#if (equals "Bot" scenario)}}
-        {
-          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
-    }
-  }
-}
-
-// Azure Storage is required when creating Azure Function 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 sku string = functionAppSKU
-output appName string = functionAppName
-output domain string = functionApp.properties.defaultHostName
-output appServicePlanName string = serverfarmsName
-output functionAppResourceId string = functionApp.id
-output functionEndpoint string = 'https://${functionApp.properties.defaultHostName}'

package/templates/bicep/azureFunction.provision.orchestration.bicep

@@ -1,23 +0,0 @@
-// Resources Azure Function App
-module azureFunction{{scenario}}Provision './provision/azureFunction{{scenario}}.bicep' = {
-  name: 'azureFunction{{scenario}}Provision'
-  params: {
-    provisionParameters: provisionParameters
-    userAssignedIdentityId: {{identity.resourceId}}
-  }
-}
-
-output azureFunction{{scenario}}Output object = {
-  teamsFxPluginId: '{{componentId}}'
-  sku: azureFunction{{scenario}}Provision.outputs.sku
-  appName: azureFunction{{scenario}}Provision.outputs.appName
-  domain: azureFunction{{scenario}}Provision.outputs.domain
-  appServicePlanName: azureFunction{{scenario}}Provision.outputs.appServicePlanName
-  functionAppResourceId: azureFunction{{scenario}}Provision.outputs.functionAppResourceId
-  functionEndpoint: azureFunction{{scenario}}Provision.outputs.functionEndpoint
-}
-
-output {{scenario}}Output object = {
-  domain: azureFunction{{scenario}}Provision.outputs.domain
-  endpoint: azureFunction{{scenario}}Provision.outputs.functionEndpoint
-}

package/templates/bicep/azureStorage.provision.module.bicep

@@ -1,25 +0,0 @@
-@secure()
-param provisionParameters object
-var resourceBaseName = provisionParameters.resourceBaseName
-var storageName = contains(provisionParameters, 'frontendHostingStorageName') ? provisionParameters['frontendHostingStorageName'] : '${resourceBaseName}{{scenarioInLowerCase}}' // Try to read name for frontend hosting Storage Account from parameters
-var storageSku = contains(provisionParameters, 'frontendHostingStorageSku') ? provisionParameters['frontendHostingStorageSku'] : 'Standard_LRS' // Try to read SKU for frontend hosting Storage Account from parameters
-
-// Azure Storage that hosts your static web site
-resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
-  kind: 'StorageV2'
-  location: resourceGroup().location
-  name: storageName
-  properties: {
-    supportsHttpsTrafficOnly: true
-  }
-  sku: {
-    name: storageSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add frontendHostingStorageSku property to provisionParameters to override the default value "Standard_LRS".
-  }
-}
-
-var siteDomain = replace(replace(storage.properties.primaryEndpoints.web, 'https://', ''), '/', '')
-
-output storageResourceId string = storage.id
-output endpoint string = 'https://${siteDomain}'
-output domain string = siteDomain
-output indexPath string = '/index.html#'

package/templates/bicep/azureStorage.provision.orchestration.bicep

@@ -1,21 +0,0 @@
-// Resources for frontend hosting
-module azureStorage{{scenario}}Provision './provision/azureStorage{{scenario}}.bicep' = {
-  name: 'azureStorage{{scenario}}Provision'
-  params: {
-    provisionParameters: provisionParameters
-  }
-}
-
-output azureStorage{{scenario}}Output object = {
-  teamsFxPluginId: '{{componentId}}'
-  domain: azureStorage{{scenario}}Provision.outputs.domain
-  endpoint: azureStorage{{scenario}}Provision.outputs.endpoint
-  indexPath: azureStorage{{scenario}}Provision.outputs.indexPath
-  storageResourceId: azureStorage{{scenario}}Provision.outputs.storageResourceId
-}
-
-
-output {{scenario}}Output object = {
-  domain: azureStorage{{scenario}}Provision.outputs.domain
-  endpoint: azureStorage{{scenario}}Provision.outputs.endpoint
-}