Merge branch 'dev' into feat/notification-system-clean

src/config/auth.config.ts

@@ -2,6 +2,7 @@ import { NextAuthConfig, Session } from "next-auth";
 import { JWT } from "next-auth/jwt";
 import Credentials from "next-auth/providers/credentials";
 import Google from "next-auth/providers/google";
+import { cookies } from "next/headers";
 
 import { LoginSchema } from "~/schemas";
 import { CustomSession } from "~/types";
@@ -22,6 +23,7 @@ interface Profile {
 }
 
 interface User {
+  access_token: string;
   id: string;
   email: string;
   fullname: string;
@@ -40,6 +42,7 @@ interface ApiResponse {
   message: string;
   user: User;
   data: Data;
+  access_token: string;
 }
 
 export default {
@@ -103,6 +106,7 @@ export default {
       session: Session;
       token: JWT;
     }): Promise<CustomSession> {
+      const authToken = cookies()?.get("access_token")?.value;
       session.user = {
         id: token.id as string,
         first_name:
@@ -116,20 +120,13 @@ export default {
         email: token.email as string,
         image: token.picture || (token.avatar_url as string),
         role: token.role as string,
-        access_token: token.access_token as string,
+        access_token: (token.access_token as string) || (authToken as string),
       };
 
+      session.access_token =
+        (token.access_token as string) || (authToken as string);
       return session as CustomSession;
     },
-    // async redirect({ url, baseUrl }) {
-    //   if (url === "/login") {
-    //     return baseUrl;
-    //   }
-    //   if (url === `${baseUrl}/api/auth/signout`) {
-    //     return baseUrl;
-    //   }
-    //   return "/dashboard";
-    // },
   },
   pages: {
     signIn: "/login",

src/lib/auth.ts

@@ -23,5 +23,6 @@ declare module "next-auth" {
       role: User["role"];
       access_token: User["access_token"];
     } & DefaultSession["user"];
+    access_token?: string;
   }
 }

src/utils/googleAuth.ts

@@ -1,6 +1,7 @@
 "use server";
 
 import axios from "axios";
+import { cookies } from "next/headers";
 
 const apiUrl = process.env.API_URL;
 interface Profile {
@@ -22,7 +23,21 @@ const googleAuth = async (profile: Profile) => {
       id_token: profile.id_token,
     });
 
-    return response.data;
+    const access_token =
+      response.data.access_token ?? response.data.data.access_token;
+    const cookie = cookies();
+    cookie.set("access_token", access_token, {
+      maxAge: 60 * 60 * 24 * 1, // 1 day
+      httpOnly: true,
+      path: "/",
+      priority: "high",
+    });
+    return {
+      data: response.data,
+      user: response.data.user,
+      access_token:
+        response.data.access_token ?? response.data.data.access_token,
+    };
   } catch (error) {
     return error;
   }

src/utils/login.ts

@@ -1,13 +1,15 @@
 "use server";
 
 import axios from "axios";
+import { cookies } from "next/headers";
 import * as z from "zod";
 
 import { LoginSchema } from "~/schemas";
 
 const apiUrl = process.env.API_URL;
 
 export const loginUser = async (values: z.infer<typeof LoginSchema>) => {
+  const cookie = cookies();
   const validatedFields = LoginSchema.safeParse(values);
   if (!validatedFields.success) {
     return {
@@ -18,6 +20,15 @@ export const loginUser = async (values: z.infer<typeof LoginSchema>) => {
   const payload = { email, password };
   try {
     const response = await axios.post(`${apiUrl}/api/v1/auth/login`, payload);
+    const access_token =
+      response.data.access_token ?? response.data.data.access_token;
+
+    cookie.set("access_token", access_token, {
+      maxAge: 60 * 60 * 24 * 1,
+      httpOnly: true,
+      path: "/",
+      priority: "high",
+    });
     return {
       status: response.status,
       data: response.data,