This commit is contained in:
@@ -121,6 +121,15 @@ export default function ClientPortalPage({
|
|||||||
const [sessionLabel, setSessionLabel] = useState<string>('');
|
const [sessionLabel, setSessionLabel] = useState<string>('');
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [collapsedEpisodes, setCollapsedEpisodes] = useState<Set<string>>(new Set());
|
||||||
|
|
||||||
|
const toggleEpisode = (ep: string) => {
|
||||||
|
setCollapsedEpisodes((prev) => {
|
||||||
|
const next = new Set(prev);
|
||||||
|
if (next.has(ep)) next.delete(ep); else next.add(ep);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
params.then(({ token: t }) => {
|
params.then(({ token: t }) => {
|
||||||
@@ -166,15 +175,6 @@ export default function ClientPortalPage({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const [collapsedEpisodes, setCollapsedEpisodes] = useState<Set<string>>(new Set());
|
|
||||||
const toggleEpisode = (ep: string) => {
|
|
||||||
setCollapsedEpisodes((prev) => {
|
|
||||||
const next = new Set(prev);
|
|
||||||
if (next.has(ep)) next.delete(ep); else next.add(ep);
|
|
||||||
return next;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const allTasks = [...shots.flatMap((s) => s.tasks), ...assetTasks];
|
const allTasks = [...shots.flatMap((s) => s.tasks), ...assetTasks];
|
||||||
const totalTasks = allTasks.length;
|
const totalTasks = allTasks.length;
|
||||||
const approved = allTasks.filter(
|
const approved = allTasks.filter(
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import type { NextAuthConfig } from "next-auth";
|
||||||
|
import type { Role } from "@prisma/client";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Edge-safe auth config — no Prisma, no bcryptjs.
|
||||||
|
* Used by middleware (Edge Runtime) for JWT verification only.
|
||||||
|
* The full auth config (with Credentials provider + Prisma adapter) lives in auth.ts.
|
||||||
|
*/
|
||||||
|
export const authConfig: NextAuthConfig = {
|
||||||
|
session: { strategy: "jwt" },
|
||||||
|
pages: {
|
||||||
|
signIn: "/login",
|
||||||
|
},
|
||||||
|
callbacks: {
|
||||||
|
async jwt({ token, user }) {
|
||||||
|
if (user) {
|
||||||
|
token.id = user.id;
|
||||||
|
token.role = (user as { role: Role }).role;
|
||||||
|
token.mustChangePassword =
|
||||||
|
(user as { mustChangePassword?: boolean }).mustChangePassword ?? false;
|
||||||
|
}
|
||||||
|
return token;
|
||||||
|
},
|
||||||
|
async session({ session, token }) {
|
||||||
|
if (token && session.user) {
|
||||||
|
session.user.id = token.id as string;
|
||||||
|
session.user.role = token.role as Role;
|
||||||
|
session.user.mustChangePassword = token.mustChangePassword as boolean;
|
||||||
|
}
|
||||||
|
return session;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
// No providers here — Credentials provider (bcryptjs) only in auth.ts
|
||||||
|
providers: [],
|
||||||
|
};
|
||||||
@@ -3,32 +3,11 @@ import { PrismaAdapter } from "@auth/prisma-adapter";
|
|||||||
import Credentials from "next-auth/providers/credentials";
|
import Credentials from "next-auth/providers/credentials";
|
||||||
import { db } from "@/lib/db";
|
import { db } from "@/lib/db";
|
||||||
import bcrypt from "bcryptjs";
|
import bcrypt from "bcryptjs";
|
||||||
import { Role } from "@prisma/client";
|
import { authConfig } from "@/auth.config";
|
||||||
|
|
||||||
export const { handlers, auth, signIn, signOut } = NextAuth({
|
export const { handlers, auth, signIn, signOut } = NextAuth({
|
||||||
|
...authConfig,
|
||||||
adapter: PrismaAdapter(db) as any,
|
adapter: PrismaAdapter(db) as any,
|
||||||
session: { strategy: "jwt" },
|
|
||||||
pages: {
|
|
||||||
signIn: "/login",
|
|
||||||
},
|
|
||||||
callbacks: {
|
|
||||||
async jwt({ token, user }) {
|
|
||||||
if (user) {
|
|
||||||
token.id = user.id;
|
|
||||||
token.role = (user as { role: Role }).role;
|
|
||||||
token.mustChangePassword = (user as { mustChangePassword?: boolean }).mustChangePassword ?? false;
|
|
||||||
}
|
|
||||||
return token;
|
|
||||||
},
|
|
||||||
async session({ session, token }) {
|
|
||||||
if (token && session.user) {
|
|
||||||
session.user.id = token.id as string;
|
|
||||||
session.user.role = token.role as Role;
|
|
||||||
session.user.mustChangePassword = token.mustChangePassword as boolean;
|
|
||||||
}
|
|
||||||
return session;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
providers: [
|
providers: [
|
||||||
Credentials({
|
Credentials({
|
||||||
name: "credentials",
|
name: "credentials",
|
||||||
|
|||||||
+4
-1
@@ -1,6 +1,9 @@
|
|||||||
import { auth } from "@/auth";
|
import NextAuth from "next-auth";
|
||||||
|
import { authConfig } from "@/auth.config";
|
||||||
import { NextResponse } from "next/server";
|
import { NextResponse } from "next/server";
|
||||||
|
|
||||||
|
const { auth } = NextAuth(authConfig);
|
||||||
|
|
||||||
export default auth((req) => {
|
export default auth((req) => {
|
||||||
const isLoggedIn = !!req.auth;
|
const isLoggedIn = !!req.auth;
|
||||||
const pathname = req.nextUrl.pathname;
|
const pathname = req.nextUrl.pathname;
|
||||||
|
|||||||
Reference in New Issue
Block a user