improve solution

Author: kentcdodds

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

@@ -21,15 +21,17 @@ export async function action({ request, context }: Route.LoaderArgs) {
 
 	const info = tokenData as Token
 
-	if (info.expiresAt < Date.now()) return { active: false }
+	if (info.expiresAt * 1000 < 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),
-		iat: Math.floor(info.createdAt / 1000),
+		exp: info.expiresAt,
+		iat: info.createdAt,
 	}
 }
 

exercises/99.finished/99.solution/src/auth.ts

@@ -3,6 +3,19 @@ import { EPIC_ME_AUTH_SERVER_URL } from './client.ts'
 
 export type AuthInfo = NonNullable<Awaited<ReturnType<typeof getAuthInfo>>>
 
+const introspectResponseSchema = z.discriminatedUnion('active', [
+	z.object({
+		active: z.literal(true),
+		client_id: z.string(),
+		scope: z.string(),
+		sub: z.string(),
+		exp: z.number(),
+	}),
+	z.object({
+		active: z.literal(false),
+	}),
+])
+
 export async function getAuthInfo(request: Request) {
 	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
 	if (!token) return undefined
@@ -17,15 +30,9 @@ export async function getAuthInfo(request: Request) {
 
 	const rawData = await resp.json()
 
-	const data = z
-		.object({
-			active: z.boolean(),
-			client_id: z.string(),
-			scope: z.string(),
-			sub: z.string(),
-			exp: z.number(),
-		})
-		.parse(rawData)
+	const data = introspectResponseSchema.parse(rawData)
+
+	if (!data.active) return undefined
 
 	const { sub, client_id, scope, exp } = data