Skip to content

AAU token for ConnectorClient should use Scope from config #696

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
tracyboehrer merged 4 commits into from
Oct 20, 2025
Merged

AAU token for ConnectorClient should use Scope from config #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
805739a
AAU token for ConnectorClient should use Scope from config
Oct 17, 2025
5701285
Update packages/agents-hosting/src/cloudAdapter.ts
tracyboehrer Oct 17, 2025
1755441
Merge branch 'main' into users/tracyboehrer/aau-scope
tracyboehrer Oct 20, 2025
da72a17
Merge branch 'main' into users/tracyboehrer/aau-scope
benbrown Oct 20, 2025
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
18 changes: 17 additions & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,22 @@

"console": "integratedTerminal",
"internalConsoleOptions": "openOnSessionStart"
}
},
{
"type": "node",
"request": "launch",
"name": "agenticai",
"skipFiles": [
"<node_internals>/**"
],
"program": "${workspaceFolder}/test-agents/agentic-ai/src/index.ts",
"outFiles": [
"${workspaceFolder}/**/dist/**/*.js"
],
"preLaunchTask": "build_agentic",
"envFile": "${workspaceFolder}/test-agents/agentic-ai/.env",
"console": "integratedTerminal",
"internalConsoleOptions": "openOnSessionStart"
},
]
}
14 changes: 14 additions & 0 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,20 @@
"problemMatcher": [],
"path": "test-agents/empty-agent"
},
{
"label": "build_agentic",
"type": "npm",
"script": "build",
"group": {
"kind": "build",
"isDefault": false
},
"dependsOn": [
"build_packages"
],
"problemMatcher": [],
"path": "test-agents/agentic-ai"
},
{
"label": "build_webchat",
"type": "npm",
Expand Down
4 changes: 4 additions & 0 deletions packages/agents-hosting/src/auth/authConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ export interface AuthConfiguration {
*/
authority?: string

scope?: string

/**
* A map of connection names to their respective authentication configurations.
*/
Expand Down Expand Up @@ -183,6 +185,7 @@ export const loadPrevAuthConfigFromEnv: () => AuthConfiguration = () => {
connectionName: process.env.connectionName,
FICClientId: process.env.MicrosoftAppClientId,
authority,
scope: process.env.scope,
issuers: getDefaultIssuers(process.env.MicrosoftAppTenantId ?? '', authority),
altBlueprintConnectionName: process.env.altBlueprintConnectionName,
WIDAssertionFile: process.env.WIDAssertionFile,
Expand Down Expand Up @@ -348,6 +351,7 @@ function buildLegacyAuthConfig (envPrefix: string = '', customConfig?: AuthConfi
connectionName: customConfig?.connectionName ?? process.env[`${prefix}connectionName`],
FICClientId: customConfig?.FICClientId ?? process.env[`${prefix}FICClientId`],
authority,
scope: customConfig?.scope ?? process.env[`${prefix}scope`],
issuers: customConfig?.issuers ?? getDefaultIssuers(tenantId as string, authority),
altBlueprintConnectionName: customConfig?.altBlueprintConnectionName ?? process.env[`${prefix}altBlueprintConnectionName`],
WIDAssertionFile: customConfig?.WIDAssertionFile ?? process.env[`${prefix}WIDAssertionFile`]
Expand Down
9 changes: 6 additions & 3 deletions packages/agents-hosting/src/cloudAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ export class CloudAdapter extends BaseAdapter {
headers
)
} else if (activity.recipient?.role === RoleTypes.AgenticUser && activity.getAgenticInstanceId() && activity.getAgenticUser()) {
const token = await tokenProvider.getAgenticUserToken(activity.getAgenticInstanceId() ?? '', activity.getAgenticUser() ?? '', [ApxProductionScope])
const scope = tokenProvider.connectionSettings?.scope ?? ApxProductionScope
const token = await tokenProvider.getAgenticUserToken(activity.getAgenticInstanceId() ?? '', activity.getAgenticUser() ?? '', [scope])

connectorClient = ConnectorClient.createClientWithToken(
activity.serviceUrl!,
Expand Down Expand Up @@ -333,8 +334,10 @@ export class CloudAdapter extends BaseAdapter {
this.setConnectorClient(context, connectorClient)
}

const userTokenClient = await this.createUserTokenClient()
this.setUserTokenClient(context, userTokenClient)
if (!activity.isAgenticRequest()) {
Comment thread
benbrown marked this conversation as resolved.
const userTokenClient = await this.createUserTokenClient()
this.setUserTokenClient(context, userTokenClient)
}

if (
activity?.type === ActivityTypes.InvokeResponse ||
Expand Down
6 changes: 0 additions & 6 deletions test-agents/agentic-ai/env.TEMPLATE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,9 @@
connections__serviceConnection__settings__clientId=
connections__serviceConnection__settings__clientSecret=
connections__serviceConnection__settings__tenantId=
connections__agenticConnection__settings__clientId=
connections__agenticConnection__settings__clientSecret=
connections__agenticConnection__settings__tenantId=

connectionsMap__0__connection=serviceConnection
connectionsMap__0__serviceUrl=*
connectionsMap__1__connection=agenticConnection
connectionsMap__1__serviceUrl=

agentic_type=agentic
agentic_altBluprintConnectionName=agenticConnection
agentic_scopes=https://graph.microsoft.com/.default