Skip to content

fix: add sdpm-mcp/invoke scope to WebClient OAuth config #112

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
okamoto-aws merged 2 commits into from
May 3, 2026
Merged

fix: add sdpm-mcp/invoke scope to WebClient OAuth config #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13c37e1
fix: add sdpm-mcp/invoke scope to WebClient via custom resource
May 2, 2026
70c6413
Merge remote-tracking branch 'origin/main' into fix/webclient-mcp-scope
May 3, 2026
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
1 change: 1 addition & 0 deletions infra/bin/infra.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ if (config.stacks?.agent) {
defaultChatModelId,
defaultCreateModelId,
allowedModels,
mcpCustomScope: authStack.mcpCustomScope,
});
}
}
10 changes: 7 additions & 3 deletions infra/lib/web-ui-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ interface WebUiStackProps extends cdk.StackProps {
defaultCreateModelId: string;
/** Allowed models with resolved display metadata. */
allowedModels: Array<{ modelId: string; displayName: string; description?: string }>;
/** Custom OAuth scope for MCP access (e.g. `sdpm-mcp/invoke`). */
mcpCustomScope?: string;
}

export class WebUiStack extends cdk.Stack {
Expand Down Expand Up @@ -403,7 +405,7 @@ function handler(event) {
redirect_uri: "${SiteUrl}",
post_logout_redirect_uri: "${SiteUrl}",
response_type: "code",
scope: "openid profile email",
scope: "openid profile email${McpScope}",
automaticSilentRenew: true,
agentRuntimeArn: "${AgentRuntimeArn}",
apiBaseUrl: "${ApiBaseUrl}",
Expand All @@ -414,6 +416,7 @@ function handler(event) {
SiteUrl: this.siteUrl,
AgentRuntimeArn: props.agentRuntimeArn,
ApiBaseUrl: api.url,
McpScope: props.mcpCustomScope ? ` ${props.mcpCustomScope}` : "",
});

const awsExports = new cr.AwsCustomResource(this, "WriteAwsExports", {
Expand Down Expand Up @@ -446,6 +449,7 @@ function handler(event) {
awsExports.node.addDependency(deployment);

// --- Add Amazon CloudFront URL to Amazon Cognito callback/logout URLs ---
const oauthScopes = ["openid", "profile", "email", ...(props.mcpCustomScope ? [props.mcpCustomScope] : [])];
new cr.AwsCustomResource(this, "UpdateCognitoCallbackUrls", {
onCreate: {
service: "CognitoIdentityServiceProvider",
Expand All @@ -455,7 +459,7 @@ function handler(event) {
ClientId: props.userPoolClient.userPoolClientId,
SupportedIdentityProviders: ["COGNITO"],
AllowedOAuthFlows: ["code"],
AllowedOAuthScopes: ["openid", "profile", "email"],
AllowedOAuthScopes: oauthScopes,
AllowedOAuthFlowsUserPoolClient: true,
CallbackURLs: ["http://localhost:3000", this.siteUrl],
LogoutURLs: ["http://localhost:3000", this.siteUrl],
Expand All @@ -475,7 +479,7 @@ function handler(event) {
ClientId: props.userPoolClient.userPoolClientId,
SupportedIdentityProviders: ["COGNITO"],
AllowedOAuthFlows: ["code"],
AllowedOAuthScopes: ["openid", "profile", "email"],
AllowedOAuthScopes: oauthScopes,
AllowedOAuthFlowsUserPoolClient: true,
CallbackURLs: ["http://localhost:3000", this.siteUrl],
LogoutURLs: ["http://localhost:3000", this.siteUrl],
Expand Down
Loading