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

fix: get admin token from header #146

Merged
merged 5 commits into from
Jul 17, 2024
Merged

fix: get admin token from header #146

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7c746d
fix: get admin token from header
Matheus-Aguilar Jul 8, 2024
b6e0ef1
chore: update CHANGELOG
Matheus-Aguilar Jul 10, 2024
d4ab4c5
fix: add token on header metrics and avoid reusing variables
Matheus-Aguilar Jul 10, 2024
93dac59
fix: allow api token
Matheus-Aguilar Jul 10, 2024
0ab28b8
B2BTEAM-1738 Merge branch 'master' into fix/TEAMB2B-1738-get-header-t…
Matheus-Aguilar Jul 16, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Fixed
- Get tokens from headers when necessary

## [1.41.0] - 2024-07-01

### Added
Expand Down
23 changes: 21 additions & 2 deletions node/directives/checkAdminAccess.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ import type { GraphQLField } from 'graphql'
import { defaultFieldResolver } from 'graphql'

import sendAuthMetric, { AuthMetric } from '../metrics/auth'
import { validateAdminToken, validateApiToken } from './helper'
import {
validateAdminToken,
validateAdminTokenOnHeader,
validateApiToken,
} from './helper'

export class CheckAdminAccess extends SchemaDirectiveVisitor {
public visitFieldDefinition(field: GraphQLField<any, any>) {
Expand All @@ -20,9 +24,21 @@ export class CheckAdminAccess extends SchemaDirectiveVisitor {
vtex: { adminUserAuthToken, storeUserAuthToken, logger },
} = context

const { hasAdminToken, hasValidAdminToken, hasCurrentValidAdminToken } =
let { hasAdminToken, hasValidAdminToken, hasCurrentValidAdminToken } =
await validateAdminToken(context, adminUserAuthToken as string)

let hasAdminTokenOnHeader = false

// If there's no admin token on context, search for it on header
if (!hasAdminToken) {
;({
hasAdminToken,
hasValidAdminToken,
hasCurrentValidAdminToken,
hasAdminTokenOnHeader,
} = await validateAdminTokenOnHeader(context))
}

const { hasApiToken, hasValidApiToken } = await validateApiToken(context)

const hasStoreToken = !!storeUserAuthToken // we don't need to validate store token
Expand All @@ -47,6 +63,7 @@ export class CheckAdminAccess extends SchemaDirectiveVisitor {
hasApiToken,
hasValidApiToken,
hasStoreToken,
hasAdminTokenOnHeader,
},
'CheckAdminAccessAudit'
)
Expand All @@ -65,6 +82,7 @@ export class CheckAdminAccess extends SchemaDirectiveVisitor {
hasApiToken,
hasValidApiToken,
hasStoreToken,
hasAdminTokenOnHeader,
})
throw new AuthenticationError('No token was provided')
}
Expand All @@ -81,6 +99,7 @@ export class CheckAdminAccess extends SchemaDirectiveVisitor {
hasApiToken,
hasValidApiToken,
hasStoreToken,
hasAdminTokenOnHeader,
})
throw new ForbiddenError('Unauthorized Access')
}
Expand Down
18 changes: 17 additions & 1 deletion node/directives/checkUserAccess.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { SchemaDirectiveVisitor } from 'graphql-tools'
import sendAuthMetric, { AuthMetric } from '../metrics/auth'
import {
validateAdminToken,
validateAdminTokenOnHeader,
validateApiToken,
validateStoreToken,
} from './helper'
Expand All @@ -24,9 +25,21 @@ export class CheckUserAccess extends SchemaDirectiveVisitor {
vtex: { adminUserAuthToken, storeUserAuthToken, logger },
} = context

const { hasAdminToken, hasValidAdminToken, hasCurrentValidAdminToken } =
let { hasAdminToken, hasValidAdminToken, hasCurrentValidAdminToken } =
await validateAdminToken(context, adminUserAuthToken as string)

let hasAdminTokenOnHeader = false

