Skip to content

Fix Microsoft OAuth callback by passing scope in token exchange #1509

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

Closed
N2D4 wants to merge 1 commit into from
Closed

Fix Microsoft OAuth callback by passing scope in token exchange #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 apps/backend/src/app/api/latest/auth/oauth/callback/[provider_id]/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ const handler = createSmartRouteHandler({
callbackResult = await providerObj.getCallback({
codeVerifier: innerCodeVerifier,
state: innerState,
extraScope: providerScope,
callbackParams: {
...query,
...body,
Expand Down
11 changes: 9 additions & 2 deletions apps/backend/src/oauth/providers/base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ export abstract class OAuthBaseProvider {
callbackParams: CallbackParamsType,
codeVerifier: string,
state: string,
extraScope?: string,
}): Promise<{ userInfo: OAuthUserInfo, tokenSet: TokenSet }> {
let tokenSet;
const callbackParams = { ...options.callbackParams };
Expand All @@ -410,11 +411,17 @@ export abstract class OAuthBaseProvider {
},
] as const;

const callbackExtras = {
exchangeBody: {
scope: mergeScopeStrings(this.scope, options.extraScope ?? ""),
},
};
Comment on lines +414 to +418
Copy link
Copy Markdown
Contributor

@greptile-apps greptile-apps Bot May 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Minor style inconsistency: getAuthorizationUrl (line 372) uses || "" for the same fallback, while the new code here uses ?? "". Both are functionally equivalent for string scopes, but aligning them keeps the two code sites consistent.

Suggested change
const callbackExtras = {
exchangeBody: {
scope: mergeScopeStrings(this.scope, options.extraScope ?? ""),
},
};
const callbackExtras = {
exchangeBody: {
scope: mergeScopeStrings(this.scope, options.extraScope || ""),
},
};
Prompt To Fix With AI 
This is a comment left during a code review.
Path: apps/backend/src/oauth/providers/base.tsx
Line: 414-418

Comment:
Minor style inconsistency: `getAuthorizationUrl` (line 372) uses `|| ""` for the same fallback, while the new code here uses `?? ""`. Both are functionally equivalent for string scopes, but aligning them keeps the two code sites consistent.

```suggestion
    const callbackExtras = {
      exchangeBody: {
        scope: mergeScopeStrings(this.scope, options.extraScope || ""),
      },
    };
```

How can I resolve this? If you propose a fix, please make it concise.

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!


try {
if (this.openid) {
tokenSet = await this.oauthClient.callback(...params);
tokenSet = await this.oauthClient.callback(...params, callbackExtras);
} else {
tokenSet = await this.oauthClient.oauthCallback(...params);
tokenSet = await this.oauthClient.oauthCallback(...params, callbackExtras);
}
} catch (error: any) {
if (error?.error === "invalid_grant" || error?.error?.error === "invalid_grant") {
Expand Down
Loading