consolidated code to userId.ts

AlexErrant · Sep 1, 2023 · 087c538 · 087c538
1 parent 7dc352e
commit 087c538
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 106 deletions.
diff --git a/api-ugc/src/env.ts b/api-ugc/src/env.ts
diff --git a/api-ugc/src/index.ts b/api-ugc/src/index.ts
@@ -10,9 +10,14 @@
 
 import { Hono } from 'hono'
 import { cors } from 'hono/cors'
-import { type Env, type ApiUgcContext, getUserId } from './util'
+import { type Env, type ApiUgcContext } from './util'
 import { hstsName, hstsValue, type Base64, parsePublicToken } from 'shared'
-import { setKysely, lookupMediaHash, binary16fromBase64URL } from 'shared-edge'
+import {
+	setKysely,
+	lookupMediaHash,
+	binary16fromBase64URL,
+	getUserId,
+} from 'shared-edge'
 import { appRouter } from './router'
 import { fetchRequestHandler } from '@trpc/server/adapters/fetch'
 import { createContext } from './trpc'

diff --git a/api-ugc/src/util.ts b/api-ugc/src/util.ts
@@ -1,14 +1,4 @@
 import { type Context } from 'hono'
-import { type JWTVerifyResult, jwtVerify } from 'jose'
-import {
-	type Result,
-	type UserId,
-	csrfHeaderName,
-	toError,
-	hubSessionCookieName,
-	toOk,
-} from 'shared'
-import { getHubSessionSecret } from './env'
 
 export type ApiUgcContext = Context<{
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -31,37 +21,3 @@ export type Env = {
 	hubOrigin: string
 	hubSessionSecret: string
 }
-
-// changes to this should be copied to CB799051-C477-4F6A-9251-AAF63C347F3A
-export async function getUserId(
-	c: ApiUgcContext,
-): Promise<Result<UserId, Response>> {
-	// https://github.com/honojs/hono/pull/884
-	if (c.req.header(csrfHeaderName) == null) {
-		return toError(c.text(`Missing '${csrfHeaderName}' header`, 401))
-	}
-	const hubSession = c.req.cookie(hubSessionCookieName)
-	if (hubSession == null) {
-		return toError(c.text(`Missing '${hubSessionCookieName}' cookie.`, 401))
-	} else {
-		let verifyResult: JWTVerifyResult
-		try {
-			verifyResult = await jwtVerify(
-				hubSession,
-				getHubSessionSecret(c.env.hubSessionSecret),
-			)
-		} catch {
-			return toError(
-				c.text(
-					`Failed to verify JWT in '${hubSessionCookieName}' cookie.`,
-					401,
-				),
-			)
-		}
-		if (verifyResult.payload.sub == null) {
-			return toError(c.text("There's no sub claim, ya goof.", 401))
-		} else {
-			return toOk(verifyResult.payload.sub as UserId)
-		}
-	}
-}
diff --git a/cwa/src/env.ts b/cwa/src/env.ts
diff --git a/cwa/src/index.ts b/cwa/src/index.ts
@@ -10,7 +10,7 @@
 
 import { Hono } from 'hono'
 import { cors } from 'hono/cors'
-import { type Env, getUserId, type MediaHash, type CwaContext } from './util'
+import { type Env, type MediaHash, type CwaContext } from './util'
 import {
 	hstsName,
 	hstsValue,
@@ -29,6 +29,7 @@ import {
 	fromBase64,
 	userOwnsNoteAndHasMedia,
 	userOwnsTemplateAndHasMedia,
+	getUserId,
 } from 'shared-edge'
 import { connect } from '@planetscale/database'
 import { buildPrivateToken } from './privateToken'

diff --git a/cwa/src/util.ts b/cwa/src/util.ts
@@ -8,7 +8,6 @@ import {
 	toError,
 	toOk,
 } from 'shared'
-import { getHubSessionSecret } from './env'
 import { type MediaTokenSecretBase64 } from './privateToken'
 
 // https://gist.github.com/72lions/4528834
@@ -46,37 +45,3 @@ export type Env = {
 	peerSyncPublicKey: string
 	peerSyncPrivateKey: string
 }
-
-// changes to this should be copied to CB799051-C477-4F6A-9251-AAF63C347F3A
-export async function getUserId(
-	c: CwaContext,
-): Promise<Result<UserId, Response>> {
-	// https://github.com/honojs/hono/pull/884
-	if (c.req.header(csrfHeaderName) == null) {
-		return toError(c.text(`Missing '${csrfHeaderName}' header`, 401))
-	}
-	const hubSession = c.req.cookie(hubSessionCookieName)
-	if (hubSession == null) {
-		return toError(c.text(`Missing '${hubSessionCookieName}' cookie.`, 401))
-	} else {
-		let verifyResult: JWTVerifyResult
-		try {
-			verifyResult = await jwtVerify(
-				hubSession,
-				getHubSessionSecret(c.env.hubSessionSecret),
-			)
-		} catch {
-			return toError(
-				c.text(
-					`Failed to verify JWT in '${hubSessionCookieName}' cookie.`,
-					401,
-				),
-			)
-		}
-		if (verifyResult.payload.sub == null) {
-			return toError(c.text("There's no sub claim, ya goof.", 401))
-		} else {
-			return toOk(verifyResult.payload.sub as UserId)
-		}
-	}
-}
diff --git a/shared-edge/src/index.ts b/shared-edge/src/index.ts
@@ -3,3 +3,4 @@ export * from './kysely.js'
 export * from './nook.js'
 export * from './utility.js'
 export * from './user.js'
+export * from './userId.js'
diff --git a/shared-edge/src/userId.ts b/shared-edge/src/userId.ts
@@ -0,0 +1,56 @@
+import { type JWTVerifyResult, jwtVerify } from 'jose'
+import {
+	type Result,
+	type UserId,
+	csrfHeaderName,
+	toError,
+	hubSessionCookieName,
+	toOk,
+} from 'shared'
+import { type Context } from 'hono'
+import { base64ToArray } from './utility'
+
+export async function getUserId<T extends { hubSessionSecret: string }>(
+	c: Context<{
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		Bindings: T
+	}>,
+): Promise<Result<UserId, Response>> {
+	// https://github.com/honojs/hono/pull/884
+	if (c.req.header(csrfHeaderName) == null) {
+		return toError(c.text(`Missing '${csrfHeaderName}' header`, 401))
+	}
+	const hubSession = c.req.cookie(hubSessionCookieName)
+	if (hubSession == null) {
+		return toError(c.text(`Missing '${hubSessionCookieName}' cookie.`, 401))
+	} else {
+		let verifyResult: JWTVerifyResult
+		try {
+			verifyResult = await jwtVerify(
+				hubSession,
+				getHubSessionSecret(c.env.hubSessionSecret),
+			)
+		} catch {
+			return toError(
+				c.text(
+					`Failed to verify JWT in '${hubSessionCookieName}' cookie.`,
+					401,
+				),
+			)
+		}
+		if (verifyResult.payload.sub == null) {
+			return toError(c.text("There's no sub claim, ya goof.", 401))
+		} else {
+			return toOk(verifyResult.payload.sub as UserId)
+		}
+	}
+}
+
+let hubSessionSecret: null | Uint8Array = null
+
+function getHubSessionSecret(hubSessionSecretString: string): Uint8Array {
+	if (hubSessionSecret === null) {
+		hubSessionSecret = base64ToArray(hubSessionSecretString)
+	}
+	return hubSessionSecret
+}