Merge branch 'dev' into snyk-upgrade-28f4f59b2a4a63db69767cdf046b0279

lib/auth/constants.ts

@@ -20,7 +20,7 @@ import {
 
 export const GetSession = async ({ cookies = '' }) => {
   try {
-    const response = await fetch(`${process.env.AUTH_URL}/api/auth/session`, {
+    const response = await fetch(`${process.env.AUTH_URL}/api/v1/auth/session`, {
       method: 'GET',
       headers: {
         Accept: 'application/json',
@@ -137,7 +137,7 @@ export const authConfig = {
       return true;
     },
     async redirect() {
-      return `${process.env.MAIN_URL}`;
+      return `${process.env.MAIN_URL}/dash`;
     },
     // async jwt({ user, token }) {
     //   if (user) {
@@ -180,13 +180,22 @@ export const authConfig = {
         secure: true,
       },
     },
+    csrfToken: {
+      name: `authjs.csrf-token`,
+      options: {
+        httpOnly: true,
+        sameSite: 'none',
+        path: '/',
+        secure: true,
+      },
+    },
   },
   trustHost: true,
   pages: {
-    signIn: '/signin',
+    signIn: '/dash/signin',
     signOut: '/',
-    error: '/error', // Error code passed in query string as ?error=
-    verifyRequest: '/verify', // (used for check email message)
+    error: '/dash/error', // Error code passed in query string as ?error=
+    verifyRequest: '/dash/verify', // (used for check email message)
     // newUser: '/' // New users will be directed here on first sign in (leave the property out if not of interest)
   },
 } satisfies NextAuthConfig;

lib/state/providers.tsx

@@ -23,7 +23,7 @@ export function RootProviders({ children }: { children: React.ReactNode }) {
   if (!authState?.initd) return;
 
   return (
-    <SessionProvider basePath={base ? `${base}/api/auth` : '/api/auth'}>
+    <SessionProvider basePath={base ? `${base}/api/v1/auth` : '/api/v1/auth'}>
       <AuthContext.Provider value={authState}>{children}</AuthContext.Provider>
     </SessionProvider>
   );