diff --git a/blotztask-ui/src/app/api/auth/[...nextauth]/options.ts b/blotztask-ui/src/app/api/auth/[...nextauth]/options.ts
index efe4bb3..413bfd3 100644
--- a/blotztask-ui/src/app/api/auth/[...nextauth]/options.ts
+++ b/blotztask-ui/src/app/api/auth/[...nextauth]/options.ts
@@ -1,6 +1,6 @@
-import { NextAuthOptions } from "next-auth";
-import CredentialsProvider from "next-auth/providers/credentials";
-import { cookies } from "next/headers";
+import { NextAuthOptions } from 'next-auth';
+import CredentialsProvider from 'next-auth/providers/credentials';
+import { cookies } from 'next/headers';
interface Credentials {
email: string;
@@ -15,96 +15,94 @@ interface LoginApiResponse {
}
export const authOptions: NextAuthOptions = {
- // Configure one or more authentication providers
- providers: [
- CredentialsProvider({
- // The name to display on the sign in form (e.g. "Sign in with...")
- name: "Credentials",
- // `credentials` is used to generate a form on the sign in page.
- // You can specify which fields should be submitted, by adding keys to the `credentials` object.
- // e.g. domain, username, password, 2FA token, etc.
- // You can pass any HTML attribute to the tag through the object.
- credentials: {
- email: { label: "Email", type: "text", placeholder: "your email" },
- password: { label: "Password", type: "password" }
- },
-
- async authorize(credentials: Credentials) {
- const { email, password } = credentials;
+ // Configure one or more authentication providers
+ providers: [
+ CredentialsProvider({
+ // The name to display on the sign in form (e.g. "Sign in with...")
+ name: 'Credentials',
+ // `credentials` is used to generate a form on the sign in page.
+ // You can specify which fields should be submitted, by adding keys to the `credentials` object.
+ // e.g. domain, username, password, 2FA token, etc.
+ // You can pass any HTML attribute to the tag through the object.
+ credentials: {
+ email: { label: 'Email', type: 'text', placeholder: 'your email' },
+ password: { label: 'Password', type: 'password' },
+ },
-
- try {
- //TODO : Remove reject unauthorized set to false
- if (process.env.NODE_ENV !== 'production') {
- process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
- }
- //TODO :Also fix the fetch url for login in prod
- const response = await fetch(`${process.env.NEXT_PUBLIC_API_BASE_URL}/login/`, {
+ async authorize(credentials: Credentials) {
+ const { email, password } = credentials;
+
+ try {
+ //TODO : Remove reject unauthorized set to false
+ if (process.env.NODE_ENV !== 'production') {
+ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+ }
+ //TODO :Also fix the fetch url for login in prod
+ const response = await fetch(
+ `${process.env.NEXT_PUBLIC_API_BASE_URL}/login/`,
+ {
method: 'POST',
headers: {
- 'Content-Type': 'application/json'
+ 'Content-Type': 'application/json',
},
- body: JSON.stringify({ email, password })
- });
-
- if (!response.ok) {
- console.error('Failed to authenticate:', response);
- return null;
+ body: JSON.stringify({ email, password }),
}
-
- const data: LoginApiResponse = await response.json();
+ );
- cookies().set('authToken', data.accessToken, {
- secure: process.env.NODE_ENV === 'production',
- sameSite: 'strict'
- });
-
- if (data.accessToken) {
- return {
- id: email || 'placeholder-id',
- email: email,
- accessToken: data.accessToken, // Include the access token here
- refreshToken: data.refreshToken,
- expiresIn: data.expiresIn,
- };
- } else {
- console.error('Access token not found in response');
- return null;
- }
- } catch (error) {
- console.error('Unhandled error:', error);
+ if (!response.ok) {
+ console.error('Failed to authenticate:', response);
return null;
}
-
- }
- })
- ],
- secret: process.env.NEXTAUTH_SECRET,
- callbacks: {
- async signIn({ user, account }) {
- if (user?.access_token) {
- account.access_token = user?.access_token as string
+ const data: LoginApiResponse = await response.json();
+
+ cookies().set('authToken', data.accessToken, {
+ secure: process.env.NODE_ENV === 'production',
+ sameSite: 'strict',
+ });
+
+ if (data.accessToken) {
+ return {
+ id: email || 'placeholder-id',
+ email: email,
+ accessToken: data.accessToken, // Include the access token here
+ refreshToken: data.refreshToken,
+ expiresIn: data.expiresIn,
+ };
+ } else {
+ console.error('Access token not found in response');
+ return null;
+ }
+ } catch (error) {
+ console.error('Unhandled error:', error);
+ return null;
}
- if (user?.refresh_token) {
- account.refresh_token = user?.refresh_token as string
- }
-
- return true
},
- async jwt({ token, session }) {
- console.log('jwt callback', token, session);
- return token;
- },
- async session({ session, token, user }) {
- console.log('session callback', session, token, user);
-
-
- return session
+ }),
+ ],
+ secret: process.env.NEXTAUTH_SECRET,
+ callbacks: {
+ async signIn({ user, account }) {
+ if (user?.access_token) {
+ account.access_token = user?.access_token as string;
}
+ if (user?.refresh_token) {
+ account.refresh_token = user?.refresh_token as string;
+ }
+
+ return true;
},
- session: {
- strategy: "jwt"
+ async jwt({ token, session }) {
+ console.log('jwt callback', token, session);
+ return token;
+ },
+ async session({ session, token, user }) {
+ console.log('session callback', session, token, user);
+
+ return session;
},
-
- }
\ No newline at end of file
+ },
+ session: {
+ strategy: 'jwt',
+ },
+};
diff --git a/blotztask-ui/src/app/api/auth/[...nextauth]/route.ts b/blotztask-ui/src/app/api/auth/[...nextauth]/route.ts
index 70b9923..a166338 100644
--- a/blotztask-ui/src/app/api/auth/[...nextauth]/route.ts
+++ b/blotztask-ui/src/app/api/auth/[...nextauth]/route.ts
@@ -1,6 +1,5 @@
-import NextAuth from "next-auth"
-import { authOptions } from "./options"
+import NextAuth from 'next-auth';
+import { authOptions } from './options';
-
-const handler = NextAuth(authOptions)
-export { handler as GET, handler as POST }
\ No newline at end of file
+const handler = NextAuth(authOptions);
+export { handler as GET, handler as POST };
diff --git a/blotztask-ui/src/app/layout.tsx b/blotztask-ui/src/app/layout.tsx
index 3b6e983..619747a 100644
--- a/blotztask-ui/src/app/layout.tsx
+++ b/blotztask-ui/src/app/layout.tsx
@@ -17,7 +17,7 @@ export const metadata: Metadata = {
};
export default function RootLayout({
- children
+ children,
}: Readonly<{
children: React.ReactNode;
}>) {
@@ -38,7 +38,9 @@ export default function RootLayout({
>
{/* TODO: Implement navbar to navigate between pages*/}
-
+
diff --git a/blotztask-ui/src/app/navbar/main-nav.tsx b/blotztask-ui/src/app/navbar/main-nav.tsx
index 7886886..5265f1d 100644
--- a/blotztask-ui/src/app/navbar/main-nav.tsx
+++ b/blotztask-ui/src/app/navbar/main-nav.tsx
@@ -1,13 +1,21 @@
'use client';
-import { ClientSafeProvider, getProviders, signOut, useSession } from 'next-auth/react';
+import {
+ ClientSafeProvider,
+ getProviders,
+ signOut,
+ useSession,
+} from 'next-auth/react';
import Image from 'next/image';
import Link from 'next/link';
import { useEffect, useState } from 'react';
export function MainNav({}: React.HTMLAttributes