Remove unused Better Auth OAuth and JWKS tables (#188)

drizzle/0015_huge_celestials.sql

@@ -0,0 +1,5 @@
+DROP TABLE `oauth_consent`;--> statement-breakpoint
+DROP TABLE `oauth_access_token`;--> statement-breakpoint
+DROP TABLE `oauth_refresh_token`;--> statement-breakpoint
+DROP TABLE `oauth_client`;--> statement-breakpoint
+DROP TABLE `jwks`;

drizzle/meta/_journal.json

@@ -106,6 +106,13 @@
       "when": 1778750000000,
       "tag": "0014_tag_color",
       "breakpoints": true
+    },
+    {
+      "idx": 15,
+      "version": "6",
+      "when": 1778750000001,
+      "tag": "0015_huge_celestials",
+      "breakpoints": true
     }
   ]
 }

src/db/better-auth-schema.ts

@@ -151,116 +151,18 @@ export const invitation = sqliteTable(
   ],
 );
 
-export const jwks = sqliteTable("jwks", {
-  id: text("id").primaryKey(),
-  publicKey: text("public_key").notNull(),
-  privateKey: text("private_key").notNull(),
-  createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
-  expiresAt: integer("expires_at", { mode: "timestamp_ms" }),
-});
-
-export const oauthClient = sqliteTable("oauth_client", {
-  id: text("id").primaryKey(),
-  clientId: text("client_id").notNull().unique(),
-  clientSecret: text("client_secret"),
-  disabled: integer("disabled", { mode: "boolean" }).default(false),
-  skipConsent: integer("skip_consent", { mode: "boolean" }),
-  enableEndSession: integer("enable_end_session", { mode: "boolean" }),
-  subjectType: text("subject_type"),
-  scopes: text("scopes", { mode: "json" }),
-  userId: text("user_id").references(() => user.id, { onDelete: "cascade" }),
-  createdAt: integer("created_at", { mode: "timestamp_ms" }),
-  updatedAt: integer("updated_at", { mode: "timestamp_ms" }),
-  name: text("name"),
-  uri: text("uri"),
-  icon: text("icon"),
-  contacts: text("contacts", { mode: "json" }),
-  tos: text("tos"),
-  policy: text("policy"),
-  softwareId: text("software_id"),
-  softwareVersion: text("software_version"),
-  softwareStatement: text("software_statement"),
-  redirectUris: text("redirect_uris", { mode: "json" }).notNull(),
-  postLogoutRedirectUris: text("post_logout_redirect_uris", { mode: "json" }),
-  tokenEndpointAuthMethod: text("token_endpoint_auth_method"),
-  grantTypes: text("grant_types", { mode: "json" }),
-  responseTypes: text("response_types", { mode: "json" }),
-  public: integer("public", { mode: "boolean" }),
-  type: text("type"),
-  requirePKCE: integer("require_pkce", { mode: "boolean" }),
-  referenceId: text("reference_id"),
-  metadata: text("metadata", { mode: "json" }),
-});
-
-export const oauthRefreshToken = sqliteTable("oauth_refresh_token", {
-  id: text("id").primaryKey(),
-  token: text("token").notNull(),
-  clientId: text("client_id")
-    .notNull()
-    .references(() => oauthClient.clientId, { onDelete: "cascade" }),
-  sessionId: text("session_id").references(() => session.id, {
-    onDelete: "set null",
-  }),
-  userId: text("user_id")
-    .notNull()
-    .references(() => user.id, { onDelete: "cascade" }),
-  referenceId: text("reference_id"),
-  expiresAt: integer("expires_at", { mode: "timestamp_ms" }).notNull(),
-  createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
-  revoked: integer("revoked", { mode: "timestamp_ms" }),
-  authTime: integer("auth_time", { mode: "timestamp_ms" }),
-  scopes: text("scopes", { mode: "json" }).notNull(),
-});
-
-export const oauthAccessToken = sqliteTable("oauth_access_token", {
-  id: text("id").primaryKey(),
-  token: text("token").notNull().unique(),
-  clientId: text("client_id")
-    .notNull()
-    .references(() => oauthClient.clientId, { onDelete: "cascade" }),
-  sessionId: text("session_id").references(() => session.id, {
-    onDelete: "set null",
-  }),
-  userId: text("user_id").references(() => user.id, { onDelete: "cascade" }),
-  referenceId: text("reference_id"),
-  refreshId: text("refresh_id").references(() => oauthRefreshToken.id, {
-    onDelete: "cascade",
-  }),
-  expiresAt: integer("expires_at", { mode: "timestamp_ms" }).notNull(),
-  createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
-  scopes: text("scopes", { mode: "json" }).notNull(),
-});
-
-export const oauthConsent = sqliteTable("oauth_consent", {
-  id: text("id").primaryKey(),
-  clientId: text("client_id")
-    .notNull()
-    .references(() => oauthClient.clientId, { onDelete: "cascade" }),
-  userId: text("user_id").references(() => user.id, { onDelete: "cascade" }),
-  referenceId: text("reference_id"),
-  scopes: text("scopes", { mode: "json" }).notNull(),
-  createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
-  updatedAt: integer("updated_at", { mode: "timestamp_ms" }).notNull(),
-});
-
 export const userRelations = relations(user, ({ many }) => ({
   sessions: many(session),
   accounts: many(account),
   members: many(member),
   invitations: many(invitation),
-  oauthClients: many(oauthClient),
-  oauthRefreshTokens: many(oauthRefreshToken),
-  oauthAccessTokens: many(oauthAccessToken),
-  oauthConsents: many(oauthConsent),
 }));
 
