@microsoft/teamsfx-core 1.1.0 → 1.1.2-alpha.9f3cd667.0

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/simpleAuth.bicep

@@ -1,44 +0,0 @@
-@secure()
-param provisionParameters object
-param userAssignedIdentityId string
-var resourceBaseName = provisionParameters.resourceBaseName
-var sku = contains(provisionParameters, 'simpleAuthSku') ? provisionParameters['simpleAuthSku'] : 'F1'
-var serverFarmsName = contains(provisionParameters, 'simpleAuthServerFarmsName') ? provisionParameters['simpleAuthServerFarmsName'] : '${resourceBaseName}simpleAuth'
-var webAppName = contains(provisionParameters, 'simpleAuthWebAppName') ? provisionParameters['simpleAuthWebAppName'] : '${resourceBaseName}simpleAuth'
-var simpleAuthPackageUri = contains(provisionParameters, 'simpleAuthPackageUri') ? provisionParameters['simpleAuthPackageUri'] : 'https://github.com/OfficeDev/TeamsFx/releases/download/simpleauth@0.1.0/Microsoft.TeamsFx.SimpleAuth_0.1.0.zip'
-
-resource serverFarms 'Microsoft.Web/serverfarms@2021-02-01' = {
-  name: serverFarmsName
-  location: resourceGroup().location
-  sku: {
-    name: sku
-  }
-  kind: 'app'
-}
-
-resource webApp 'Microsoft.Web/sites@2021-02-01' = {
-  kind: 'app'
-  name: webAppName
-  location: resourceGroup().location
-  properties: {
-    serverFarmId: serverFarms.id
-    keyVaultReferenceIdentity: userAssignedIdentityId
-  }
-  identity: {
-    type: 'UserAssigned'
-    userAssignedIdentities: {
-      '${userAssignedIdentityId}': {}
-    }
-  }
-}
-
-resource simpleAuthDeploy 'Microsoft.Web/sites/extensions@2021-02-01' = {
-  parent: webApp
-  name: 'MSDeploy'
-  properties: {
-    packageUri: simpleAuthPackageUri
-  }
-}
-
-output webAppResourceId string = webApp.id
-output endpoint string = 'https://${webApp.properties.defaultHostName}'

package/templates/azure/provision.bicep

@@ -1,58 +0,0 @@
-@secure()
-param provisionParameters object
-// Resources for frontend hosting
-module frontendHostingProvision './provision/frontendHosting.bicep' = {
-  name: 'frontendHostingProvision'
-  params: {
-    provisionParameters: provisionParameters
-  }
-}
-
-output frontendHostingOutput object = {
-  teamsFxPluginId: 'fx-resource-frontend-hosting'
-  domain: frontendHostingProvision.outputs.domain
-  endpoint: frontendHostingProvision.outputs.endpoint
-  storageResourceId: frontendHostingProvision.outputs.resourceId
-}
-// 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
-}
-// Resources for Azure SQL
-module azureSqlProvision './provision/azureSql.bicep' = {
-  name: 'azureSqlProvision'
-  params: {
-    provisionParameters: provisionParameters
-  }
-}
-
-output azureSqlOutput object = {
-  teamsFxPluginId: 'fx-resource-azure-sql'
-  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
-}

package/templates/azure/teamsFx/bot.bicep

@@ -1,34 +0,0 @@
-// 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/azure/teamsFx/function.bicep

