Skip to content

Commit 921c60b

Browse files
eriolchaneriolchan
authored
Merge pull request #13570 from OfficeDev/nintan/fix-bot-remote
fix(template): remote preview
2 parents b943acc + 6759551 commit 921c60b

File tree

66 files changed

+214
-810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+214
-810
lines changed

‎templates/csharp/command-and-response/appsettings.TestTool.json

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
{
2-
"Logging": {
3-
"LogLevel": {
4-
"Default": "Information",
5-
"Microsoft": "Warning",
6-
"Microsoft.Hosting.Lifetime": "Information"
2+
"Connections": {
3+
"BotServiceConnection": {
4+
"Settings": {
5+
"AuthType": "ClientSecret",
6+
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
7+
"ClientId": "00000000-0000-0000-0000-000000000000",
8+
"ClientSecret": "00000000-0000-0000-0000-000000000000",
9+
"Scopes": [
10+
"https://api.botframework.com/.default"
11+
]
12+
}
713
}
8-
},
9-
"AllowedHosts": "*",
10-
"BOT_ID": "",
11-
"BOT_PASSWORD": ""
14+
}
1215
}

‎templates/csharp/command-and-response/appsettings.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
"Connections": {
2222
"BotServiceConnection": {
2323
"Settings": {
24-
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
25-
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
26-
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
27-
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
24+
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
25+
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
26+
"TenantId": "{{BOT_TENANT_ID}}",
2827
"Scopes": [
2928
"https://api.botframework.com/.default"
3029
]

‎templates/csharp/command-and-response/infra/azure.bicep

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
4848
value: '1'
4949
}
5050
{
51-
name: 'BOT_ID'
51+
name: 'Connections__BotServiceConnection__Settings__ClientId'
5252
value: identity.properties.clientId
5353
}
5454
{
55-
name: 'BOT_TENANT_ID'
55+
name: 'Connections__BotServiceConnection__Settings__TenantId'
5656
value: identity.properties.tenantId
5757
}
5858
{
59-
name: 'BOT_TYPE'
60-
value: 'UserAssignedMsi'
59+
name: 'TokenValidation__Audiences__0'
60+
value: identity.properties.clientId
6161
}
6262
]
6363
ftpsState: 'FtpsOnly'

‎templates/csharp/command-and-response/teamsapp.local.yml.tpl

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ provision:
5050
Connections:
5151
BotServiceConnection:
5252
Settings:
53+
AuthType: "ClientSecret"
54+
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
5355
ClientId: ${{BOT_ID}}
5456
ClientSecret: ${{SECRET_BOT_PASSWORD}}
5557

‎templates/csharp/default-bot/appsettings.TestTool.json

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
2-
"Logging": {
3-
"LogLevel": {
4-
"Default": "Information",
5-
"Microsoft": "Warning",
6-
"Microsoft.Hosting.Lifetime": "Information"
2+
"Connections": {
3+
"BotServiceConnection": {
4+
"Settings": {
5+
"AuthType": "ClientSecret",
6+
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
7+
"ClientId": "00000000-0000-0000-0000-000000000000",
8+
"ClientSecret": "00000000-0000-0000-0000-000000000000",
9+
"Scopes": [
10+
"https://api.botframework.com/.default"
11+
]
12+
}
713
}
8-
},
9-
"AllowedHosts": "*"
14+
}
1015
}

‎templates/csharp/default-bot/appsettings.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
"Connections": {
2424
"BotServiceConnection": {
2525
"Settings": {
26-
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
27-
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
28-
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
29-
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
26+
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
27+
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
28+
"TenantId": "{{BOT_TENANT_ID}}",
3029
"Scopes": [
3130
"https://api.botframework.com/.default"
3231
]

‎templates/csharp/default-bot/infra/azure.bicep

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
4343
value: '1'
4444
}
4545
{
46-
name: 'BOT_ID'
46+
name: 'Connections__BotServiceConnection__Settings__ClientId'
4747
value: identity.properties.clientId
4848
}
4949
{
50-
name: 'BOT_TENANT_ID'
50+
name: 'Connections__BotServiceConnection__Settings__TenantId'
5151
value: identity.properties.tenantId
5252
}
5353
{
54-
name: 'BOT_TYPE'
55-
value: 'UserAssignedMsi'
54+
name: 'TokenValidation__Audiences__0'
55+
value: identity.properties.clientId
5656
}
5757
]
5858
ftpsState: 'FtpsOnly'

‎templates/csharp/default-bot/teamsapp.local.yml.tpl

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ provision:
5050
Connections:
5151
BotServiceConnection:
5252
Settings:
53+
AuthType: "ClientSecret"
54+
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
5355
ClientId: ${{BOT_ID}}
5456
ClientSecret: ${{SECRET_BOT_PASSWORD}}
5557

‎templates/csharp/link-unfurling/appsettings.TestTool.json

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
{
2-
"Logging": {
3-
"LogLevel": {
4-
"Default": "Information",
5-
"Microsoft": "Warning",
6-
"Microsoft.Hosting.Lifetime": "Information"
2+
"Connections": {
3+
"BotServiceConnection": {
4+
"Settings": {
5+
"AuthType": "ClientSecret",
6+
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
7+
"ClientId": "00000000-0000-0000-0000-000000000000",
8+
"ClientSecret": "00000000-0000-0000-0000-000000000000",
9+
"Scopes": [
10+
"https://api.botframework.com/.default"
11+
]
12+
}
713
}
8-
},
9-
"AllowedHosts": "*",
10-
"BOT_ID": "",
11-
"BOT_PASSWORD": "",
12-
"BOT_TYPE": ""
14+
}
1315
}

‎templates/csharp/link-unfurling/appsettings.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
"Assembly": "Microsoft.Agents.Authentication.Msal",
1313
"Type": "MsalAuth",
1414
"Settings": {
15-
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
16-
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
17-
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
18-
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
15+
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
16+
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
17+
"TenantId": "{{BOT_TENANT_ID}}",
1918
"Scopes": [
2019
"https://api.botframework.com/.default"
2120
]

‎templates/csharp/link-unfurling/infra/azure.bicep

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
4343
value: '1'
4444
}
4545
{
46-
name: 'BOT_ID'
46+
name: 'Connections__BotServiceConnection__Settings__ClientId'
4747
value: identity.properties.clientId
4848
}
4949
{
50-
name: 'BOT_TENANT_ID'
50+
name: 'Connections__BotServiceConnection__Settings__TenantId'
5151
value: identity.properties.tenantId
5252
}
5353
{
54-
name: 'BOT_TYPE'
55-
value: 'UserAssignedMsi'
54+
name: 'TokenValidation__Audiences__0'
55+
value: identity.properties.clientId
5656
}
5757
]
5858
ftpsState: 'FtpsOnly'

‎templates/csharp/link-unfurling/teamsapp.local.yml.tpl

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ provision:
4747
Connections:
4848
BotServiceConnection:
4949
Settings:
50+
AuthType: "ClientSecret"
51+
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
5052
ClientId: ${{BOT_ID}}
5153
ClientSecret: ${{SECRET_BOT_PASSWORD}}
5254

‎templates/csharp/message-extension-action/appsettings.TestTool.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
2-
"Logging": {
3-
"LogLevel": {
4-
"Default": "Information",
5-
"Microsoft": "Warning",
6-
"Microsoft.Hosting.Lifetime": "Information"
2+
"Connections": {
3+
"BotServiceConnection": {
4+
"Settings": {
5+
"AuthType": "ClientSecret",
6+
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
7+
"ClientId": "00000000-0000-0000-0000-000000000000",
8+
"ClientSecret": "00000000-0000-0000-0000-000000000000",
9+
"Scopes": [
10+
"https://api.botframework.com/.default"
11+
]
12+
}
713
}
8-
},
9-
"AllowedHosts": "*",
10-
"BOT_ID": "",
11-
"BOT_PASSWORD": "",
12-
"BOT_TYPE": "",
13-
"BOT_TENANT_ID": ""
14-
}
14+
}
15+
}

‎templates/csharp/message-extension-action/appsettings.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
"Assembly": "Microsoft.Agents.Authentication.Msal",
1313
"Type": "MsalAuth",
1414
"Settings": {
15-
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
16-
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
17-
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
18-
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
15+
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
16+
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
17+
"TenantId": "{{BOT_TENANT_ID}}",
1918
"Scopes": [
2019
"https://api.botframework.com/.default"
2120
]

‎templates/csharp/message-extension-action/infra/azure.bicep

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
4343
value: '1'
4444
}
4545
{
46-
name: 'BOT_ID'
46+
name: 'Connections__BotServiceConnection__Settings__ClientId'
4747
value: identity.properties.clientId
4848
}
4949
{
50-
name: 'BOT_TENANT_ID'
50+
name: 'Connections__BotServiceConnection__Settings__TenantId'
5151
value: identity.properties.tenantId
5252
}
5353
{
54-
name: 'BOT_TYPE'
55-
value: 'UserAssignedMsi'
54+
name: 'TokenValidation__Audiences__0'
55+
value: identity.properties.clientId
5656
}
5757
]
5858
ftpsState: 'FtpsOnly'

‎templates/csharp/message-extension-action/teamsapp.local.yml.tpl

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ provision:
4747
Connections:
4848
BotServiceConnection:
4949
Settings:
50+
AuthType: "ClientSecret"
51+
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
5052
ClientId: ${{BOT_ID}}
5153
ClientSecret: ${{SECRET_BOT_PASSWORD}}
5254

‎templates/csharp/message-extension-search/appsettings.TestTool.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"Connections": {
3+
"BotServiceConnection": {
4+
"Settings": {
5+
"AuthType": "ClientSecret",
6+
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
7+
"ClientId": "00000000-0000-0000-0000-000000000000",
8+
"ClientSecret": "00000000-0000-0000-0000-000000000000",
9+
"Scopes": [
10+
"https://api.botframework.com/.default"
11+
]
12+
}
13+
}
14+
}
15+
}

