Skip to content

fix: cherry-pick change tenant id of sso connection for travel agent #1517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qinzhouxu merged 1 commit into from
Nov 13, 2025
Merged

fix: cherry-pick change tenant id of sso connection for travel agent #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions travel-agent/M365Agent/infra/azure.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ param deployAppService bool = environment != 'local'
param aadAppClientId string = ''
@secure()
param aadAppClientSecret string = ''
param aadAppTenantId string = ''

param serverfarmsName string = resourceBaseName
param webAppName string = resourceBaseName
Expand Down Expand Up @@ -110,6 +111,7 @@ module azureBotRegistration './botRegistration/azurebot.bicep' = {
botDisplayName: botDisplayName
botConnectionClientId: aadAppClientId
botConnectionClientSecret: aadAppClientSecret
botConnectionTenantId: aadAppTenantId
}
}

Expand Down
3 changes: 3 additions & 0 deletions travel-agent/M365Agent/infra/azure.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
},
"aadAppClientSecret": {
"value": "${{SECRET_AAD_APP_CLIENT_SECRET}}"
},
"aadAppTenantId": {
"value": "${{AAD_APP_TENANT_ID}}"
}
}
}
3 changes: 3 additions & 0 deletions travel-agent/M365Agent/infra/azure.parameters.local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
},
"aadAppClientSecret": {
"value": "${{SECRET_AAD_APP_CLIENT_SECRET}}"
},
"aadAppTenantId": {
"value": "${{AAD_APP_TENANT_ID}}"
}
}
}
3 changes: 2 additions & 1 deletion travel-agent/M365Agent/infra/botRegistration/azurebot.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ param deployAppService bool
param botConnectionClientId string
@secure()
param botConnectionClientSecret string
param botConnectionTenantId string

// Register your web service as a bot with the Bot Framework
resource botService 'Microsoft.BotService/botServices@2021-03-01' = {
Expand Down Expand Up @@ -60,7 +61,7 @@ resource botServiceOAuthConnection 'Microsoft.BotService/botServices/Connections
parameters: [
{
key: 'tenantId'
value: identityTenantId
value: botConnectionTenantId
}
]
}
Expand Down
1 change: 1 addition & 0 deletions travel-agent/M365Agent/m365agents.local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ provision:
clientId: AAD_APP_CLIENT_ID
clientSecret: SECRET_AAD_APP_CLIENT_SECRET
objectId: AAD_APP_OBJECT_ID
tenantId: AAD_APP_TENANT_ID

# Update AAD app with required API permissions
- uses: aadApp/update
Expand Down
1 change: 1 addition & 0 deletions travel-agent/M365Agent/m365agents.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ provision:
clientId: AAD_APP_CLIENT_ID
clientSecret: SECRET_AAD_APP_CLIENT_SECRET
objectId: AAD_APP_OBJECT_ID
tenantId: AAD_APP_TENANT_ID

# Update AAD app with required API permissions
- uses: aadApp/update
Expand Down
Loading