@@ -1,71 +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.functionOutput.value.functionAppResourceId, '/')[8]
-
-var m365ClientId = provisionParameters['m365ClientId']
-var m365ClientSecret = provisionParameters['m365ClientSecret']
-var m365TenantId = provisionParameters['m365TenantId']
-var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
-var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
-var tabAppDomain = provisionOutputs.frontendHostingOutput.value.domain
-var tabAppEndpoint = provisionOutputs.frontendHostingOutput.value.endpoint 
-var m365ApplicationIdUri = 'api://${tabAppDomain}/${m365ClientId}'
-
-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 outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
-var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
-var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
-
-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, [
-        tabAppEndpoint
-      ])
-    }
-  }
-}
-resource appSettings 'Microsoft.Web/sites/config@2021-02-01' = {
-  name: '${functionAppName}/appsettings'
-  properties: union({
-    API_ENDPOINT: provisionOutputs.functionOutput.value.functionEndpoint
-    ALLOWED_APP_IDS: authorizedClientApplicationIds
-    M365_CLIENT_ID: m365ClientId
-    M365_CLIENT_SECRET: m365ClientSecret
-    M365_TENANT_ID: m365TenantId
-    M365_AUTHORITY_HOST: m365OauthAuthorityHost
-    M365_APPLICATION_ID_URI: m365ApplicationIdUri
-    IDENTITY_ID: provisionOutputs.identityOutput.value.identityClientId
-    SQL_DATABASE_NAME: provisionOutputs.azureSqlOutput.value.databaseName
-    SQL_ENDPOINT: provisionOutputs.azureSqlOutput.value.sqlEndpoint
-  }, currentAppSettings)
-}
-
-resource authSettings 'Microsoft.Web/sites/config@2021-02-01' = {
-  name: '${functionAppName}/authsettings'
-  properties: {
-    enabled: true
-    defaultProvider: 'AzureActiveDirectory'
-    clientId: m365ClientId
-    issuer: '${oauthAuthority}/v2.0'
-    allowedAudiences: [
-      m365ClientId
-      m365ApplicationIdUri
-    ]
-  }
-}

package/templates/azure/teamsFx/simpleAuth.bicep

@@ -1,40 +0,0 @@
-// Auto generated content, please customize files under provision folder
-
-@secure()
-param provisionParameters object
-param provisionOutputs object
-@secure()
-param currentAppSettings object
-
-var webAppName = split(provisionOutputs.simpleAuthOutput.value.webAppResourceId, '/')[8]
-
-var m365ClientId = provisionParameters['m365ClientId']
-var m365ClientSecret = provisionParameters['m365ClientSecret']
-var m365TenantId = provisionParameters['m365TenantId']
-var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
-var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
-var aadMetadataAddress = uri(m365OauthAuthorityHost, '${m365TenantId}/v2.0/.well-known/openid-configuration')
-var tabAppDomain = provisionOutputs.frontendHostingOutput.value.domain
-var tabAppEndpoint = provisionOutputs.frontendHostingOutput.value.endpoint 
-var m365ApplicationIdUri = 'api://${tabAppDomain}/${m365ClientId}'
-
-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 outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
-var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
-var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
-
-resource simpleAuthWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
-  name: '${webAppName}/appsettings'
-  properties: {
-    AAD_METADATA_ADDRESS: aadMetadataAddress
-    ALLOWED_APP_IDS: authorizedClientApplicationIds
-    IDENTIFIER_URI: m365ApplicationIdUri
-    CLIENT_ID: m365ClientId
-    CLIENT_SECRET: m365ClientSecret
-    OAUTH_AUTHORITY: oauthAuthority
-    TAB_APP_ENDPOINT: tabAppEndpoint
-  }
-}

package/templates/plugins/resource/aad/bicep/param.template.bicep

@@ -1,6 +0,0 @@
-
-param m365ClientId string
-@secure()
-param m365ClientSecret string
-param m365TenantId string
-param m365OauthAuthorityHost string

package/templates/plugins/resource/aad/bicep/variables.template.bicep

@@ -1,13 +0,0 @@
-{{#contains 'fx-resource-frontend-hosting' Plugins}}
-{{#notContains 'fx-resource-bot' ../Plugins}}
-var m365ApplicationIdUri = 'api://${ {{~../PluginOutput.fx-resource-frontend-hosting.Outputs.domain~}} }/${m365ClientId}'
-{{/notContains}}
-{{#contains 'fx-resource-bot' ../Plugins}}
-var m365ApplicationIdUri = 'api://${ {{~../PluginOutput.fx-resource-frontend-hosting.Outputs.domain~}} }/botid-${bot_aadClientId}'
-{{/contains}}
-{{/contains}}
-{{#notContains 'fx-resource-frontend-hosting' Plugins}}
-{{#contains 'fx-resource-bot' ../Plugins}}
-var m365ApplicationIdUri = 'api://botid-${bot_aadClientId}'
-{{/contains}}
-{{/notContains}}