-export const sessionRelations = relations(session, ({ one, many }) => ({
+export const sessionRelations = relations(session, ({ one }) => ({
   user: one(user, {
     fields: [session.userId],
     references: [user.id],
   }),
-  oauthRefreshTokens: many(oauthRefreshToken),
-  oauthAccessTokens: many(oauthAccessToken),
 }));
 
 export const accountRelations = relations(account, ({ one }) => ({
@@ -296,65 +198,3 @@ export const invitationRelations = relations(invitation, ({ one }) => ({
     references: [user.id],
   }),
 }));
-
-export const oauthClientRelations = relations(oauthClient, ({ one, many }) => ({
-  user: one(user, {
-    fields: [oauthClient.userId],
-    references: [user.id],
-  }),
-  oauthRefreshTokens: many(oauthRefreshToken),
-  oauthAccessTokens: many(oauthAccessToken),
-  oauthConsents: many(oauthConsent),
-}));
-
-export const oauthRefreshTokenRelations = relations(
-  oauthRefreshToken,
-  ({ one, many }) => ({
-    oauthClient: one(oauthClient, {
-      fields: [oauthRefreshToken.clientId],
-      references: [oauthClient.clientId],
-    }),
-    session: one(session, {
-      fields: [oauthRefreshToken.sessionId],
-      references: [session.id],
-    }),
-    user: one(user, {
-      fields: [oauthRefreshToken.userId],
-      references: [user.id],
-    }),
-    oauthAccessTokens: many(oauthAccessToken),
-  }),
-);
-
-export const oauthAccessTokenRelations = relations(
-  oauthAccessToken,
-  ({ one }) => ({
-    oauthClient: one(oauthClient, {
-      fields: [oauthAccessToken.clientId],
-      references: [oauthClient.clientId],
-    }),
-    session: one(session, {
-      fields: [oauthAccessToken.sessionId],
-      references: [session.id],
-    }),
-    user: one(user, {
-      fields: [oauthAccessToken.userId],
-      references: [user.id],
-    }),
-    oauthRefreshToken: one(oauthRefreshToken, {
-      fields: [oauthAccessToken.refreshId],
-      references: [oauthRefreshToken.id],
-    }),
-  }),
-);
-
-export const oauthConsentRelations = relations(oauthConsent, ({ one }) => ({
-  oauthClient: one(oauthClient, {
-    fields: [oauthConsent.clientId],
-    references: [oauthClient.clientId],
-  }),
-  user: one(user, {
-    fields: [oauthConsent.userId],
-    references: [user.id],
-  }),
-}));