fix tests

Author: kentcdodds

epicshop/epic-me/app/routes/introspect.ts

@@ -2,44 +2,37 @@ import { invariantResponse } from '@epic-web/invariant'
 import { type Token } from '#types/helpers'
 import { type Route } from './+types/introspect'
 
-export async function introspectLoader({ request, context }: Route.LoaderArgs) {
+export async function action({ request, context }: Route.LoaderArgs) {
 	const token = (await request.formData()).get('token')?.toString()
-	console.log({ token })
 	invariantResponse(token, 'invalid_request')
 
-	const info = await resolveTokenInfo(token, context.cloudflare.env).catch(
-		() => undefined,
-	)
+	const parts = token.split(':')
+	if (parts.length !== 3) return { active: false }
+
+	const [userId, grantId] = parts
+	const tokenId = await generateTokenId(token)
+	const tokenKey = `token:${userId}:${grantId}:${tokenId}`
 
-	if (!info) return { active: false }
+	const tokenData = await context.cloudflare.env.OAUTH_KV.get(tokenKey, {
+		type: 'json',
+	})
+
+	if (!tokenData) return { active: false }
+
+	const info = tokenData as Token
+
+	if (info.expiresAt < Date.now()) return { active: false }
 
 	return {
 		active: true,
 		client_id: info.grant.clientId,
 		scope: info.grant.scope.join(' '),
 		sub: info.userId,
-		exp: Math.floor(info.expiresAt / 1000), // if you store ms
-		// aud, iss, token_type, iat ... add as useful
+		exp: Math.floor(info.expiresAt / 1000),
+		iat: Math.floor(info.createdAt / 1000),
 	}
 }
 
-async function resolveTokenInfo(
-	token: string,
-	env: Env,
-): Promise<Token | undefined> {
-	const parts = token.split(':')
-	if (parts.length !== 3) throw new Error('Invalid token format')
-
-	const [userId, grantId] = parts
-	const tokenId = await generateTokenId(token)
-	const tokenKey = `token:${userId}:${grantId}:${tokenId}`
-
-	const tokenData = await env.OAUTH_KV.get(tokenKey, { type: 'json' })
-	if (!tokenData) throw new Error('Token not found')
-
-	return tokenData as Token
-}
-
 // copied from @cloudflare/workers-oauth-provider
 async function generateTokenId(token: string) {
 	const encoder = new TextEncoder()

epicshop/epic-me/workers/app.ts

@@ -19,7 +19,7 @@ const defaultHandler = {
 } satisfies ExportedHandler<Env>
 
 const oauthProvider = new OAuthProvider({
-	apiRoute: ['/whoami', '/db-api', '/introspect'],
+	apiRoute: ['/whoami', '/db-api'],
 	// @ts-expect-error these types are wrong...
 	apiHandler: defaultHandler,
 	// @ts-expect-error these types are wrong...