Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove lucia as it will be deprecating soon #26

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is a Next.js template which includes the following technology

- next.js (app router)
- drizzle orm
- lucia auth
- auth with artic and oslo
- sqlite (or turso)
- shadcn
- react hook form
Expand Down
54 changes: 36 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"dependencies": {
"@hookform/resolvers": "^3.4.2",
"@libsql/client": "0.6.1",
"@lucia-auth/adapter-drizzle": "^1.0.7",
"@oslojs/crypto": "^1.0.1",
"@oslojs/encoding": "^1.1.0",
"@radix-ui/react-avatar": "^1.0.4",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-label": "^2.1.0",
Expand All @@ -28,7 +29,6 @@
"clsx": "2.1.1",
"dotenv": "16.4.5",
"drizzle-orm": "0.30.10",
"lucia": "3.2.0",
"lucide-react": "0.381.0",
"next": "14.2.3",
"next-themes": "0.3.0",
Expand Down
15 changes: 4 additions & 11 deletions src/app/api/sign-out/route.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { lucia, validateRequest } from "@/lib/auth";
import { cookies } from "next/headers";
import { invalidateSession, validateRequest } from "@/lib/auth";
import { redirect } from "next/navigation";

export async function GET(): Promise<Response> {
Expand All @@ -9,13 +8,7 @@ export async function GET(): Promise<Response> {
if (!session) {
redirect("/sign-in");
}

await lucia.invalidateSession(session.id);
const sessionCookie = lucia.createBlankSessionCookie();
cookies().set(
sessionCookie.name,
sessionCookie.value,
sessionCookie.attributes,
);
await invalidateSession(session.id);

redirect("/signed-out");
}
}
2 changes: 1 addition & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const metadata: Metadata = {
{ rel: "icon", type: "image/png", sizes: "48x48", url: "/favicon.ico" },
],
keywords: "yolo",
description: "A simple next.js template including drizzle and lucia auth",
description: "A simple next.js template including drizzle and auth with artic and oslo",
};

