+
diff --git a/src/app/signup/page.tsx b/src/app/signup/page.tsx
index 092b77ab..1b0db99f 100644
--- a/src/app/signup/page.tsx
+++ b/src/app/signup/page.tsx
@@ -1,7 +1,9 @@
'use client';
-import { useRouter } from 'next/navigation';
-import { useState } from 'react';
+import { useRouter, useSearchParams } from 'next/navigation';
+import { useState, useEffect } from 'react';
+import Link from 'next/link';
+import { signIn } from 'next-auth/react';
export default function SignupPage() {
const [name, setName] = useState('');
@@ -11,28 +13,81 @@ export default function SignupPage() {
const [isLoading, setIsLoading] = useState(false);
const router = useRouter();
+ const searchParams = useSearchParams();
+ const callbackUrl = searchParams.get('callbackUrl') || '/dashboard';
+
+ // Handle any error from the URL (e.g., from auth callback)
+ useEffect(() => {
+ const errorParam = searchParams.get('error');
+ if (errorParam) {
+ // Remove the error from the URL
+ const newSearchParams = new URLSearchParams(searchParams);
+ newSearchParams.delete('error');
+ router.replace(`/signup?${newSearchParams.toString()}`);
+
+ // Set appropriate error message
+ let errorMessage = 'An error occurred during signup';
+ if (errorParam === 'OAuthAccountNotLinked') {
+ errorMessage = 'This email is already associated with another account';
+ } else if (errorParam === 'OAuthCallbackError') {
+ errorMessage = 'An error occurred during social sign in';
+ }
+ setError(errorMessage);
+ }
+ }, [router, searchParams]);
+
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
setError('');
setIsLoading(true);
try {
+ // Basic validation
+ if (!name || !email || !password) {
+ throw new Error('All fields are required');
+ }
+
+ if (password.length < 8) {
+ throw new Error('Password must be at least 8 characters long');
+ }
+
+ // Create user in the database
const response = await fetch('/api/auth/signup', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
- body: JSON.stringify({ name, email, password }),
+ body: JSON.stringify({
+ name,
+ email,
+ password // The password will be hashed in the API route
+ }),
});
const data = await response.json();
if (!response.ok) {
- throw new Error(data.message || 'Something went wrong');
+ throw new Error(data.message || 'Something went wrong during signup');
}
- // Redirect to login page after successful signup
- router.push('/login');
+ // Automatically sign in the user after successful signup
+ const signInResult = await signIn('credentials', {
+ redirect: false,
+ email,
+ password,
+ callbackUrl,
+ });
+
+ if (signInResult?.error) {
+ // If sign in fails, redirect to login page with a success message
+ router.push(`/login?registered=true&callbackUrl=${encodeURIComponent(callbackUrl)}`);
+ } else if (signInResult?.url) {
+ // If sign in is successful, redirect to the callback URL or dashboard
+ router.push(signInResult.url);
+ } else {
+ // Fallback redirect
+ router.push(callbackUrl);
+ }
} catch (err) {
setError(err instanceof Error ? err.message : 'An error occurred');
setIsLoading(false);
@@ -47,14 +102,51 @@ export default function SignupPage() {
Create a new account
- Or{' '}
-
- sign in to your existing account
-
+ Sign in
+
+
+
+
+
+
+ Or continue with
+
+
+
+
+
+
+
+
+
+
+
+
+
{error && (
diff --git a/src/auth.config.ts b/src/auth.config.ts
new file mode 100644
index 00000000..7baaf46a
--- /dev/null
+++ b/src/auth.config.ts
@@ -0,0 +1,67 @@
+import type { NextAuthConfig } from "next-auth";
+import Credentials from "next-auth/providers/credentials";
+import { prisma } from "./lib/prisma";
+import { compare } from "bcryptjs";
+
+export default {
+ providers: [
+ Credentials({
+ name: "Credentials",
+ credentials: {
+ email: { label: "Email", type: "email" },
+ password: { label: "Password", type: "password" },
+ },
+ async authorize(credentials) {
+ if (!credentials?.email || !credentials?.password) {
+ throw new Error("Email and password are required");
+ }
+
+ const user = await prisma.user.findUnique({
+ where: { email: credentials.email as string },
+ });
+
+ if (!user || !user.password) {
+ throw new Error("Invalid email or password");
+ }
+
+ const isValid = await compare(
+ credentials.password as string,
+ user.password
+ );
+
+ if (!isValid) {
+ throw new Error("Invalid email or password");
+ }
+
+ return {
+ id: user.id,
+ email: user.email,
+ name: user.name,
+ image: user.image,
+ };
+ },
+ }),
+ ],
+ callbacks: {
+ async session({ session, token }) {
+ if (token && session.user) {
+ session.user.id = token.sub!;
+ }
+ return session;
+ },
+ async jwt({ token, user }) {
+ if (user) {
+ token.sub = user.id;
+ }
+ return token;
+ },
+ },
+ session: {
+ strategy: "jwt",
+ },
+ pages: {
+ signIn: "/login",
+ error: "/login",
+ },
+ secret: process.env.NEXTAUTH_SECRET,
+} satisfies NextAuthConfig;
diff --git a/src/auth.ts b/src/auth.ts
new file mode 100644
index 00000000..c04b7c06
--- /dev/null
+++ b/src/auth.ts
@@ -0,0 +1,83 @@
+import type { NextAuthConfig } from 'next-auth';
+import Credentials from 'next-auth/providers/credentials';
+import { prisma } from './lib/prisma';
+import { compare } from 'bcryptjs';
+
+export const authConfig = {
+ pages: {
+ signIn: '/login',
+ error: '/login',
+ },
+ callbacks: {
+ authorized({ auth, request: { nextUrl } }) {
+ const isLoggedIn = !!auth?.user;
+ const isOnDashboard = nextUrl.pathname.startsWith('/dashboard');
+
+ if (isOnDashboard) {
+ return isLoggedIn;
+ } else if (isLoggedIn) {
+ return Response.redirect(new URL('/dashboard', nextUrl));
+ }
+ return true;
+ },
+ async jwt({ token, user }) {
+ if (user) {
+ token.id = user.id;
+ token.email = user.email;
+ token.name = user.name;
+ }
+ return token;
+ },
+ async session({ session, token }) {
+ if (session.user) {
+ session.user.id = token.id as string;
+ session.user.name = token.name;
+ session.user.email = token.email as string;
+ }
+ return session;
+ },
+ },
+ providers: [
+ Credentials({
+ name: 'Credentials',
+ credentials: {
+ email: { label: 'Email', type: 'email' },
+ password: { label: 'Password', type: 'password' },
+ },
+ async authorize(credentials) {
+ if (!credentials?.email || !credentials?.password) {
+ throw new Error('Email and password are required');
+ }
+
+ const user = await prisma.user.findUnique({
+ where: { email: credentials.email as string },
+ });
+
+ if (!user || !user.password) {
+ throw new Error('Invalid email or password');
+ }
+
+ const isValid = await compare(
+ credentials.password as string,
+ user.password
+ );
+
+ if (!isValid) {
+ throw new Error('Invalid email or password');
+ }
+
+ return {
+ id: user.id,
+ email: user.email,
+ name: user.name,
+ image: user.image,
+ };
+ },
+ }),
+ ],
+ session: {
+ strategy: 'jwt',
+ },
+ secret: process.env.NEXTAUTH_SECRET,
+ trustHost: true,
+} satisfies NextAuthConfig;
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 5c11b3c1..6e72cfdb 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -1,14 +1,16 @@
-import { PrismaClient } from '@prisma/client';
+import { PrismaClient } from '@/generated/prisma';
declare global {
// eslint-disable-next-line no-var
var prisma: PrismaClient | undefined;
}
-export const prisma = global.prisma || new PrismaClient();
+const globalForPrisma = global as unknown as { prisma: PrismaClient };
+
+export const prisma = globalForPrisma.prisma || new PrismaClient();
if (process.env.NODE_ENV !== 'production') {
- global.prisma = prisma;
+ globalForPrisma.prisma = prisma;
}
async function connectDB() {