);
};
diff --git a/src/app/(site)/(auth)/signin/page.tsx b/src/app/(site)/(auth)/signin/page.tsx
index 9bb8e58..f2e7d82 100644
--- a/src/app/(site)/(auth)/signin/page.tsx
+++ b/src/app/(site)/(auth)/signin/page.tsx
@@ -2,121 +2,31 @@
import SocialLogin from "@/components/widgets/login/SocialLogin";
import Link from "next/link";
import React from "react";
-import { logger } from "@/lib/logger";
-import { signIn } from "next-auth/react";
+import { Icons } from "@/components/icons";
+import { cn } from "@/lib/utils";
+import { buttonVariants } from "@/components/ui/button";
+import SignInForm from "@/components/forms/auth/SignInForm";
const SignInPage = () => {
- const [userInfo, setUserInfo] = React.useState({
- email: "fergal.moran+opengifame@gmail.com",
- password: "secret",
- });
-
return (
-
-
-
- Sign in to your account
-
-
- Or
-
- create a new account
-
+
+
+
+
Welcome back
+
+ Enter your email to sign in to your account
-
-
+
+
+
+
+ Don't have an account? Sign Up
+
+
);
};
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 71d36ad..6366cd0 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -18,6 +18,8 @@ export default async function Home() {
+
+
{JSON.stringify(session, null, 2)}
{session?.user &&
}
diff --git a/src/components/forms/auth/SignInForm.tsx b/src/components/forms/auth/SignInForm.tsx
new file mode 100644
index 0000000..777d341
--- /dev/null
+++ b/src/components/forms/auth/SignInForm.tsx
@@ -0,0 +1,128 @@
+// src/components/RegistrationForm.tsx
+import React from "react";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+import { Button, buttonVariants } from "@/components/ui/button";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { api } from "@/trpc/react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { logger } from "@/lib/logger";
+import { Icons } from "@/components/icons";
+import { cn } from "@/lib/utils";
+import { toast } from "sonner";
+import { useRouter } from "next/navigation";
+import { signIn } from "next-auth/react";
+
+const signInSchema = z.object({
+ email: z.string().email({ message: "Invalid email address" }),
+ password: z
+ .string()
+ .min(5, { message: "Password must be at least 5 characters long" }),
+});
+
+type SignInFormValues = z.infer
;
+
+const SignInForm: React.FC = () => {
+ const [isLoading, setIsLoading] = React.useState(false);
+ const router = useRouter();
+ const form = useForm({
+ resolver: zodResolver(signInSchema),
+ });
+
+ const onSubmit = async (data: SignInFormValues) => {
+ setIsLoading(true);
+ try {
+ const result = await signIn("credentials", {
+ redirect: false,
+ email: data.email,
+ password: data.password,
+ });
+ logger.debug("signin", "result", result);
+ if (result?.status === 200) {
+ router.push("/");
+ }
+ } catch (error) {
+ logger.error("SignInForm", "error", error);
+ toast("Failed to signin user");
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ return (
+
+
+ );
+};
+
+export default SignInForm;
diff --git a/src/server/api/routers/auth.ts b/src/server/api/routers/auth.ts
index 6802220..0bf0d4e 100644
--- a/src/server/api/routers/auth.ts
+++ b/src/server/api/routers/auth.ts
@@ -16,18 +16,4 @@ export const authRouter = createTRPCRouter({
return user;
}),
- login: publicProcedure
- .input(z.object({ email: z.string().email(), password: z.string().min(5) }))
- .query(async ({ ctx, input }) => {
- const hashedPassword = await bcrypt.hash(input.password, 10);
- const user = await ctx.db
- .select()
- .from(users)
- .where(
- and(eq(users.email, input.email), eq(users.password, hashedPassword)),
- )
- .limit(1);
-
- return user[0];
- }),
});
diff --git a/src/server/auth.ts b/src/server/auth.ts
index cdd6ba5..4c4414d 100644
--- a/src/server/auth.ts
+++ b/src/server/auth.ts
@@ -1,10 +1,8 @@
import { DrizzleAdapter } from "@auth/drizzle-adapter";
-import CredentialsProvider from "next-auth/providers/credentials";
import {
getServerSession,
type DefaultSession,
type NextAuthOptions,
- RequestInternal,
} from "next-auth";
import { type Adapter } from "next-auth/adapters";
import {
@@ -13,11 +11,12 @@ import {
users,
verificationTokens,
} from "@/server/db/schema";
-import { api } from "@/trpc/server";
import { env } from "@/env";
import { db } from "@/server/db";
import Credentials from "next-auth/providers/credentials";
+import bcrypt from "bcrypt";
+import { and, eq } from "drizzle-orm";
declare module "next-auth" {
interface Session extends DefaultSession {
@@ -29,13 +28,18 @@ declare module "next-auth" {
export const authOptions: NextAuthOptions = {
callbacks: {
- session: ({ session, user }) => ({
- ...session,
- user: {
- ...session.user,
- id: user.id,
- },
- }),
+ session: ({ session, user }) => {
+ const s = {
+ ...session,
+ user: {
+ ...session.user
+ },
+ };
+ return s;
+ },
+ },
+ session: {
+ strategy: "jwt",
},
adapter: DrizzleAdapter(db, {
usersTable: users,
@@ -54,14 +58,24 @@ export const authOptions: NextAuthOptions = {
if (!credentials) {
return null;
}
- const result = await api.auth.login({
- email: credentials.email,
- password: credentials.password,
- });
- if (!result) {
+ const user = await db
+ .select()
+ .from(users)
+ .where(and(eq(users.email, credentials.email)))
+ .limit(1);
+
+ if (!user || user.length < 1) {
return null;
}
- return { id: result.id, email: result.email };
+ if (
+ !(await bcrypt.compare(
+ credentials.password,
+ user[0]!.password as string,
+ ))
+ ) {
+ return null;
+ }
+ return { id: user[0]!.id, email: user[0]!.email };
},
}),
],