Skip to content

[Refactor] Collect requested token IDs declaratively in validateSession #8706

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
Suleimanlatrsh merged 1 commit into from
Sep 30, 2026
+10 −24
Merged

[Refactor] Collect requested token IDs declaratively in validateSession #8706

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
34 changes: 10 additions & 24 deletions packages/cli-kit/src/private/node/session/validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {applicationId} from './identity.js'
import {sessionConstants} from '../constants.js'
import {OAuthApplications} from '../session.js'
import {outputDebug} from '../../../public/node/output.js'
import {getArrayRejectingUndefined} from '../../../public/common/array.js'

type ValidationResult = 'needs_refresh' | 'needs_full_auth' | 'ok'

Expand Down Expand Up @@ -31,32 +32,17 @@ export async function validateSession(
if (!session) return 'needs_full_auth'
const scopesAreValid = validateScopes(scopes, session.identity)
if (!scopesAreValid) return 'needs_full_auth'
let tokensAreExpired = isTokenExpired(session.identity)

if (applications.partnersApi) {
const appId = applicationId('partners')
const token = session.applications[appId]!
tokensAreExpired = tokensAreExpired || isTokenExpired(token)
}

if (applications.appManagementApi) {
const appId = applicationId('app-management')
const token = session.applications[appId]!
tokensAreExpired = tokensAreExpired || isTokenExpired(token)
}
const requestedTokenIds = getArrayRejectingUndefined([
applications.partnersApi ? applicationId('partners') : undefined,
applications.appManagementApi ? applicationId('app-management') : undefined,
applications.storefrontRendererApi ? applicationId('storefront-renderer') : undefined,
applications.adminApi ? `${applications.adminApi.storeFqdn}-${applicationId('admin')}` : undefined,
])

if (applications.storefrontRendererApi) {
const appId = applicationId('storefront-renderer')
const token = session.applications[appId]!
tokensAreExpired = tokensAreExpired || isTokenExpired(token)
}

if (applications.adminApi) {
const appId = applicationId('admin')
const realAppId = `${applications.adminApi.storeFqdn}-${appId}`
const token = session.applications[realAppId]!
tokensAreExpired = tokensAreExpired || isTokenExpired(token)
}
const tokensAreExpired =
isTokenExpired(session.identity) ||
requestedTokenIds.some((tokenId) => isTokenExpired(session.applications[tokenId]!))

outputDebug(`- Token validation -> It's expired: ${tokensAreExpired}`)

Expand Down
Loading