diff --git a/src/actions/oauth/callback.ts b/src/actions/oauth/callback.ts index e9be6a4..190af4f 100644 --- a/src/actions/oauth/callback.ts +++ b/src/actions/oauth/callback.ts @@ -10,7 +10,7 @@ import { generateUsernameFromEmail, generateRandomUsername } from "~/utils/usern import { oauthAccount, user } from "~/db/schema.ts"; import { OAuth2RequestError } from "arctic"; -import { generateId } from "lucia"; +import { generateIdFromEntropySize } from "lucia"; import { and, eq } from "drizzle-orm/expressions"; import { lucia } from "~/auth/auth.ts"; @@ -152,7 +152,7 @@ export async function handler(props: z.infer) { } // Perform a transaction to create the user and link the OAuth account atomically - const userId = generateId(15); + const userId = generateIdFromEntropySize(15); await db.transaction(async (tr) => { const existingUsers = await tr.select().from(user).where(eq(user.email, providerUser.email)); let userData = existingUsers[0]; diff --git a/src/actions/oauth/request.ts b/src/actions/oauth/request.ts index 1898841..98cc2db 100644 --- a/src/actions/oauth/request.ts +++ b/src/actions/oauth/request.ts @@ -4,7 +4,7 @@ import { Result } from "@oxi/result"; import { z } from "zod"; import { generateCodeVerifier, generateState } from "arctic"; -import { generateId } from "lucia"; +import { generateIdFromEntropySize } from "lucia"; import { github } from "~/auth/github.ts"; import { google } from "~/auth/google.ts"; @@ -75,7 +75,7 @@ export async function handler(props: z.infer) { // Insert the state and code verifier into the database await AstroDB.insert(OAuthRequests).values({ - id: generateId(16), + id: generateIdFromEntropySize(16), state, codeVerifier, provider,