mirror of
https://github.com/hanzoai/shadcn.git
synced 2026-10-30 18:22:59 +00:00
zeekayandGitHub
5631dbe739
* refactor: decouple @hanzo/ui from hanzogui Make @hanzo/ui shadcn-only — no hanzogui/Tamagui coupling. - remove primitives/bases (gui/admin/svelte/vue) re-exports - drop @hanzogui peerDependencies + peerDependenciesMeta entries - add check-no-hanzogui guard, wired into build - fix latent NodeJS.Timeout types to keep the build green * refactor: remove duplicate @hanzo/brand from the monorepo @hanzo/brand is owned by the standalone hanzoai/brand (the npm-canonical source); this monorepo's copy was unused and had drifted. - delete pkg/brand - add check-no-brand-pkg guard (wired into `check`) so it can't reappear * refactor(ui): stop importing from the app; use own cn util pkg/ui pulled `cn` from @/lib/utils (../../app) — an inverted dependency on the consuming app. Point the animation components at pkg/ui's own cn and drop the @/app, @/registry, @/lib tsconfig path aliases. * fix(ui): type errors; stop tracking the root lockfile - ModelCard: lucide-react dropped the Github icon → use Code - drawer: annotate DrawerTrigger/DrawerClose (radix type portability) - untrack root pnpm-lock.yaml; CI → --no-frozen-lockfile * release: bump @hanzo/ui to 5.7.0 * refactor: rename pkg/ → pkgs/, merge packages/ into it standardize on 'pkgs/': move pkg/* and packages/* into pkgs/. Update workspace globs, CI, scripts, and config references accordingly.
98 lines
2.3 KiB
TypeScript
98 lines
2.3 KiB
TypeScript
import { createCookieSessionStorage, redirect } from "@remix-run/node";
|
|
import invariant from "tiny-invariant";
|
|
|
|
import type { User } from "~/models/user.server";
|
|
import { getUserById } from "~/models/user.server";
|
|
|
|
invariant(process.env.SESSION_SECRET, "SESSION_SECRET must be set");
|
|
|
|
export const sessionStorage = createCookieSessionStorage({
|
|
cookie: {
|
|
name: "__session",
|
|
httpOnly: true,
|
|
path: "/",
|
|
sameSite: "lax",
|
|
secrets: [process.env.SESSION_SECRET],
|
|
secure: process.env.NODE_ENV === "production",
|
|
},
|
|
});
|
|
|
|
const USER_SESSION_KEY = "userId";
|
|
|
|
export async function getSession(request: Request) {
|
|
const cookie = request.headers.get("Cookie");
|
|
return sessionStorage.getSession(cookie);
|
|
}
|
|
|
|
export async function getUserId(
|
|
request: Request,
|
|
): Promise<User["id"] | undefined> {
|
|
const session = await getSession(request);
|
|
const userId = session.get(USER_SESSION_KEY);
|
|
return userId;
|
|
}
|
|
|
|
export async function getUser(request: Request) {
|
|
const userId = await getUserId(request);
|
|
if (userId === undefined) return null;
|
|
|
|
const user = await getUserById(userId);
|
|
if (user) return user;
|
|
|
|
throw await logout(request);
|
|
}
|
|
|
|
export async function requireUserId(
|
|
request: Request,
|
|
redirectTo: string = new URL(request.url).pathname,
|
|
) {
|
|
const userId = await getUserId(request);
|
|
if (!userId) {
|
|
const searchParams = new URLSearchParams([["redirectTo", redirectTo]]);
|
|
throw redirect(`/login?${searchParams}`);
|
|
}
|
|
return userId;
|
|
}
|
|
|
|
export async function requireUser(request: Request) {
|
|
const userId = await requireUserId(request);
|
|
|
|
const user = await getUserById(userId);
|
|
if (user) return user;
|
|
|
|
throw await logout(request);
|
|
}
|
|
|
|
export async function createUserSession({
|
|
request,
|
|
userId,
|
|
remember,
|
|
redirectTo,
|
|
}: {
|
|
request: Request;
|
|
userId: string;
|
|
remember: boolean;
|
|
redirectTo: string;
|
|
}) {
|
|
const session = await getSession(request);
|
|
session.set(USER_SESSION_KEY, userId);
|
|
return redirect(redirectTo, {
|
|
headers: {
|
|
"Set-Cookie": await sessionStorage.commitSession(session, {
|
|
maxAge: remember
|
|
? 60 * 60 * 24 * 7 // 7 days
|
|
: undefined,
|
|
}),
|
|
},
|
|
});
|
|
}
|
|
|
|
export async function logout(request: Request) {
|
|
const session = await getSession(request);
|
|
return redirect("/", {
|
|
headers: {
|
|
"Set-Cookie": await sessionStorage.destroySession(session),
|
|
},
|
|
});
|
|
}
|