migrate session data in trpc context creating function

Signed-off-by: Aaron Sutula <[email protected]>

packages/api/src/trpc.ts

@@ -8,7 +8,7 @@ import { type Store } from "@tableland/studio-store";
 import { TRPCError, initTRPC } from "@trpc/server";
 import superjson from "superjson";
 import { ZodError, z } from "zod";
-import { type IronSession, getIronSession } from "iron-session";
+import { getIronSession } from "iron-session";
 import { type SessionData, sessionOptions } from "./session-data";
 
 // TODO: the types and interfaces below are from iron-session, but they aren't exported.
@@ -77,6 +77,14 @@ export interface GetSessionArgs {
 export const createTRPCContext = async (args: GetSessionArgs) => {
   const session = await getSession(args);
 
+  // Migrate personalTeam to personalOrg.
+  // TODO: Remove this after it runs for a while.
+  if (session.auth?.personalTeam) {
+    session.auth.personalOrg = session.auth.personalTeam;
+    session.auth.personalTeam = undefined;
+    await session.save();
+  }
+
   logTrpcSource(args.headers, session);
 
   return { session };
@@ -88,26 +96,15 @@ export const getSession = async function ({
   req,
   res,
 }: GetSessionArgs) {
-  let session: IronSession<SessionData> | undefined;
   if (typeof cookies !== "undefined") {
-    session = await getIronSession<SessionData>(cookies, sessionOptions);
+    return await getIronSession<SessionData>(cookies, sessionOptions);
   }
   if (typeof req !== "undefined" && typeof res !== "undefined") {
-    session = await getIronSession<SessionData>(req, res, sessionOptions);
+    return await getIronSession<SessionData>(req, res, sessionOptions);
   }
-  if (!session) {
-    throw new Error(
-      "cannot get session from context must supply cookies or req and res",
-    );
-  }
-
-  if (session.auth?.personalTeam) {
-    session.auth.personalOrg = session.auth.personalTeam;
-    session.auth.personalTeam = undefined;
-    await session.save();
-  }
-
-  return session;
+  throw new Error(
+    "cannot get session from context must supply cookies or req and res",
+  );
 };
 
 // get a header from either of the accepted header types