diff --git a/src/app/dashboard/projects/action.ts b/src/app/dashboard/projects/action.ts
index e7d76d7..3483e66 100644
--- a/src/app/dashboard/projects/action.ts
+++ b/src/app/dashboard/projects/action.ts
@@ -1,12 +1,11 @@
"use server";
import { type Project } from "@prisma/client";
-import { getServerSession, type Session } from "next-auth";
import { revalidatePath } from "next/cache";
import { redirect } from "next/navigation";
-import { authOptions } from "~/lib/auth";
import db from "~/lib/db";
import { getUserSubscriptionPlan } from "~/lib/subscription";
+import { getUser } from "~/server/user";
interface Payload {
name: string;
@@ -21,7 +20,7 @@ export async function createProject(payload: Payload) {
...payload,
user: {
connect: {
- id: user.id,
+ id: user?.id,
},
},
},
@@ -32,7 +31,7 @@ export async function createProject(payload: Payload) {
export async function checkIfFreePlanLimitReached() {
const user = await getUser();
- const subscriptionPlan = await getUserSubscriptionPlan(user.id);
+ const subscriptionPlan = await getUserSubscriptionPlan(user?.id as string);
// If user is on a free plan.
// Check if user has reached limit of 3 projects.
@@ -40,7 +39,7 @@ export async function checkIfFreePlanLimitReached() {
const count = await db.project.count({
where: {
- userId: user.id,
+ userId: user?.id,
},
});
@@ -51,7 +50,7 @@ export async function getProjects() {
const user = await getUser();
const projects = await db.project.findMany({
where: {
- userId: user.id,
+ userId: user?.id,
},
orderBy: {
createdAt: "desc",
@@ -65,7 +64,7 @@ export async function getProjectById(id: string) {
const project = await db.project.findFirst({
where: {
id,
- userId: user.id,
+ userId: user?.id,
},
});
return project as Project;
@@ -76,7 +75,7 @@ export async function updateProjectById(id: string, payload: Payload) {
await db.project.update({
where: {
id,
- userId: user.id,
+ userId: user?.id,
},
data: payload,
});
@@ -88,15 +87,9 @@ export async function deleteProjectById(id: string) {
await db.project.delete({
where: {
id,
- userId: user.id,
+ userId: user?.id,
},
});
revalidatePath(`/dashboard/projects`);
redirect("/dashboard/projects");
}
-
-export async function getUser() {
- const session = (await getServerSession(authOptions)) as Session;
-
- return session.user;
-}
diff --git a/src/app/dashboard/settings/settings-form.tsx b/src/app/dashboard/settings/settings-form.tsx
index 44fb54b..7e85372 100644
--- a/src/app/dashboard/settings/settings-form.tsx
+++ b/src/app/dashboard/settings/settings-form.tsx
@@ -17,7 +17,6 @@ import {
FormMessage,
} from "~/components/ui/form";
import { Input } from "~/components/ui/input";
-import { Textarea } from "~/components/ui/textarea";
import { toast } from "~/components/ui/use-toast";
import {
saRemoveNewImageFromCDN,
@@ -48,28 +47,27 @@ export default function SettingsForm({
values: {
name: currentUser.name,
email: currentUser.email,
- shortBio: currentUser.shortBio,
- image: currentUser.image,
+ picture: currentUser.picture,
},
});
const { formState, getFieldState } = form;
- const { isDirty: isImageChanged } = getFieldState("image");
+ const { isDirty: isImageChanged } = getFieldState("picture");
const [showConfirmAlert, setShowConfirmAlert] = useState(false);
useEffect(() => {
- if (isImageChanged && currentUser.image !== oldImage.current) {
- oldImage.current = currentUser.image;
+ if (isImageChanged && currentUser.picture !== oldImage.current) {
+ oldImage.current = currentUser.picture;
}
- }, [currentUser.image, isImageChanged]);
+ }, [currentUser.picture, isImageChanged]);
function onSubmit(data: SettingsValues) {
if (!formState.isDirty) return;
if (isImageChanged) {
startTransition(() =>
- saRemoveUserOldImageFromCDN(currentUser.id, data.image)
+ saRemoveUserOldImageFromCDN(currentUser.id, data.picture)
.then(() => saUpdateUserInDb(currentUser.id, data))
.then(() => {
toast({
@@ -103,7 +101,7 @@ export default function SettingsForm({
function handleReset() {
if (isImageChanged) {
- saRemoveNewImageFromCDN(form.getValues().image)
+ saRemoveNewImageFromCDN(form.getValues().picture)
.then(() => form.reset())
.catch((error) => console.error(error));
} else {
@@ -119,7 +117,7 @@ export default function SettingsForm({
>
(
Picture
@@ -169,23 +167,6 @@ export default function SettingsForm({
)}
/>
- (
-
- Short Bio
-
-
-
-
-
- )}
- />
@@ -104,7 +104,7 @@ export default function RootLayout({
{children}
- {signinDialog}
+ {loginDialog}
diff --git a/src/app/signin/page.tsx b/src/app/login/page.tsx
similarity index 100%
rename from src/app/signin/page.tsx
rename to src/app/login/page.tsx
diff --git a/src/components/layout/auth-form.tsx b/src/components/layout/auth-form.tsx
index 9c179bc..e274caa 100644
--- a/src/components/layout/auth-form.tsx
+++ b/src/components/layout/auth-form.tsx
@@ -1,81 +1,72 @@
"use client";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Label } from "@radix-ui/react-label";
-import { signIn } from "next-auth/react";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import * as z from "zod";
+import Link from "next/link";
import { buttonVariants } from "~/components/ui/button";
import { cn } from "~/lib/utils";
-import { saCheckEmailExists } from "~/server/actions";
-import Icons from "../shared/icons";
-import { Input } from "../ui/input";
-import { toast } from "../ui/use-toast";
-const userAuthSchema = z.object({
- email: z.string().email("Please enter a valid email address."),
-});
+// const userAuthSchema = z.object({
+// email: z.string().email("Please enter a valid email address."),
+// });
-type FormData = z.infer;
+// type FormData = z.infer;
export default function AuthForm() {
- const [isLoading, setIsLoading] = useState(false);
- const [isGithubLoading, setIsGithubLoading] = useState(false);
+ // const [isLoading, setIsLoading] = useState(false);
+ // const [isGithubLoading, setIsGithubLoading] = useState(false);
- const {
- register,
- handleSubmit,
- reset,
- formState: { errors },
- } = useForm({
- resolver: zodResolver(userAuthSchema),
- });
+ // const {
+ // register,
+ // handleSubmit,
+ // reset,
+ // formState: { errors },
+ // } = useForm({
+ // resolver: zodResolver(userAuthSchema),
+ // });
- async function onSubmit(data: FormData) {
- setIsLoading(true);
+ // async function onSubmit(data: FormData) {
+ // setIsLoading(true);
- saCheckEmailExists(data.email.toLowerCase())
- .then(async () => {
- try {
- const res = await signIn("email", {
- email: data.email.toLowerCase(),
- redirect: false,
- });
+ // saCheckEmailExists(data.email.toLowerCase())
+ // .then(async () => {
+ // try {
+ // const res = await signIn("email", {
+ // email: data.email.toLowerCase(),
+ // redirect: false,
+ // });
- if (!res?.ok) {
- throw new Error("Something went wrong.");
- }
+ // if (!res?.ok) {
+ // throw new Error("Something went wrong.");
+ // }
- toast({
- title: "Check your email",
- description:
- "We sent you a sign in link. Be sure to check your spam too.",
- });
- reset();
- } catch (err) {
- toast({
- title: "Something went wrong.",
- description: "Your signin request failed. Please try again.",
- variant: "destructive",
- });
- } finally {
- setIsLoading(false);
- }
- })
- .catch(() => {
- toast({
- title: "Account not found.",
- description:
- "You have to use the email already linked to your account.",
- variant: "destructive",
- });
- setIsLoading(false);
- });
- }
+ // toast({
+ // title: "Check your email",
+ // description:
+ // "We sent you a sign in link. Be sure to check your spam too.",
+ // });
+ // reset();
+ // } catch (err) {
+ // toast({
+ // title: "Something went wrong.",
+ // description: "Your signin request failed. Please try again.",
+ // variant: "destructive",
+ // });
+ // } finally {
+ // setIsLoading(false);
+ // }
+ // })
+ // .catch(() => {
+ // toast({
+ // title: "Account not found.",
+ // description:
+ // "You have to use the email already linked to your account.",
+ // variant: "destructive",
+ // });
+ // setIsLoading(false);
+ // });
+ // }
return (
@@ -78,11 +78,11 @@ export default function Navbar({
) : (
setIsModalOpen(false)}
>
- Sign In
+ Login
)}
diff --git a/src/components/layout/image-upload-modal.tsx b/src/components/layout/image-upload-modal.tsx
index 9612473..310a4f0 100644
--- a/src/components/layout/image-upload-modal.tsx
+++ b/src/components/layout/image-upload-modal.tsx
@@ -27,7 +27,7 @@ const fileTypes = ["image"];
export default function ImageUploadModal({
onChange,
}: {
- onChange: ControllerRenderProps["onChange"];
+ onChange: ControllerRenderProps["onChange"];
}) {
const [files, setFiles] = useState([]);
const [preview, setPreview] = useState(null);
diff --git a/src/components/layout/user-nav.tsx b/src/components/layout/user-nav.tsx
index 84127cd..a132366 100644
--- a/src/components/layout/user-nav.tsx
+++ b/src/components/layout/user-nav.tsx
@@ -1,7 +1,6 @@
"use client";
import { LayoutDashboardIcon, LogOut } from "lucide-react";
-import { signOut } from "next-auth/react";
import Link from "next/link";
import { Avatar, AvatarFallback, AvatarImage } from "~/components/ui/avatar";
import {
@@ -13,13 +12,14 @@ import {
DropdownMenuTrigger,
} from "~/components/ui/dropdown-menu";
import { type CurrentUser } from "~/types";
+import { Button } from "../ui/button";
export default function UserNav({ user }: { user: CurrentUser }) {
return (
-
+
{user.name?.[0]}
@@ -39,9 +39,17 @@ export default function UserNav({ user }: { user: CurrentUser }) {
Dashboard
- signOut()}>
-
- Log out
+
+
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index b2d333f..260f2be 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,100 +1,36 @@
-import { PrismaAdapter } from "@next-auth/prisma-adapter";
-import { type NextAuthOptions } from "next-auth";
-import EmailProvider, {
- type SendVerificationRequestParams,
-} from "next-auth/providers/email";
-import GithubProvider from "next-auth/providers/github";
-import db from "~/lib/db";
-import { sendMail } from "./resend";
+import { prisma } from "@lucia-auth/adapter-prisma";
+import { github } from "@lucia-auth/oauth/providers";
+import { lucia } from "lucia";
+import { nextjs_future } from "lucia/middleware";
+import "lucia/polyfill/node";
+import db from "./db";
+import { cache } from "react";
+import * as context from "next/headers";
-const sendVerificationRequest = async ({
- identifier: email,
- url,
-}: SendVerificationRequestParams) => {
- const user = await db.user.findFirst({
- where: {
- email,
- },
- select: {
- name: true,
- },
- });
-
- try {
- await sendMail({
- toMail: email,
- type: "verification",
- data: {
- name: user?.name as string,
- url,
- },
- });
- } catch (error) {
- throw new Error(JSON.stringify(error));
- }
-};
-
-export const authOptions: NextAuthOptions = {
- adapter: PrismaAdapter(db),
- providers: [
- EmailProvider({
- sendVerificationRequest,
- }),
- GithubProvider({
- clientId: process.env.GITHUB_CLIENT_ID as string,
- clientSecret: process.env.GITHUB_CLIENT_SECRET as string,
- }),
- ],
- pages: {
- signIn: "/signin",
+export const auth = lucia({
+ adapter: prisma(db),
+ env: process.env.NODE_ENV === "production" ? "PROD" : "DEV",
+ middleware: nextjs_future(),
+ sessionCookie: {
+ expires: false,
},
- session: {
- strategy: "jwt",
+ getUserAttributes: (user) => {
+ return {
+ name: user.name as string,
+ email: user.email as string,
+ picture: user.picture as string,
+ };
},
- callbacks: {
- async session({ token, session }) {
- if (token) {
- session.user.id = token.id;
- session.user.name = token.name;
- session.user.email = token.email;
- session.user.image = token.picture;
- }
+});
- return session;
- },
- async jwt({ token, user }) {
- const dbUser = await db.user.findFirst({
- where: {
- email: token.email,
- },
- });
+export const githubAuth = github(auth, {
+ clientId: process.env.GITHUB_CLIENT_ID ?? "",
+ clientSecret: process.env.GITHUB_CLIENT_SECRET ?? "",
+});
- if (!dbUser) {
- if (user) {
- token.id = user.id;
- }
- return token;
- }
+export const getPageSession = cache(() => {
+ const authRequest = auth.handleRequest("GET", context);
+ return authRequest.validate();
+});
- return {
- id: dbUser.id,
- name: dbUser.name,
- email: dbUser.email,
- picture: dbUser.image,
- };
- },
- },
- events: {
- async signIn({ user, isNewUser }) {
- if (user && isNewUser) {
- await sendMail({
- toMail: user.email as string,
- type: "new-signin",
- data: {
- name: user.name as string,
- },
- });
- }
- },
- },
-};
+export type Auth = typeof auth;
diff --git a/src/middleware.ts b/src/middleware.ts
deleted file mode 100644
index 3c2da64..0000000
--- a/src/middleware.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { getToken } from "next-auth/jwt";
-import { withAuth } from "next-auth/middleware";
-import { NextResponse } from "next/server";
-
-export default withAuth(
- async function middleware(req) {
- const token = await getToken({ req });
- const isAuth = !!token;
-
- if (req.nextUrl.pathname === "/signin") {
- if (isAuth) {
- return NextResponse.redirect(new URL(`/dashboard`, req.url));
- }
- return null;
- }
-
- if (!isAuth) {
- return NextResponse.redirect(new URL(`/signin`, req.url));
- }
- },
- {
- callbacks: {
- authorized() {
- return true;
- },
- },
- }
-);
-
-export const config = {
- matcher: ["/dashboard/:path*", "/signin"],
-};
diff --git a/src/server/user.ts b/src/server/user.ts
index 9b6dfa8..d09b1af 100644
--- a/src/server/user.ts
+++ b/src/server/user.ts
@@ -1,15 +1,14 @@
-import { getServerSession } from "next-auth";
import { cache } from "react";
-import { authOptions } from "~/lib/auth";
import db from "~/lib/db";
+import { getPageSession } from "~/lib/auth";
import { type payload } from "~/types";
export const getUser = cache(async () => {
- const session = await getServerSession(authOptions);
+ const session = await getPageSession();
if (session) {
const user = await db.user.findFirst({
- where: { id: session.user.id },
+ where: { id: session.user.userId },
});
if (user) {
diff --git a/src/server/utils.ts b/src/server/utils.ts
index 8b8591a..c295fcc 100644
--- a/src/server/utils.ts
+++ b/src/server/utils.ts
@@ -12,10 +12,10 @@ const getImageKeyFromUrl = (url: string) => {
export async function removeUserOldImageCDN(id: string, newImageUrl: string) {
const user = await db.user.findFirst({
where: { id },
- select: { image: true },
+ select: { picture: true },
});
- const currentImageUrl = user?.image;
+ const currentImageUrl = user?.picture;
if (!currentImageUrl) return;
diff --git a/src/types/index.ts b/src/types/index.ts
index 3540d43..ede0499 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -5,19 +5,17 @@ export type CurrentUser = {
id: string;
name: string;
email: string;
- image: string;
- shortBio: string;
+ picture: string;
};
export interface payload {
name: string;
email: string;
- shortBio?: string;
- image?: string;
+ picture?: string;
}
export const settingsSchema = z.object({
- image: z.string().url(),
+ picture: z.string().url(),
name: z
.string({
required_error: "Please type your name.",
diff --git a/src/types/next-auth.d.ts b/src/types/next-auth.d.ts
deleted file mode 100644
index a8cebdb..0000000
--- a/src/types/next-auth.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { type User } from "next-auth";
-import "next-auth/jwt";
-
-type UserId = string;
-
-declare module "next-auth/jwt" {
- interface JWT {
- id: UserId;
- }
-}
-
-declare module "next-auth" {
- interface Session {
- user: User & {
- id: UserId;
- };
- }
-}