Skip to content
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

Only request OIDC scopes that are supported #578

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −12
Draft

Only request OIDC scopes that are supported #578

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6db02a6
Only request OIDC scopes that are supported
eirikafterdark Jun 14, 2024
40fd6d8
Code style (remove semicolon)
eirikafterdark Jun 14, 2024
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
23 changes: 11 additions & 12 deletions packages/oidc-auth/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const defaultExpirationInterval = 60 * 60 * 24 // 1 day

export type OidcAuth = {
sub: string
email: string
email?: string
rtk: string // refresh token
rtkexp: number // token expiration time ; refresh token if it's expired
ssnexp: number // session expiration time; if it's expired, revoke session and redirect to IdP
Expand Down Expand Up @@ -180,7 +180,7 @@ const updateAuth = async (
const authExpires = Number(env.OIDC_AUTH_EXPIRES!) || defaultExpirationInterval
const updated: OidcAuth = {
sub: claims?.sub || orig?.sub || '',
email: (claims?.email as string) || orig?.email || '',
email: (claims?.email as string | undefined) || orig?.email || '',
rtk: response.refresh_token || orig?.rtk || '',
rtkexp: Math.floor(Date.now() / 1000) + authRefreshInterval,
ssnexp: orig?.ssnexp || Math.floor(Date.now() / 1000) + authExpires,
Expand Down Expand Up @@ -240,17 +240,16 @@ const generateAuthorizationRequestUrl = async (
authorizationRequestUrl.searchParams.set('client_id', client.client_id)
authorizationRequestUrl.searchParams.set('redirect_uri', env.OIDC_REDIRECT_URI)
authorizationRequestUrl.searchParams.set('response_type', 'code')
if (as.scopes_supported === undefined || as.scopes_supported.length === 0) {
throw new HTTPException(500, {
message: 'The supported scopes information is not provided by the IdP',
})
} else if (as.scopes_supported.indexOf('email') === -1) {
throw new HTTPException(500, { message: 'The "email" scope is not supported by the IdP' })
} else if (as.scopes_supported.indexOf('offline_access') === -1) {
authorizationRequestUrl.searchParams.set('scope', 'openid email')
} else {
authorizationRequestUrl.searchParams.set('scope', 'openid email offline_access')

const scopes = ['openid'];
if (as.scopes_supported?.includes('email')) {
scopes.push('email')
}
if (as.scopes_supported?.includes('offline_access')) {
scopes.push('offline_access')
}
authorizationRequestUrl.searchParams.set('scope', scopes.join(' '))

authorizationRequestUrl.searchParams.set('state', state)
authorizationRequestUrl.searchParams.set('nonce', nonce)
authorizationRequestUrl.searchParams.set('code_challenge', code_challenge)
Expand Down