migrate auth.user.teamId to orgId (#312)

Signed-off-by: Aaron Sutula <[email protected]> Co-authored-by: Aaron Sutula <[email protected]>
tablelandnetwork · Aug 13, 2024 · b7788fa · b7788fa · vercel · Aug 13, 2024
1 parent cc22f0c
commit b7788fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/api/src/trpc.ts b/packages/api/src/trpc.ts
@@ -77,11 +77,20 @@ export interface GetSessionArgs {
 export const createTRPCContext = async (args: GetSessionArgs) => {
   const session = await getSession(args);
 
-  // Migrate personalTeam to personalOrg.
+  // Migrate personalTeam to personalOrg and teamId to orgId.
   // TODO: Remove this after it runs for a while.
+  let dirty = false;
   if (session.auth?.personalTeam) {
     session.auth.personalOrg = session.auth.personalTeam;
     session.auth.personalTeam = undefined;
+    dirty = true;
+  }
+  if (session.auth?.user.teamId) {
+    session.auth.user.orgId = session.auth.user.teamId;
+    session.auth.user.teamId = undefined;
+    dirty = true;
+  }
+  if (dirty) {
     await session.save();
   }
 

diff --git a/packages/store/src/schema/index.ts b/packages/store/src/schema/index.ts
@@ -178,7 +178,10 @@ export type NewDef = InferInsertModel<typeof defs>;
 export type UserSealed = InferSelectModel<typeof users>;
 export type NewUserSealed = InferInsertModel<typeof users>;
 
-export type User = Omit<UserSealed, "sealed"> & { email?: string };
+export type User = Omit<UserSealed, "sealed"> & {
+  email?: string;
+  teamId?: string; // TODO: remove this after running the migration for a while.
+};
 export type NewUser = Omit<NewUserSealed, "sealed"> & {
   email?: string;
 };