refactor: add a new env variable for the tab valid domain

OfficeDev · Jun 11, 2024 · ca750e6 · ca750e6
1 parent b153bc3
commit ca750e6
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 11 deletions.
diff --git a/developer-assist-dashboard/appPackage/manifest.json b/developer-assist-dashboard/appPackage/manifest.json
@@ -44,7 +44,7 @@
         "messageTeamMembers"
     ],
     "validDomains": [
-        "${{TAB_DOMAIN}}"
+        "${{TAB_HOSTNAME}}"
     ],
     "webApplicationInfo": {
         "id": "${{AAD_APP_CLIENT_ID}}",

diff --git a/developer-assist-dashboard/infra/azure.bicep b/developer-assist-dashboard/infra/azure.bicep
@@ -212,6 +212,7 @@ resource functionStorage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
 // The output will be persisted in .env.{envName}. Visit https://aka.ms/teamsfx-actions/arm-deploy for more details.
 output TAB_AZURE_STORAGE_RESOURCE_ID string = storage.id // used in deploy stage
 output TAB_DOMAIN string = siteDomain
+output TAB_HOSTNAME string = siteDomain
 output TAB_ENDPOINT string = tabEndpoint
 output API_FUNCTION_ENDPOINT string = apiEndpoint
 output API_FUNCTION_RESOURCE_ID string = functionApp.id
diff --git a/developer-assist-dashboard/teamsapp.local.yml b/developer-assist-dashboard/teamsapp.local.yml
@@ -28,10 +28,11 @@ provision:
     writeToEnvironmentFile:
       teamsAppId: TEAMS_APP_ID
 
-  - uses: script # Set TAB_DOMAIN and TAB_ENDPOINT for local launch
+  - uses: script # Set required variables for local launch
     with:
       run:
-        echo "::set-teamsfx-env TAB_DOMAIN=localhost";
+        echo "::set-teamsfx-env TAB_HOSTNAME=localhost";
+        echo "::set-teamsfx-env TAB_DOMAIN=localhost:53000";
         echo "::set-teamsfx-env TAB_ENDPOINT=https://localhost:53000";
         echo "::set-teamsfx-env FUNC_NAME=callService";
         echo "::set-teamsfx-env FUNC_ENDPOINT=http://localhost:7071";

diff --git a/hello-world-bot-with-tab/appPackage/manifest.json b/hello-world-bot-with-tab/appPackage/manifest.json
@@ -74,7 +74,7 @@
         "messageTeamMembers"
     ],
     "validDomains": [
-        "${{TAB_DOMAIN}}",
+        "${{TAB_HOSTNAME}}",
         "${{BOT_DOMAIN}}"
     ],
     "showLoadingIndicator": false

diff --git a/hello-world-bot-with-tab/infra/azure.bicep b/hello-world-bot-with-tab/infra/azure.bicep
@@ -97,6 +97,7 @@ var siteDomain = replace(replace(storage.properties.primaryEndpoints.web, 'https
 // The output will be persisted in .env.{envName}. Visit https://aka.ms/teamsfx-actions/arm-deploy for more details.
 output TAB_AZURE_STORAGE_RESOURCE_ID string = storage.id // used in deploy stage
 output TAB_DOMAIN string = siteDomain
+output TAB_HOSTNAME string = siteDomain
 output TAB_ENDPOINT string = 'https://${siteDomain}'
 output BOT_AZURE_APP_SERVICE_RESOURCE_ID string = webApp.id
 output BOT_DOMAIN string = webApp.properties.defaultHostName
diff --git a/hello-world-bot-with-tab/teamsapp.local.yml b/hello-world-bot-with-tab/teamsapp.local.yml
@@ -38,9 +38,11 @@ provision:
       channels:
         - name: msteams
 
-  - uses: script # Set TAB_DOMAIN and TAB_ENDPOINT for local launch
+  - uses: script # Set required variables for local launch
     with:
-      run: echo "::set-teamsfx-env TAB_DOMAIN=localhost";
+      run:
+        echo "::set-teamsfx-env TAB_HOSTNAME=localhost";
+        echo "::set-teamsfx-env TAB_DOMAIN=localhost:53000";
         echo "::set-teamsfx-env TAB_ENDPOINT=https://localhost:53000";
   # Validate using manifest schema
   - uses: teamsApp/validateManifest

diff --git a/hello-world-in-meeting/appPackage/manifest.json b/hello-world-in-meeting/appPackage/manifest.json
@@ -50,7 +50,7 @@
         "messageTeamMembers"
     ],
     "validDomains": [
-        "${{TAB_DOMAIN}}"
+        "${{TAB_HOSTNAME}}"
     ],
     "showLoadingIndicator": false
 }
