fix: wip
All checks were successful
/ build (map[dockerfile:./services/app/Dockerfile name:app]) (push) Successful in 1m32s
/ build (map[dockerfile:./services/files/Dockerfile name:files]) (push) Successful in 3m1s
/ build (map[dockerfile:./services/tasks/Dockerfile name:tasks]) (push) Successful in 3m2s
/ build (map[dockerfile:./services/web/Dockerfile name:web]) (push) Successful in 3m6s
/ build (map[dockerfile:./services/api/Dockerfile name:api]) (push) Successful in 3m5s
/ build (map[dockerfile:./services/hasura/Dockerfile name:hasura]) (push) Successful in 2m47s
/ build (map[dockerfile:./services/watchers/Dockerfile name:watchers]) (push) Successful in 3m10s
/ deploy (push) Successful in 30s
All checks were successful
/ build (map[dockerfile:./services/app/Dockerfile name:app]) (push) Successful in 1m32s
/ build (map[dockerfile:./services/files/Dockerfile name:files]) (push) Successful in 3m1s
/ build (map[dockerfile:./services/tasks/Dockerfile name:tasks]) (push) Successful in 3m2s
/ build (map[dockerfile:./services/web/Dockerfile name:web]) (push) Successful in 3m6s
/ build (map[dockerfile:./services/api/Dockerfile name:api]) (push) Successful in 3m5s
/ build (map[dockerfile:./services/hasura/Dockerfile name:hasura]) (push) Successful in 2m47s
/ build (map[dockerfile:./services/watchers/Dockerfile name:watchers]) (push) Successful in 3m10s
/ deploy (push) Successful in 30s
This commit is contained in:
parent
84be7527f2
commit
306a9faa63
1 changed files with 11 additions and 19 deletions
|
@ -47,27 +47,19 @@ module.exports = function () {
|
||||||
{ error: err },
|
{ error: err },
|
||||||
"Allowing expired JWT for meta.auth-token scope"
|
"Allowing expired JWT for meta.auth-token scope"
|
||||||
)
|
)
|
||||||
// Continue processing with expired JWT
|
|
||||||
} else {
|
|
||||||
logger.error({ error: err }, "jwVerify failed")
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// For meta.auth-token scope, check for X-Auth-Token header
|
|
||||||
if (hasMetaAuthToken) {
|
|
||||||
const req = reqCtx.get("req")
|
const req = reqCtx.get("req")
|
||||||
const authTokenHeader = req?.headers?.["x-auth-token"]
|
const authTokenHeader = req?.headers?.["x-auth-token"]
|
||||||
|
|
||||||
if (!authTokenHeader) {
|
if (!authTokenHeader) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a session that indicates auth token processing is needed
|
// Create a session that indicates auth token processing is needed
|
||||||
const session = { isAuthTokenRequest: true, authToken: authTokenHeader }
|
const session = { isAuthTokenRequest: true, authToken: authTokenHeader }
|
||||||
reqCtx.set("session", session)
|
reqCtx.set("session", session)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
logger.error({ error: err }, "jwVerify failed")
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
// Regular user JWT processing
|
// Regular user JWT processing
|
||||||
const claims = getHasuraClaimsFromJWT(jwt, claimsNamespace)
|
const claims = getHasuraClaimsFromJWT(jwt, claimsNamespace)
|
||||||
|
|
Loading…
Add table
Reference in a new issue