‎templates/csharp/message-extension-search/appsettings.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
"Assembly": "Microsoft.Agents.Authentication.Msal",
1313
"Type": "MsalAuth",
1414
"Settings": {
15-
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
16-
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
17-
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
18-
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
15+
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
16+
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
17+
"TenantId": "{{BOT_TENANT_ID}}",
1918
"Scopes": [
2019
"https://api.botframework.com/.default"
2120
]

‎templates/csharp/message-extension-search/infra/azure.bicep

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
4343
value: '1'
4444
}
4545
{
46-
name: 'BOT_ID'
46+
name: 'Connections__BotServiceConnection__Settings__ClientId'
4747
value: identity.properties.clientId
4848
}
4949
{
50-
name: 'BOT_TENANT_ID'
50+
name: 'Connections__BotServiceConnection__Settings__TenantId'
5151
value: identity.properties.tenantId
5252
}
5353
{
54-
name: 'BOT_TYPE'
55-
value: 'UserAssignedMsi'
54+
name: 'TokenValidation__Audiences__0'
55+
value: identity.properties.clientId
5656
}
5757
]
5858
ftpsState: 'FtpsOnly'

‎templates/csharp/message-extension-search/teamsapp.local.yml.tpl

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ provision:
4747
Connections:
4848
BotServiceConnection:
4949
Settings:
50+
AuthType: "ClientSecret"
51+
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
5052
ClientId: ${{BOT_ID}}
5153
ClientSecret: ${{SECRET_BOT_PASSWORD}}
5254

