From e47275e5202cc6c7f1b20e1568072fcfd8950024 Mon Sep 17 00:00:00 2001
From: Alice Wang <alicewan@microsoft.com>
Date: Thu, 13 Nov 2025 15:32:15 +0800
Subject: [PATCH] Merge pull request #1516 from OfficeDev/qinzhouxu/readme

fix: change tenant id of sso connection for travel agent
---
 travel-agent/M365Agent/infra/azure.bicep                    | 2 ++
 travel-agent/M365Agent/infra/azure.parameters.json          | 3 +++
 travel-agent/M365Agent/infra/azure.parameters.local.json    | 3 +++
 travel-agent/M365Agent/infra/botRegistration/azurebot.bicep | 3 ++-
 travel-agent/M365Agent/m365agents.local.yml                 | 1 +
 travel-agent/M365Agent/m365agents.yml                       | 1 +
 6 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/travel-agent/M365Agent/infra/azure.bicep b/travel-agent/M365Agent/infra/azure.bicep
index 73b27353..16beca3f 100644
--- a/travel-agent/M365Agent/infra/azure.bicep
+++ b/travel-agent/M365Agent/infra/azure.bicep
@@ -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
@@ -110,6 +111,7 @@ module azureBotRegistration './botRegistration/azurebot.bicep' = {
     botDisplayName: botDisplayName
     botConnectionClientId: aadAppClientId
     botConnectionClientSecret: aadAppClientSecret
+    botConnectionTenantId: aadAppTenantId
   }
 }
 
diff --git a/travel-agent/M365Agent/infra/azure.parameters.json b/travel-agent/M365Agent/infra/azure.parameters.json
index 0363db78..1cfd6227 100644
--- a/travel-agent/M365Agent/infra/azure.parameters.json
+++ b/travel-agent/M365Agent/infra/azure.parameters.json
@@ -28,6 +28,9 @@
       },
       "aadAppClientSecret": {
         "value": "${{SECRET_AAD_APP_CLIENT_SECRET}}"
+      },
+      "aadAppTenantId": {
+        "value": "${{AAD_APP_TENANT_ID}}"
       }
     }
   }
\ No newline at end of file
diff --git a/travel-agent/M365Agent/infra/azure.parameters.local.json b/travel-agent/M365Agent/infra/azure.parameters.local.json
index 78f0abed..b0b35d3d 100644
--- a/travel-agent/M365Agent/infra/azure.parameters.local.json
+++ b/travel-agent/M365Agent/infra/azure.parameters.local.json
@@ -31,6 +31,9 @@
       },
       "aadAppClientSecret": {
         "value": "${{SECRET_AAD_APP_CLIENT_SECRET}}"
+      },
+      "aadAppTenantId": {
+        "value": "${{AAD_APP_TENANT_ID}}"
       }
     }
   }
\ No newline at end of file
diff --git a/travel-agent/M365Agent/infra/botRegistration/azurebot.bicep b/travel-agent/M365Agent/infra/botRegistration/azurebot.bicep
index 7b07bf95..2acdf2da 100644
--- a/travel-agent/M365Agent/infra/botRegistration/azurebot.bicep
+++ b/travel-agent/M365Agent/infra/botRegistration/azurebot.bicep
@@ -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' = {
@@ -60,7 +61,7 @@ resource botServiceOAuthConnection 'Microsoft.BotService/botServices/Connections
     parameters: [
       {
         key: 'tenantId'
-        value: identityTenantId
+        value: botConnectionTenantId
       }
     ]
   }
diff --git a/travel-agent/M365Agent/m365agents.local.yml b/travel-agent/M365Agent/m365agents.local.yml
index c8b02830..680beda8 100644
--- a/travel-agent/M365Agent/m365agents.local.yml
+++ b/travel-agent/M365Agent/m365agents.local.yml
@@ -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
diff --git a/travel-agent/M365Agent/m365agents.yml b/travel-agent/M365Agent/m365agents.yml
index daad4ac6..e62e6f2c 100644
--- a/travel-agent/M365Agent/m365agents.yml
+++ b/travel-agent/M365Agent/m365agents.yml
@@ -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