Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions convex/_generated/api.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ import type * as users_githubAccount from "../users/githubAccount.js";
import type * as users_internalMutation from "../users/internalMutation.js";
import type * as users_internalQuery from "../users/internalQuery.js";
import type * as users_legal from "../users/legal.js";
import type * as users_migrations from "../users/migrations.js";
import type * as users_mutation from "../users/mutation.js";
import type * as users_query from "../users/query.js";
import type * as users_tables from "../users/tables.js";
Expand Down Expand Up @@ -356,7 +355,6 @@ declare const fullApi: ApiFromModules<{
"users/internalMutation": typeof users_internalMutation;
"users/internalQuery": typeof users_internalQuery;
"users/legal": typeof users_legal;
"users/migrations": typeof users_migrations;
"users/mutation": typeof users_mutation;
"users/query": typeof users_query;
"users/tables": typeof users_tables;
Expand Down
3 changes: 1 addition & 2 deletions convex/schema.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineSchema, defineTable } from "convex/server";
import { v } from "convex/values";
import { legacyAuthTables, usersTable } from "./users/tables";
import { usersTable } from "./users/tables";
import { chatRecoveryTargetValidator } from "./_ai/chatRecovery";
import { reviewBatchResultValidator } from "./pullRequests/review";
import { reviewTraceStepValidator } from "./pullRequests/records";
Expand Down Expand Up @@ -1856,6 +1856,5 @@ const applicationTables = {

export default defineSchema({
users: usersTable,
...legacyAuthTables,
...applicationTables,
});
7 changes: 0 additions & 7 deletions convex/users/internalMutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { v } from "convex/values";
import { vGithubProfile } from "@convex-dev/auth/methods/github/server";
import type { GithubProfile } from "@convex-dev/auth/methods/github/server";
import { internalMutation } from "../_generated/server";
import { readLegacyGitHubUserId } from "./migrations";

const githubSignIn = v.object({
name: v.literal("github"),
Expand Down Expand Up @@ -36,12 +35,6 @@ export const createUserFromGithub = internalMutation({
)
.unique();
if (existing) return existing._id;
// Signed in after the 2.0 deploy but before migrateToAuthV2 linked them.
const legacy = await readLegacyGitHubUserId(ctx, githubAccountId);
if (legacy) {
await ctx.db.patch(legacy, { githubAccountId });
return legacy;
}
return await ctx.db.insert("users", {
...profileFields(method.profile, Date.now()),
githubAccountId: method.profile.id,
Expand Down
87 changes: 0 additions & 87 deletions convex/users/migrations.ts

This file was deleted.

53 changes: 0 additions & 53 deletions convex/users/tables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,56 +17,3 @@ export const usersTable = defineTable({
phoneVerificationTime: v.optional(v.number()),
isAnonymous: v.optional(v.boolean()),
}).index("by_github_account_id", ["githubAccountId"]);

/**
* The tables of @convex-dev/auth 0.0.x. Kept only until migrateToAuthV2 has
* copied each GitHub account into users.githubAccountId, then removed. The
* GitHub auth component records each account on its first 2.0 sign-in.
*/
export const legacyAuthTables = {
authSessions: defineTable({
userId: v.id("users"),
expirationTime: v.number(),
}).index("userId", ["userId"]),
authAccounts: defineTable({
userId: v.id("users"),
provider: v.string(),
providerAccountId: v.string(),
secret: v.optional(v.string()),
emailVerified: v.optional(v.string()),
phoneVerified: v.optional(v.string()),
})
.index("userIdAndProvider", ["userId", "provider"])
.index("providerAndAccountId", ["provider", "providerAccountId"]),
authRefreshTokens: defineTable({
sessionId: v.id("authSessions"),
expirationTime: v.number(),
firstUsedTime: v.optional(v.number()),
parentRefreshTokenId: v.optional(v.id("authRefreshTokens")),
})
.index("sessionId", ["sessionId"])
.index("sessionIdAndParentRefreshTokenId", [
"sessionId",
"parentRefreshTokenId",
]),
authVerificationCodes: defineTable({
accountId: v.id("authAccounts"),
provider: v.string(),
code: v.string(),
expirationTime: v.number(),
verifier: v.optional(v.string()),
emailVerified: v.optional(v.string()),
phoneVerified: v.optional(v.string()),
})
.index("accountId", ["accountId"])
.index("code", ["code"]),
authVerifiers: defineTable({
sessionId: v.optional(v.id("authSessions")),
signature: v.optional(v.string()),
}).index("signature", ["signature"]),
authRateLimits: defineTable({
identifier: v.string(),
lastAttemptTime: v.number(),
attemptsLeft: v.number(),
}).index("identifier", ["identifier"]),
};
10 changes: 1 addition & 9 deletions packages/cli/scripts/test-dev.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,7 @@ async function cleanup() {
const tables = [...schema.matchAll(/^ (\w+): defineTable\(/gm)].map(
(match) => match[1],
);
tables.push(
"users",
"authAccounts",
"authSessions",
"authRefreshTokens",
"authVerificationCodes",
"authVerifiers",
"authRateLimits",
);
tables.push("users");
const readAll = () =>
query(
`const result={};for(const table of ${JSON.stringify(tables)})result[table]=await ctx.db.query(table).take(1001);return result;`,
Expand Down
166 changes: 0 additions & 166 deletions test/convex/users/authV2.test.ts

This file was deleted.

Loading