‎templates/csharp/message-extension/appsettings.TestTool.json

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
2-
"Logging": {
3-
"LogLevel": {
4-
"Default": "Information",
5-
"Microsoft": "Warning",
6-
"Microsoft.Hosting.Lifetime": "Information"
2+
"Connections": {
3+
"BotServiceConnection": {
4+
"Settings": {
5+
"AuthType": "ClientSecret",
6+
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
7+
"ClientId": "00000000-0000-0000-0000-000000000000",
8+
"ClientSecret": "00000000-0000-0000-0000-000000000000",
9+
"Scopes": [
10+
"https://api.botframework.com/.default"
11+
]
12+
}
713
}
8-
},
9-
"AllowedHosts": "*",
10-
"BOT_ID": "",
11-
"BOT_PASSWORD": "",
12-
"BOT_TYPE": "",
13-
"BOT_TENANT_ID": ""
14+
}
1415
}

‎templates/csharp/message-extension/appsettings.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
"Assembly": "Microsoft.Agents.Authentication.Msal",
1313
"Type": "MsalAuth",
1414
"Settings": {
15-
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
16-
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
17-
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
18-
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
15+
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
16+
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
17+
"TenantId": "{{BOT_TENANT_ID}}",
1918
"Scopes": [
2019
"https://api.botframework.com/.default"
2120
]

0 commit comments

Comments
 (0)