feat: remove legacy auth0 user accounts

graphql-hive · Dec 2, 2024 · c0a9118 · c0a9118
1 parent c273883
commit c0a9118
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 166 deletions.
diff --git a/packages/migrations/src/actions/2024.12.02T00-00-00.legacy-user-org-cleanup.ts b/packages/migrations/src/actions/2024.12.02T00-00-00.legacy-user-org-cleanup.ts
@@ -0,0 +1,31 @@
+import { type MigrationExecutor } from '../pg-migrator';
+
+export default {
+  name: '2024.12.02T00-00-00.legacy-user-org-cleanup.ts',
+  async run({ sql, connection }) {
+    // Delete all the organizations owned by a legacy user
+    await connection.query(sql`
+      DELETE
+      FROM
+        "organizations"
+      WHERE
+        "user_id" = ANY(
+          SELECT
+            "id"
+          FROM
+            "users"
+          WHERE
+            "supertoken_user_id" IS NULL
+        )
+    `);
+
+    // Delete all the legacy users
+    await connection.query(sql`
+      DELETE
+      FROM
+        "users"
+      WHERE
+        "supertoken_user_id" IS NULL
+    `);
+  },
+} satisfies MigrationExecutor;
diff --git a/packages/migrations/src/run-pg-migrations.ts b/packages/migrations/src/run-pg-migrations.ts
@@ -147,5 +147,6 @@ export const runPGMigrations = async (args: { slonik: DatabasePool; runTo?: stri
       await import('./actions/2024.11.12T00-00-00.supertokens-9.1'),
       await import('./actions/2024.11.12T00-00-00.supertokens-9.2'),
       await import('./actions/2024.11.12T00-00-00.supertokens-9.3'),
+      await import('./actions/2024.12.02T00-00-00.legacy-user-org-cleanup'),
     ],
   });
diff --git a/packages/services/api/src/modules/schema/providers/schema-manager.ts b/packages/services/api/src/modules/schema/providers/schema-manager.ts
@@ -969,9 +969,8 @@ export class SchemaManager {
       return null;
     }
 
-    return this.storage.getOrganizationUser({
-      organizationId: args.organizationId,
-      userId: args.userId,
+    return this.storage.getUserById({
+      id: args.userId,
     });
   }
 

diff --git a/packages/services/api/src/modules/shared/providers/storage.ts b/packages/services/api/src/modules/shared/providers/storage.ts
@@ -69,7 +69,6 @@ export interface Storage {
   isReady(): Promise<boolean>;
   ensureUserExists(_: {
     superTokensUserId: string;
-    externalAuthUserId?: string | null;
     email: string;
     oidcIntegration: null | {
       id: string;
@@ -848,11 +847,6 @@ export interface Storage {
 
   getTargetBreadcrumbForTargetId(_: { targetId: string }): Promise<TargetBreadcrumb | null>;
 
-  /**
-   * Get an user that belongs to a specific organization by id.
-   */
-  getOrganizationUser(_: { organizationId: string; userId: string }): Promise<User | null>;
-
   // Zendesk
   setZendeskUserId(_: { userId: string; zendeskId: string }): Promise<void>;
   setZendeskOrganizationId(_: { organizationId: string; zendeskId: string }): Promise<void>;

diff --git a/packages/services/api/src/shared/entities.ts b/packages/services/api/src/shared/entities.ts
@@ -192,6 +192,7 @@ export interface Organization {
     appDeployments: boolean;
   };
   zendeskId: string | null;
+  ownerId: string;
 }
 
 export interface OrganizationInvitation {
@@ -330,7 +331,6 @@ export interface User {
   provider: AuthProvider;
   superTokensUserId: string | null;
   isAdmin: boolean;
-  externalAuthUserId: string | null;
   oidcIntegrationId: string | null;
   zendeskId: string | null;
 }