@microsoft/teamsfx-core 1.1.1 → 1.1.2-alpha.378e6f1e.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/constants.d.ts +2 -1
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +2 -1
- package/build/common/constants.js.map +1 -1
- package/build/common/samples-config.json +14 -0
- package/build/common/tools.d.ts +11 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +24 -10
- package/build/common/tools.js.map +1 -1
- package/build/core/SolutionPluginContainer.d.ts +2 -0
- package/build/core/SolutionPluginContainer.d.ts.map +1 -1
- package/build/core/SolutionPluginContainer.js +16 -1
- package/build/core/SolutionPluginContainer.js.map +1 -1
- package/build/core/error.d.ts +2 -1
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +7 -3
- package/build/core/error.js.map +1 -1
- package/build/core/index.d.ts +12 -3
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +143 -30
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +0 -25
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +1 -1
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectSettingsLoaderV3.d.ts +4 -0
- package/build/core/middleware/projectSettingsLoaderV3.d.ts.map +1 -0
- package/build/core/middleware/projectSettingsLoaderV3.js +49 -0
- package/build/core/middleware/projectSettingsLoaderV3.js.map +1 -0
- package/build/core/middleware/questionModel.d.ts +2 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +98 -1
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/solutionLoaderV3.d.ts +4 -0
- package/build/core/middleware/solutionLoaderV3.d.ts.map +1 -0
- package/build/core/middleware/solutionLoaderV3.js +15 -0
- package/build/core/middleware/solutionLoaderV3.js.map +1 -0
- package/build/core/question.d.ts +9 -1
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +113 -3
- package/build/core/question.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +1 -10
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.d.ts +1 -1
- package/build/plugins/resource/appstudio/appStudio.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.js +106 -85
- package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +1 -0
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +1 -0
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/errors.d.ts +1 -1
- package/build/plugins/resource/appstudio/errors.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/errors.js +2 -1
- package/build/plugins/resource/appstudio/errors.js.map +1 -1
- package/build/plugins/resource/appstudio/index.js +1 -1
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts +2 -3
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +51 -105
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/checker.d.ts +0 -1
- package/build/plugins/resource/function/utils/depsChecker/checker.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/checker.js +2 -2
- package/build/plugins/resource/function/utils/depsChecker/checker.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/common.d.ts +1 -2
- package/build/plugins/resource/function/utils/depsChecker/common.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/common.js +2 -6
- package/build/plugins/resource/function/utils/depsChecker/common.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.d.ts +0 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.js +1 -23
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.js.map +1 -1
- package/build/plugins/resource/localdebug/certificate.js +3 -3
- package/build/plugins/resource/localdebug/certificate.js.map +1 -1
- package/build/plugins/resource/localdebug/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/index.js +8 -6
- package/build/plugins/resource/localdebug/index.js.map +1 -1
- package/build/plugins/resource/localdebug/settings.d.ts +1 -1
- package/build/plugins/resource/localdebug/settings.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/settings.js +10 -6
- package/build/plugins/resource/localdebug/settings.js.map +1 -1
- package/build/plugins/resource/localdebug/tasks.js +5 -5
- package/build/plugins/resource/localdebug/util/error.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/util/error.js +1 -1
- package/build/plugins/resource/localdebug/util/error.js.map +1 -1
- package/build/plugins/resource/localdebug/util/ngrok.js +2 -2
- package/build/plugins/resource/localdebug/util/ngrok.js.map +1 -1
- package/build/plugins/resource/simpleauth/utils/common.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/utils/common.js +3 -1
- package/build/plugins/resource/simpleauth/utils/common.js.map +1 -1
- package/build/plugins/resource/sql/config.d.ts +0 -1
- package/build/plugins/resource/sql/config.d.ts.map +1 -1
- package/build/plugins/resource/sql/config.js +0 -1
- package/build/plugins/resource/sql/config.js.map +1 -1
- package/build/plugins/resource/sql/plugin.d.ts.map +1 -1
- package/build/plugins/resource/sql/plugin.js +0 -1
- package/build/plugins/resource/sql/plugin.js.map +1 -1
- package/build/plugins/resource/sql/utils/checkInput.js +2 -2
- package/build/plugins/resource/sql/utils/checkInput.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts +2 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +79 -14
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts +13 -2
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.js +24 -26
- package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/index.d.ts +1 -0
- package/build/plugins/solution/fx-solution/index.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/index.js +1 -0
- package/build/plugins/solution/fx-solution/index.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts +0 -1
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +1 -32
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +8 -4
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +17 -22
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js +8 -0
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addModule.d.ts +6 -0
- package/build/plugins/solution/fx-solution/v3/addModule.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/addModule.js +35 -0
- package/build/plugins/solution/fx-solution/v3/addModule.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/addResource.d.ts +31 -0
- package/build/plugins/solution/fx-solution/v3/addResource.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/addResource.js +261 -0
- package/build/plugins/solution/fx-solution/v3/addResource.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/constants.d.ts +6 -0
- package/build/plugins/solution/fx-solution/v3/constants.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/constants.js +11 -0
- package/build/plugins/solution/fx-solution/v3/constants.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/deploy.d.ts +6 -0
- package/build/plugins/solution/fx-solution/v3/deploy.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/deploy.js +78 -0
- package/build/plugins/solution/fx-solution/v3/deploy.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/error.d.ts +11 -0
- package/build/plugins/solution/fx-solution/v3/error.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/error.js +23 -0
- package/build/plugins/solution/fx-solution/v3/error.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/init.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/init.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/init.js +25 -0
- package/build/plugins/solution/fx-solution/v3/init.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/provision.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/provision.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/provision.js +123 -0
- package/build/plugins/solution/fx-solution/v3/provision.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/provisionLocal.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/provisionLocal.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js +13 -0
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/publish.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/publish.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/publish.js +15 -0
- package/build/plugins/solution/fx-solution/v3/publish.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/questions.d.ts +16 -0
- package/build/plugins/solution/fx-solution/v3/questions.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/questions.js +86 -0
- package/build/plugins/solution/fx-solution/v3/questions.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/scaffold.d.ts +18 -0
- package/build/plugins/solution/fx-solution/v3/scaffold.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/scaffold.js +176 -0
- package/build/plugins/solution/fx-solution/v3/scaffold.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/solution.d.ts +51 -0
- package/build/plugins/solution/fx-solution/v3/solution.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/solution.js +70 -0
- package/build/plugins/solution/fx-solution/v3/solution.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/userTask.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/userTask.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/userTask.js +15 -0
- package/build/plugins/solution/fx-solution/v3/userTask.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/utils.d.ts +3 -0
- package/build/plugins/solution/fx-solution/v3/utils.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/utils.js +16 -0
- package/build/plugins/solution/fx-solution/v3/utils.js.map +1 -0
- package/build/plugins/solution/index.d.ts +1 -0
- package/build/plugins/solution/index.d.ts.map +1 -1
- package/build/plugins/solution/index.js +1 -0
- package/build/plugins/solution/index.js.map +1 -1
- package/build/plugins/solution/spfx-solution/index.d.ts +2 -0
- package/build/plugins/solution/spfx-solution/index.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/index.js +5 -0
- package/build/plugins/solution/spfx-solution/index.js.map +1 -0
- package/build/plugins/solution/spfx-solution/questions.d.ts +3 -0
- package/build/plugins/solution/spfx-solution/questions.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/questions.js +24 -0
- package/build/plugins/solution/spfx-solution/questions.js.map +1 -0
- package/build/plugins/solution/spfx-solution/scaffolding.d.ts +14 -0
- package/build/plugins/solution/spfx-solution/scaffolding.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/scaffolding.js +29 -0
- package/build/plugins/solution/spfx-solution/scaffolding.js.map +1 -0
- package/build/plugins/solution/spfx-solution/solution.d.ts +19 -0
- package/build/plugins/solution/spfx-solution/solution.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/solution.js +27 -0
- package/build/plugins/solution/spfx-solution/solution.js.map +1 -0
- package/package.json +4 -3
- package/resource/strings.json +0 -1
- package/templates/azure/config.bicep +0 -22
- package/templates/azure/provision/azureBot.bicep +0 -0
- package/templates/azure/provision/azureWebApp.bicep +0 -0
- package/templates/azure/provision.bicep +2 -56
- package/templates/plugins/resource/simpleauth/version.txt +2 -1
- package/templates/azure/provision/azureSql.bicep +0 -39
- package/templates/azure/provision/frontendHosting.bicep +0 -23
- package/templates/azure/provision/function.bicep +0 -79
- package/templates/azure/provision/simpleAuth.bicep +0 -44
- package/templates/azure/teamsFx/bot.bicep +0 -34
- package/templates/azure/teamsFx/function.bicep +0 -71
- package/templates/azure/teamsFx/simpleAuth.bicep +0 -40
- package/templates/plugins/resource/aad/bicep/param.template.bicep +0 -6
- package/templates/plugins/resource/aad/bicep/variables.template.bicep +0 -13
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
@secure()
|
|
2
|
-
param provisionParameters object
|
|
3
|
-
param userAssignedIdentityId string
|
|
4
|
-
var resourceBaseName = provisionParameters.resourceBaseName
|
|
5
|
-
var sku = contains(provisionParameters, 'simpleAuthSku') ? provisionParameters['simpleAuthSku'] : 'F1'
|
|
6
|
-
var serverFarmsName = contains(provisionParameters, 'simpleAuthServerFarmsName') ? provisionParameters['simpleAuthServerFarmsName'] : '${resourceBaseName}simpleAuth'
|
|
7
|
-
var webAppName = contains(provisionParameters, 'simpleAuthWebAppName') ? provisionParameters['simpleAuthWebAppName'] : '${resourceBaseName}simpleAuth'
|
|
8
|
-
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'
|
|
9
|
-
|
|
10
|
-
resource serverFarms 'Microsoft.Web/serverfarms@2021-02-01' = {
|
|
11
|
-
name: serverFarmsName
|
|
12
|
-
location: resourceGroup().location
|
|
13
|
-
sku: {
|
|
14
|
-
name: sku
|
|
15
|
-
}
|
|
16
|
-
kind: 'app'
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
resource webApp 'Microsoft.Web/sites@2021-02-01' = {
|
|
20
|
-
kind: 'app'
|
|
21
|
-
name: webAppName
|
|
22
|
-
location: resourceGroup().location
|
|
23
|
-
properties: {
|
|
24
|
-
serverFarmId: serverFarms.id
|
|
25
|
-
keyVaultReferenceIdentity: userAssignedIdentityId
|
|
26
|
-
}
|
|
27
|
-
identity: {
|
|
28
|
-
type: 'UserAssigned'
|
|
29
|
-
userAssignedIdentities: {
|
|
30
|
-
'${userAssignedIdentityId}': {}
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
resource simpleAuthDeploy 'Microsoft.Web/sites/extensions@2021-02-01' = {
|
|
36
|
-
parent: webApp
|
|
37
|
-
name: 'MSDeploy'
|
|
38
|
-
properties: {
|
|
39
|
-
packageUri: simpleAuthPackageUri
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
output webAppResourceId string = webApp.id
|
|
44
|
-
output endpoint string = 'https://${webApp.properties.defaultHostName}'
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
// Auto generated content, please customize files under provision folder
|
|
2
|
-
|
|
3
|
-
@secure()
|
|
4
|
-
param provisionParameters object
|
|
5
|
-
param provisionOutputs object
|
|
6
|
-
@secure()
|
|
7
|
-
param currentAppSettings object
|
|
8
|
-
|
|
9
|
-
var botWebAppName = split(provisionOutputs.botOutput.value.botWebAppResourceId, '/')[8]
|
|
10
|
-
var m365ClientId = provisionParameters['m365ClientId']
|
|
11
|
-
var m365ClientSecret = provisionParameters['m365ClientSecret']
|
|
12
|
-
var m365TenantId = provisionParameters['m365TenantId']
|
|
13
|
-
var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
|
|
14
|
-
var botAadAppClientId = provisionParameters['botAadAppClientId']
|
|
15
|
-
var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
|
|
16
|
-
|
|
17
|
-
var botId = provisionParameters['botAadAppClientId']
|
|
18
|
-
|
|
19
|
-
var m365ApplicationIdUri = 'api://${provisionOutputs.frontendHostingOutput.value.domain}/botid-${botId}'
|
|
20
|
-
|
|
21
|
-
resource botWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
|
|
22
|
-
name: '${botWebAppName}/appsettings'
|
|
23
|
-
properties: union({
|
|
24
|
-
INITIATE_LOGIN_ENDPOINT: uri(provisionOutputs.botOutput.value.siteEndpoint, 'auth-start.html')
|
|
25
|
-
M365_AUTHORITY_HOST: m365OauthAuthorityHost
|
|
26
|
-
M365_CLIENT_ID: m365ClientId
|
|
27
|
-
M365_CLIENT_SECRET: m365ClientSecret
|
|
28
|
-
M365_TENANT_ID: m365TenantId
|
|
29
|
-
M365_APPLICATION_ID_URI: m365ApplicationIdUri
|
|
30
|
-
BOT_ID: botAadAppClientId
|
|
31
|
-
BOT_PASSWORD: botAadAppClientSecret
|
|
32
|
-
IDENTITY_ID: provisionOutputs.identityOutput.value.identityClientId
|
|
33
|
-
}, currentAppSettings)
|
|
34
|
-
}
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
// Auto generated content, please customize files under provision folder
|
|
2
|
-
|
|
3
|
-
@secure()
|
|
4
|
-
param provisionParameters object
|
|
5
|
-
param provisionOutputs object
|
|
6
|
-
@secure()
|
|
7
|
-
param currentConfigs object
|
|
8
|
-
@secure()
|
|
9
|
-
param currentAppSettings object
|
|
10
|
-
|
|
11
|
-
var functionAppName = split(provisionOutputs.functionOutput.value.functionAppResourceId, '/')[8]
|
|
12
|
-
|
|
13
|
-
var m365ClientId = provisionParameters['m365ClientId']
|
|
14
|
-
var m365ClientSecret = provisionParameters['m365ClientSecret']
|
|
15
|
-
var m365TenantId = provisionParameters['m365TenantId']
|
|
16
|
-
var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
|
|
17
|
-
var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
|
|
18
|
-
var tabAppDomain = provisionOutputs.frontendHostingOutput.value.domain
|
|
19
|
-
var tabAppEndpoint = provisionOutputs.frontendHostingOutput.value.endpoint
|
|
20
|
-
var m365ApplicationIdUri = 'api://${tabAppDomain}/${m365ClientId}'
|
|
21
|
-
|
|
22
|
-
var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
|
|
23
|
-
var teamsWebAppClientId = '5e3ce6c0-2b1f-4285-8d4b-75ee78787346'
|
|
24
|
-
var officeWebAppClientId1 = '4345a7b9-9a63-4910-a426-35363201d503'
|
|
25
|
-
var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
|
|
26
|
-
var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
|
|
27
|
-
var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
|
|
28
|
-
var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
|
|
29
|
-
|
|
30
|
-
var currentAllowedOrigins = empty(currentConfigs.cors) ? [] : currentConfigs.cors.allowedOrigins
|
|
31
|
-
|
|
32
|
-
resource appConfig 'Microsoft.Web/sites/config@2021-02-01' = {
|
|
33
|
-
name: '${functionAppName}/web'
|
|
34
|
-
kind: 'functionapp'
|
|
35
|
-
properties: {
|
|
36
|
-
cors: {
|
|
37
|
-
allowedOrigins: union(currentAllowedOrigins, [
|
|
38
|
-
tabAppEndpoint
|
|
39
|
-
])
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
resource appSettings 'Microsoft.Web/sites/config@2021-02-01' = {
|
|
44
|
-
name: '${functionAppName}/appsettings'
|
|
45
|
-
properties: union({
|
|
46
|
-
API_ENDPOINT: provisionOutputs.functionOutput.value.functionEndpoint
|
|
47
|
-
ALLOWED_APP_IDS: authorizedClientApplicationIds
|
|
48
|
-
M365_CLIENT_ID: m365ClientId
|
|
49
|
-
M365_CLIENT_SECRET: m365ClientSecret
|
|
50
|
-
M365_TENANT_ID: m365TenantId
|
|
51
|
-
M365_AUTHORITY_HOST: m365OauthAuthorityHost
|
|
52
|
-
M365_APPLICATION_ID_URI: m365ApplicationIdUri
|
|
53
|
-
IDENTITY_ID: provisionOutputs.identityOutput.value.identityClientId
|
|
54
|
-
SQL_DATABASE_NAME: provisionOutputs.azureSqlOutput.value.databaseName
|
|
55
|
-
SQL_ENDPOINT: provisionOutputs.azureSqlOutput.value.sqlEndpoint
|
|
56
|
-
}, currentAppSettings)
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
resource authSettings 'Microsoft.Web/sites/config@2021-02-01' = {
|
|
60
|
-
name: '${functionAppName}/authsettings'
|
|
61
|
-
properties: {
|
|
62
|
-
enabled: true
|
|
63
|
-
defaultProvider: 'AzureActiveDirectory'
|
|
64
|
-
clientId: m365ClientId
|
|
65
|
-
issuer: '${oauthAuthority}/v2.0'
|
|
66
|
-
allowedAudiences: [
|
|
67
|
-
m365ClientId
|
|
68
|
-
m365ApplicationIdUri
|
|
69
|
-
]
|
|
70
|
-
}
|
|
71
|
-
}
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
// Auto generated content, please customize files under provision folder
|
|
2
|
-
|
|
3
|
-
@secure()
|
|
4
|
-
param provisionParameters object
|
|
5
|
-
param provisionOutputs object
|
|
6
|
-
@secure()
|
|
7
|
-
param currentAppSettings object
|
|
8
|
-
|
|
9
|
-
var webAppName = split(provisionOutputs.simpleAuthOutput.value.webAppResourceId, '/')[8]
|
|
10
|
-
|
|
11
|
-
var m365ClientId = provisionParameters['m365ClientId']
|
|
12
|
-
var m365ClientSecret = provisionParameters['m365ClientSecret']
|
|
13
|
-
var m365TenantId = provisionParameters['m365TenantId']
|
|
14
|
-
var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
|
|
15
|
-
var oauthAuthority = uri(m365OauthAuthorityHost, m365TenantId)
|
|
16
|
-
var aadMetadataAddress = uri(m365OauthAuthorityHost, '${m365TenantId}/v2.0/.well-known/openid-configuration')
|
|
17
|
-
var tabAppDomain = provisionOutputs.frontendHostingOutput.value.domain
|
|
18
|
-
var tabAppEndpoint = provisionOutputs.frontendHostingOutput.value.endpoint
|
|
19
|
-
var m365ApplicationIdUri = 'api://${tabAppDomain}/${m365ClientId}'
|
|
20
|
-
|
|
21
|
-
var teamsMobileOrDesktopAppClientId = '1fec8e78-bce4-4aaf-ab1b-5451cc387264'
|
|
22
|
-
var teamsWebAppClientId = '5e3ce6c0-2b1f-4285-8d4b-75ee78787346'
|
|
23
|
-
var officeWebAppClientId1 = '4345a7b9-9a63-4910-a426-35363201d503'
|
|
24
|
-
var officeWebAppClientId2 = '4765445b-32c6-49b0-83e6-1d93765276ca'
|
|
25
|
-
var outlookDesktopAppClientId = 'd3590ed6-52b3-4102-aeff-aad2292ab01c'
|
|
26
|
-
var outlookWebAppClientId = '00000002-0000-0ff1-ce00-000000000000'
|
|
27
|
-
var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teamsWebAppClientId};${officeWebAppClientId1};${officeWebAppClientId2};${outlookDesktopAppClientId};${outlookWebAppClientId}'
|
|
28
|
-
|
|
29
|
-
resource simpleAuthWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
|
|
30
|
-
name: '${webAppName}/appsettings'
|
|
31
|
-
properties: {
|
|
32
|
-
AAD_METADATA_ADDRESS: aadMetadataAddress
|
|
33
|
-
ALLOWED_APP_IDS: authorizedClientApplicationIds
|
|
34
|
-
IDENTIFIER_URI: m365ApplicationIdUri
|
|
35
|
-
CLIENT_ID: m365ClientId
|
|
36
|
-
CLIENT_SECRET: m365ClientSecret
|
|
37
|
-
OAUTH_AUTHORITY: oauthAuthority
|
|
38
|
-
TAB_APP_ENDPOINT: tabAppEndpoint
|
|
39
|
-
}
|
|
40
|
-
}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
{{#contains 'fx-resource-frontend-hosting' Plugins}}
|
|
2
|
-
{{#notContains 'fx-resource-bot' ../Plugins}}
|
|
3
|
-
var m365ApplicationIdUri = 'api://${ {{~../PluginOutput.fx-resource-frontend-hosting.Outputs.domain~}} }/${m365ClientId}'
|
|
4
|
-
{{/notContains}}
|
|
5
|
-
{{#contains 'fx-resource-bot' ../Plugins}}
|
|
6
|
-
var m365ApplicationIdUri = 'api://${ {{~../PluginOutput.fx-resource-frontend-hosting.Outputs.domain~}} }/botid-${bot_aadClientId}'
|
|
7
|
-
{{/contains}}
|
|
8
|
-
{{/contains}}
|
|
9
|
-
{{#notContains 'fx-resource-frontend-hosting' Plugins}}
|
|
10
|
-
{{#contains 'fx-resource-bot' ../Plugins}}
|
|
11
|
-
var m365ApplicationIdUri = 'api://botid-${bot_aadClientId}'
|
|
12
|
-
{{/contains}}
|
|
13
|
-
{{/notContains}}
|