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

Jump to bottom

adding kv map in Auth plugin #129

Merged
merged 2 commits into from
Sep 2, 2024
Merged

adding kv map in Auth plugin #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57606be
adding kv map in Auth plugin
Ryiguchi Aug 30, 2024
7c9b94d
Create three-lamps-wait.md
Ryiguchi Sep 2, 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
5 changes: 5 additions & 0 deletions .changeset/three-lamps-wait.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@zemble/auth": patch
---

adding kv map in Auth plugin
22 changes: 17 additions & 5 deletions packages/auth/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useExtendContext, type PromiseOrValue } from '@envelop/core'
import { useGenericAuth } from '@envelop/generic-auth'
import { Plugin, type TokenContents } from '@zemble/core'
import { Plugin } from '@zemble/core'
import graphqlYoga from '@zemble/graphql'
import kv from '@zemble/kv'
import {
Expand All @@ -15,6 +15,7 @@ import { handleValueNode, transformObjectNode } from './utils/graphqlToJSMappers
import { setTokenCookies } from './utils/setBearerTokenCookie'

import type { decodeToken as defaultDecodeToken } from './utils/decodeToken'
import type { IStandardKeyValueService, TokenContents } from '@zemble/core'
import type {
ExecutionArgs, FieldNode, GraphQLObjectType, ObjectValueNode,
} from 'graphql'
Expand Down Expand Up @@ -52,6 +53,17 @@ interface AuthConfig extends Zemble.GlobalConfig {
}
}

const initializedKvs = new Map<string, IStandardKeyValueService<string | boolean>>()
const getKv = <T extends string | boolean> (key: string): IStandardKeyValueService<T> => {
if (initializedKvs.has(key)) {
return initializedKvs.get(key) as IStandardKeyValueService<T>
}

const newKv = plugin.providers.kv<T>(key)
initializedKvs.set(key, newKv)
return newKv
}

function isGraphQlWsContext(context: Context | Zemble.GraphQlWsContext): context is Zemble.GraphQlWsContext {
return 'connectionParams' in context
}
Expand Down Expand Up @@ -106,12 +118,12 @@ const validateMatch = (matchValueNode: ObjectValueNode, decodedToken: Record<str

const checkTokenValidityDefault = async (token: string, decodedToken: TokenContents): Promise<boolean> => {
// we need to force sub to be set for all tokens for this to work
const isInvalid = await plugin.providers.kv<string>('invalid-tokens').get(`${(decodedToken as JWTPayload).sub}:${token}`)
const isInvalid = await getKv<boolean>('invalid-tokens').get(`${(decodedToken as JWTPayload).sub}:${token}`)
if (isInvalid) {
return false
}

const wasInvalidatedAt = await plugin.providers.kv<string>('tokens-invalidated-at').get(decodedToken.sub)
const wasInvalidatedAt = await getKv<string>('tokens-invalidated-at').get(decodedToken.sub)
if (wasInvalidatedAt) {
return new Date(wasInvalidatedAt) > new Date()
}
Expand All @@ -126,10 +138,10 @@ const defaultConfig = {
refreshTokenExpiryInSeconds: 60 * 60 * 24, // 24 hours
checkTokenValidity: checkTokenValidityDefault,
invalidateAllTokens: async (sub) => {
await plugin.providers.kv('tokens-invalidated-at').set(sub, new Date().toISOString())
await getKv('tokens-invalidated-at').set(sub, new Date().toISOString())
},
invalidateToken: async (sub, token) => {
await plugin.providers.kv('invalid-tokens').set(`${sub}:${token}`, true)
await getKv('invalid-tokens').set(`${sub}:${token}`, true)
},
reissueBearerToken: (decodedToken) => {
if (process.env.NODE_ENV === 'development') {
Expand Down