export default async function RootLayout({
Expand Down
1 change: 1 addition & 0 deletions src/db/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@ export const sessions = sqliteTable("session", {

export type User = typeof users.$inferSelect;
export type Profile = typeof profiles.$inferSelect;
export type Session = typeof sessions.$inferSelect;
153 changes: 84 additions & 69 deletions src/lib/auth.ts
Original file line number Diff line number Diff line change
@@ -1,82 +1,97 @@

import { GitHub, Google } from "arctic";
import { Lucia } from "lucia";
import { DrizzleSQLiteAdapter } from "@lucia-auth/adapter-drizzle";
import { db } from "@/db";
import { sessions, users } from "@/db/schema";
import { cookies } from "next/headers";
import { User } from "lucia";
import { Session } from "lucia";
import {
encodeBase32LowerCaseNoPadding,
encodeHexLowerCase,
} from "@oslojs/encoding";
import { Session, sessions, User, users } from "@/db/schema";
import { env } from "@/env";
import { UserId as CustomUserId } from "@/types";

const adapter = new DrizzleSQLiteAdapter(db, sessions, users);

export const lucia = new Lucia(adapter, {
sessionCookie: {
expires: false,
attributes: {
secure: process.env.NODE_ENV === "production",
},
},
getUserAttributes: (attributes) => {
return {
id: attributes.id,
};
},
});

export const validateRequest = async (): Promise<
{ user: User; session: Session } | { user: null; session: null }
> => {
const sessionId = cookies().get(lucia.sessionCookieName)?.value ?? null;
if (!sessionId) {
return {
user: null,
session: null,
};
}
import { eq } from "drizzle-orm";
import { sha256 } from "@oslojs/crypto/sha2";
import { UserId } from "@/types";
import { getSessionToken } from "../lib/session";
const SESSION_REFRESH_INTERVAL_MS = 1000 * 60 * 60 * 24 * 15;
const SESSION_MAX_DURATION_MS = SESSION_REFRESH_INTERVAL_MS * 2;

const result = await lucia.validateSession(sessionId);

// next.js throws when you attempt to set cookie when rendering page
try {
if (result.session && result.session.fresh) {
const sessionCookie = lucia.createSessionCookie(result.session.id);
cookies().set(
sessionCookie.name,
sessionCookie.value,
sessionCookie.attributes,
);
}
if (!result.session) {
const sessionCookie = lucia.createBlankSessionCookie();
cookies().set(
sessionCookie.name,
sessionCookie.value,
sessionCookie.attributes,
);
}
} catch {}
return result;
};

declare module "lucia" {
interface Register {
Lucia: typeof lucia;
DatabaseUserAttributes: {
id: CustomUserId;
};
UserId: CustomUserId;
}
}

export const github = new GitHub(
env.GITHUB_CLIENT_ID,
env.GITHUB_CLIENT_SECRET,
env.GITHUB_CLIENT_SECRET
);

export const googleAuth = new Google(
env.GOOGLE_CLIENT_ID,
env.GOOGLE_CLIENT_SECRET,
`${env.HOST_NAME}/api/login/google/callback`,
`${env.HOST_NAME}/api/login/google/callback`
);
export function generateSessionToken(): string {
const bytes = new Uint8Array(20);
crypto.getRandomValues(bytes);
const token = encodeBase32LowerCaseNoPadding(bytes);
return token;
}
export async function createSession(
token: string,
userId: number
): Promise<Session> {
const sessionId = encodeHexLowerCase(sha256(new TextEncoder().encode(token)));
const session: Session = {
id: sessionId,
userId,
expiresAt: Date.now() + SESSION_MAX_DURATION_MS,
};
await db.insert(sessions).values(session);
return session;
}
export async function validateRequest(): Promise<SessionValidationResult> {
const sessionToken = getSessionToken();
if (!sessionToken) {
return { session: null, user: null };
}
return validateSessionToken(sessionToken);
}
export async function validateSessionToken(
token: string
): Promise<SessionValidationResult> {
const sessionId = encodeHexLowerCase(sha256(new TextEncoder().encode(token)));
const sessionInDb = await db.query.sessions.findFirst({
where: eq(sessions.id, sessionId),
});
if (!sessionInDb) {
return { session: null, user: null };
}
if (Date.now() >= new Date(sessionInDb.expiresAt).getTime()) {
await db.delete(sessions).where(eq(sessions.id, sessionInDb.id));
return { session: null, user: null };
}
const user = await db.query.users.findFirst({
where: eq(users.id, sessionInDb.userId),
});
if (!user) {
await db.delete(sessions).where(eq(sessions.id, sessionInDb.id));
return { session: null, user: null };
}
if (
Date.now() >=
new Date(sessionInDb.expiresAt).getTime() - SESSION_REFRESH_INTERVAL_MS
) {
sessionInDb.expiresAt = Date.now() + SESSION_MAX_DURATION_MS;
await db
.update(sessions)
.set({
expiresAt: sessionInDb.expiresAt,
})
.where(eq(sessions.id, sessionInDb.id));
}
return { session: sessionInDb, user };
}
export async function invalidateSession(sessionId: string): Promise<void> {
await db.delete(sessions).where(eq(sessions.id, sessionId));
}
export async function invalidateUserSessions(userId: UserId): Promise<void> {
await db.delete(sessions).where(eq(users.id, userId));
}
export type SessionValidationResult =
| { session: Session; user: User }
| { session: null; user: null };
48 changes: 32 additions & 16 deletions src/lib/session.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,37 @@
import "server-only";
import { cookies } from "next/headers";
import { lucia } from "@/lib/auth";
import { validateRequest } from "@/lib/auth";
import { cache } from "react";
import { AuthenticationError } from "../use-cases/errors";
import { createSession, generateSessionToken, validateRequest } from "@/lib/auth";
import { cache } from "react";
import { cookies } from "next/headers";
import { UserId } from "@/use-cases/types";

const SESSION_COOKIE_NAME = "session";
export function setSessionTokenCookie(token: string, expiresAt: Date): void {
cookies().set(SESSION_COOKIE_NAME, token, {
httpOnly: true,
sameSite: "lax",
secure: process.env.NODE_ENV === "production",
expires: expiresAt,
path: "/",
});
}

export function deleteSessionTokenCookie(): void {
cookies().set(SESSION_COOKIE_NAME, "", {
httpOnly: true,
sameSite: "lax",
secure: process.env.NODE_ENV === "production",
maxAge: 0,
path: "/",
});
}
export function getSessionToken(): string | undefined {
return cookies().get(SESSION_COOKIE_NAME)?.value;
}

export const getCurrentUser = cache(async () => {
const session = await validateRequest();
if (!session.user) {
return undefined;
}
return session.user;
const { user } = await validateRequest();
return user;
});

export const assertAuthenticated = async () => {
Expand All @@ -23,11 +43,7 @@ export const assertAuthenticated = async () => {
};

export async function setSession(userId: UserId) {
const session = await lucia.createSession(userId, {});
const sessionCookie = lucia.createSessionCookie(session.id);
cookies().set(
sessionCookie.name,
sessionCookie.value,
sessionCookie.attributes,
);
const token = generateSessionToken();
const session = await createSession(token, userId);
setSessionTokenCookie(token, new Date(session.expiresAt));
}