diff --git a/hello-world-in-meeting/infra/azure.bicep b/hello-world-in-meeting/infra/azure.bicep
@@ -24,4 +24,5 @@ var siteDomain = replace(replace(storage.properties.primaryEndpoints.web, 'https
 // The output will be persisted in .env.{envName}. Visit https://aka.ms/teamsfx-actions/arm-deploy for more details.
 output TAB_AZURE_STORAGE_RESOURCE_ID string = storage.id // used in deploy stage
 output TAB_DOMAIN string = siteDomain
+output TAB_HOSTNAME string = siteDomain
 output TAB_ENDPOINT string = 'https://${siteDomain}'
diff --git a/hello-world-in-meeting/teamsapp.local.yml b/hello-world-in-meeting/teamsapp.local.yml
@@ -17,10 +17,11 @@ provision:
     writeToEnvironmentFile:
       teamsAppId: TEAMS_APP_ID
 
-  - uses: script # Set TAB_DOMAIN and TAB_ENDPOINT for local launch
+  - uses: script # Set required variables for local launch
     with:
       run:
-        echo "::set-teamsfx-env TAB_DOMAIN=localhost";
+        echo "::set-teamsfx-env TAB_HOSTNAME=localhost";
+        echo "::set-teamsfx-env TAB_DOMAIN=localhost:53000";
         echo "::set-teamsfx-env TAB_ENDPOINT=https://localhost:53000";
   # Validate using manifest schema
   - uses: teamsApp/validateManifest

diff --git a/team-central-dashboard/appPackage/manifest.json b/team-central-dashboard/appPackage/manifest.json
@@ -44,7 +44,7 @@
         "messageTeamMembers"
     ],
     "validDomains": [
-        "${{TAB_DOMAIN}}"
+        "${{TAB_HOSTNAME}}"
     ],
     "webApplicationInfo": {
         "id": "${{AAD_APP_CLIENT_ID}}",

diff --git a/team-central-dashboard/infra/azure.bicep b/team-central-dashboard/infra/azure.bicep
@@ -163,6 +163,7 @@ resource functionStorage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
 // The output will be persisted in .env.{envName}. Visit https://aka.ms/teamsfx-actions/arm-deploy for more details.
 output TAB_AZURE_STORAGE_RESOURCE_ID string = storage.id // used in deploy stage
 output TAB_DOMAIN string = siteDomain
+output TAB_HOSTNAME string = siteDomain
 output TAB_ENDPOINT string = tabEndpoint
 output API_FUNCTION_ENDPOINT string = apiEndpoint
 output API_FUNCTION_RESOURCE_ID string = functionApp.id
diff --git a/team-central-dashboard/teamsapp.local.yml b/team-central-dashboard/teamsapp.local.yml
@@ -30,7 +30,8 @@ provision:
   - uses: script # Set required variables for local launch
     with:
       run:
-        echo "::set-teamsfx-env TAB_DOMAIN=localhost";
+        echo "::set-teamsfx-env TAB_HOSTNAME=localhost";
+        echo "::set-teamsfx-env TAB_DOMAIN=localhost:53000";
         echo "::set-teamsfx-env TAB_ENDPOINT=https://localhost:53000";
         echo "::set-teamsfx-env FUNC_NAME=callGraph";
         echo "::set-teamsfx-env FUNC_ENDPOINT=http://localhost:7071";