Merge pull request #359 from microsoft/prdc_sql_tool_removal

feat: Fabric Data Agent as tool & user assertion token based Auth for Workshop mode

Author: Prajwal-Microsoft

infra/main.bicep

@@ -92,8 +92,19 @@ param azureEnvOnly bool = false
 
 @description('Enable chat history.')
 param useChatHistoryEnabled bool = true
+
+@description('The primary title displayed in the header of the web app (bold text).')
+param appTitlePrimary string = 'Contoso'
+
+@description('The secondary title displayed in the header of the web app (lighter text).')
+param appTitleSecondary string = '| Unified Data Analysis Agents'
+
 var useChatHistoryEnabledSetting = useChatHistoryEnabled ? 'True' : 'False'
 
+@description('Enable user access token forwarding to the API.')
+param useUserAccessToken bool = false
+var useUserAccessTokenSetting = useUserAccessToken ? 'True' : 'False'
+
 // If isWorkshop is false, always deploy; if isWorkshop is true, respect deployApp
 var shouldDeployApp = !isWorkshop || deployApp
 
@@ -270,6 +281,7 @@ module backend_docker 'deploy_backend_docker.bicep' = if (shouldDeployApp && bac
       SOLUTION_NAME: solutionSuffix
       IS_WORKSHOP: isWorkshop ? 'True' : 'False'
       AZURE_ENV_ONLY: azureEnvOnly ? 'True' : 'False'
+      USE_USER_ACCESS_TOKEN: useUserAccessTokenSetting
       APP_ENV: 'Prod'
       AZURE_BASIC_LOGGING_LEVEL: 'INFO'
       AZURE_PACKAGE_LOGGING_LEVEL: 'WARNING'
@@ -351,6 +363,8 @@ module frontend_docker 'deploy_frontend_docker.bicep' = if (shouldDeployApp) {
       APP_API_BASE_URL: backendRuntimeStack == 'python' ? backend_docker!.outputs.appUrl : backend_csapi_docker!.outputs.appUrl
       CHAT_LANDING_TEXT: landingText
       IS_WORKSHOP: isWorkshop ? 'True' : 'False'
+      APP_TITLE_PRIMARY: appTitlePrimary
+      APP_TITLE_SECONDARY: appTitleSecondary
     }
   }
   scope: resourceGroup(resourceGroup().name)
@@ -464,3 +478,6 @@ output AZURE_ENV_DEPLOY_APP bool = deployApp
 
 @description('Flag indicating Azure-only mode (no Fabric)')
 output AZURE_ENV_ONLY bool = azureEnvOnly
+
+@description('Flag indicating whether user access token forwarding is enabled')
+output USE_USER_ACCESS_TOKEN string = useUserAccessTokenSetting

infra/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.42.1.51946",
-      "templateHash": "2129642045338742014"
+      "templateHash": "14768825107451790909"
     }
   },
   "parameters": {
@@ -178,6 +178,27 @@
         "description": "Enable chat history."
       }
     },
+    "appTitlePrimary": {
+      "type": "string",
+      "defaultValue": "Contoso",
+      "metadata": {
+        "description": "The primary title displayed in the header of the web app (bold text)."
+      }
+    },
+    "appTitleSecondary": {
+      "type": "string",
+      "defaultValue": "| Unified Data Analysis Agents",
+      "metadata": {
+        "description": "The secondary title displayed in the header of the web app (lighter text)."
+      }
+    },
+    "useUserAccessToken": {
+      "type": "bool",
+      "defaultValue": false,
+      "metadata": {
+        "description": "Enable user access token forwarding to the API."
+      }
+    },
     "AZURE_LOCATION": {
       "type": "string",
       "defaultValue": ""
@@ -457,6 +478,7 @@
     },
     "abbrs": "[variables('$fxv#0')]",
     "useChatHistoryEnabledSetting": "[if(parameters('useChatHistoryEnabled'), 'True', 'False')]",
+    "useUserAccessTokenSetting": "[if(parameters('useUserAccessToken'), 'True', 'False')]",
     "shouldDeployApp": "[or(not(parameters('isWorkshop')), parameters('deployApp'))]",
     "solutionLocation": "[if(empty(parameters('AZURE_LOCATION')), resourceGroup().location, parameters('AZURE_LOCATION'))]",
     "solutionSuffix": "[toLower(trim(replace(replace(replace(replace(replace(replace(format('{0}{1}', parameters('environmentName'), parameters('solutionUniqueText')), '-', ''), '_', ''), '.', ''), '/', ''), ' ', ''), '*', '')))]",
@@ -2919,6 +2941,7 @@
               "SOLUTION_NAME": "[variables('solutionSuffix')]",
               "IS_WORKSHOP": "[if(parameters('isWorkshop'), 'True', 'False')]",
               "AZURE_ENV_ONLY": "[if(parameters('azureEnvOnly'), 'True', 'False')]",
+              "USE_USER_ACCESS_TOKEN": "[variables('useUserAccessTokenSetting')]",
               "APP_ENV": "Prod",
               "AZURE_BASIC_LOGGING_LEVEL": "INFO",
               "AZURE_PACKAGE_LOGGING_LEVEL": "WARNING",
@@ -4538,7 +4561,9 @@
             "value": {
               "APP_API_BASE_URL": "[if(equals(parameters('backendRuntimeStack'), 'python'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_backend_docker'), '2025-04-01').outputs.appUrl.value, reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_backend_csapi_docker'), '2025-04-01').outputs.appUrl.value)]",
               "CHAT_LANDING_TEXT": "[variables('landingText')]",
-              "IS_WORKSHOP": "[if(parameters('isWorkshop'), 'True', 'False')]"
+              "IS_WORKSHOP": "[if(parameters('isWorkshop'), 'True', 'False')]",
+              "APP_TITLE_PRIMARY": "[parameters('appTitlePrimary')]",
+              "APP_TITLE_SECONDARY": "[parameters('appTitleSecondary')]"
             }
           }
         },
@@ -5085,6 +5110,13 @@
         "description": "Flag indicating Azure-only mode (no Fabric)"
       },
       "value": "[parameters('azureEnvOnly')]"
+    },
+    "USE_USER_ACCESS_TOKEN": {
+      "type": "string",
+      "metadata": {
+        "description": "Flag indicating whether user access token forwarding is enabled"
+      },
+      "value": "[variables('useUserAccessTokenSetting')]"
     }
   }
 }