// If there's no admin token on context, search for it on header
if (!hasAdminToken) {
;({
hasAdminToken,
hasValidAdminToken,
hasCurrentValidAdminToken,
hasAdminTokenOnHeader,
} = await validateAdminTokenOnHeader(context))
}

const { hasApiToken, hasValidApiToken } = await validateApiToken(context)

const { hasStoreToken, hasValidStoreToken, hasCurrentValidStoreToken } =
Expand All @@ -53,6 +66,7 @@ export class CheckUserAccess extends SchemaDirectiveVisitor {
hasValidApiToken,
hasStoreToken,
hasValidStoreToken,
hasAdminTokenOnHeader,
},
'CheckUserAccessAudit'
)
Expand All @@ -71,6 +85,7 @@ export class CheckUserAccess extends SchemaDirectiveVisitor {
hasApiToken,
hasValidApiToken,
hasStoreToken,
hasAdminTokenOnHeader,
})
throw new AuthenticationError('No token was provided')
}
Expand All @@ -88,6 +103,7 @@ export class CheckUserAccess extends SchemaDirectiveVisitor {
hasValidApiToken,
hasStoreToken,
hasValidStoreToken,
hasAdminTokenOnHeader,
})
throw new ForbiddenError('Unauthorized Access')
}
Expand Down
31 changes: 31 additions & 0 deletions node/directives/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,34 @@ export const validateStoreToken = async (

return { hasStoreToken, hasValidStoreToken, hasCurrentValidStoreToken }
}

export const validateAdminTokenOnHeader = async (
context: Context
): Promise<{
hasAdminToken: boolean
hasValidAdminToken: boolean
hasCurrentValidAdminToken: boolean
hasAdminTokenOnHeader: boolean
}> => {
const adminUserAuthToken = context?.headers.vtexidclientautcookie as string
const hasAdminTokenOnHeader = !!adminUserAuthToken?.length

if (!hasAdminTokenOnHeader) {
return {
hasAdminToken: false,
hasValidAdminToken: false,
hasCurrentValidAdminToken: false,
hasAdminTokenOnHeader,
}
}

const { hasAdminToken, hasCurrentValidAdminToken, hasValidAdminToken } =
await validateAdminToken(context, adminUserAuthToken)
Comment on lines +188 to +189
Copy link
Contributor

Choose a reason for hiding this comment

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

nice!


return {
hasAdminToken,
hasValidAdminToken,
hasCurrentValidAdminToken,
hasAdminTokenOnHeader,
}
}
18 changes: 16 additions & 2 deletions node/directives/validateStoreUserAccess.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { AuthAuditMetric } from '../metrics/auth'
import sendAuthMetric, { AuthMetric } from '../metrics/auth'
import {
validateAdminToken,
validateAdminTokenOnHeader,
validateApiToken,
validateStoreToken,
} from './helper'
Expand Down Expand Up @@ -41,13 +42,26 @@ export class ValidateStoreUserAccess extends SchemaDirectiveVisitor {
userAgent,
}

const { hasAdminToken, hasValidAdminToken } = await validateAdminToken(
let { hasAdminToken, hasValidAdminToken } = await validateAdminToken(
context,
adminUserAuthToken as string
)

let hasAdminTokenOnHeader = false

// If there's no admin token on context, search for it on header
if (!hasAdminToken) {
;({ hasAdminToken, hasValidAdminToken, hasAdminTokenOnHeader } =
await validateAdminTokenOnHeader(context))
}

// add admin token metrics
metricFields = { ...metricFields, hasAdminToken, hasValidAdminToken }
metricFields = {
...metricFields,
hasAdminToken,
hasValidAdminToken,
hasAdminTokenOnHeader,
}

// allow access if has valid admin token
if (hasValidAdminToken) {
Expand Down
1 change: 1 addition & 0 deletions node/metrics/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export interface AuthAuditMetric {
hasValidStoreToken?: boolean
hasApiToken?: boolean
hasValidApiToken?: boolean
hasAdminTokenOnHeader?: boolean
}

export class AuthMetric implements Metric {
Expand Down
Loading