Skip to content

Commit

Permalink
fix: allow api token
Browse files Browse the repository at this point in the history
  • Loading branch information
Matheus-Aguilar committed Jul 10, 2024
1 parent d4ab4c5 commit 93dac59
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
8 changes: 6 additions & 2 deletions node/directives/checkAdminAccess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class CheckAdminAccess extends SchemaDirectiveVisitor {

sendAuthMetric(logger, auditMetric)

if (!hasAdminToken && !hasAdminTokenOnHeader) {
if (!hasAdminToken && !hasApiToken && !hasAdminTokenOnHeader) {
logger.warn({
message: 'CheckAdminAccess: No token provided',
userAgent,
Expand All @@ -83,7 +83,11 @@ export class CheckAdminAccess extends SchemaDirectiveVisitor {
throw new AuthenticationError('No token was provided')
}

if (!hasCurrentValidAdminToken && !hasCurrentValidAdminTokenOnHeader) {
if (
!hasCurrentValidAdminToken &&
!hasValidApiToken &&
!hasCurrentValidAdminTokenOnHeader
) {
logger.warn({
message: 'CheckAdminAccess: Invalid token',
userAgent,
Expand Down
8 changes: 7 additions & 1 deletion node/directives/checkUserAccess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,12 @@ export class CheckUserAccess extends SchemaDirectiveVisitor {

sendAuthMetric(logger, auditMetric)

if (!hasAdminToken && !hasStoreToken && !hasAdminTokenOnHeader) {
if (
!hasAdminToken &&
!hasApiToken &&
!hasStoreToken &&
!hasAdminTokenOnHeader
) {
logger.warn({
message: 'CheckUserAccess: No token provided',
userAgent,
Expand All @@ -88,6 +93,7 @@ export class CheckUserAccess extends SchemaDirectiveVisitor {

if (
!hasCurrentValidAdminToken &&
!hasValidApiToken &&
!hasCurrentValidStoreToken &&
!hasCurrentValidAdminTokenOnHeader
) {
Expand Down

0 comments on commit 93dac59

Please sign in to comment.