[DPCP-19] Nyx: Upgrading to Next Auth 5 + Prisma Adapter

.husky/pre-commit

@@ -1,7 +1,7 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run format:fix
+# npm run format:fix
 # npm run build
 git add .
 # git commit -m "husky(lint)"

lib/auth/constants.ts

@@ -1,80 +1,48 @@
 // constants.ts TS-Doc?
-import type { AuthOptions } from 'next-auth';
-import GithubProvider from 'next-auth/providers/github';
-import GoogleProvider from 'next-auth/providers/google';
-import AppleProvider from 'next-auth/providers/apple';
-import FacebookProvider from 'next-auth/providers/facebook';
-import EmailProvider from 'next-auth/providers/email';
-// import InstagramProvider from 'next-auth/providers/instagram';
 
-export const authOptions: AuthOptions = {
-  providers: [
-    EmailProvider({
-      server: process.env.EMAIL_SERVER as string,
-      from: process.env.EMAIL_FROM as string,
-      // maxAge: 24 * 60 * 60, // How long email links are valid for (default 24h)
-    }),
-    GithubProvider({
-      clientId: process.env.GITHUB_ID as string,
-      clientSecret: process.env.GITHUB_SECRET as string,
-    }),
-    GoogleProvider({
-      clientId: process.env.GOOGLE_CLIENT_ID as string,
-      clientSecret: process.env.GOOGLE_CLIENT_SECRET as string,
-    }),
-    AppleProvider({
-      clientId: process.env.APPLE_CLIENT_ID as string,
-      clientSecret: process.env.APPLE_CLIENT_SECRET as string,
-    }),
-    FacebookProvider({
-      clientId: process.env.FACEBOOK_CLIENT_ID as string,
-      clientSecret: process.env.FACEBOOK_CLIENT_SECRET as string,
-    }),
-    // ...add more providers here
-  ],
-  session: {
-    strategy: 'jwt',
-  },
-  events: {},
-  callbacks: {
-    async signIn() {
-      // extra sign-in checks
-      return true;
-    },
-    async redirect({ url, baseUrl }) {
-      return url.startsWith(baseUrl) ? Promise.resolve(url) : Promise.resolve(baseUrl);
-    },
-    async jwt({ user, token }) {
-      if (user) {
-        // Note that this if condition is needed
-        token.user = { ...user };
-      }
-      return token;
-    },
-    async session({ session, token }) {
-      if (token?.user) {
-        // Note that this if condition is needed
-        session.user = token.user;
-      }
-      return session;
-    },
+export const providers = [
+  { id: 'email', name: 'Email', type: 'email' },
+  { id: 'github', name: 'GitHub', type: 'oauth' },
+  { id: 'google', name: 'Google', type: 'oidc' },
+  { id: 'apple', name: 'Apple', type: 'oidc' },
+  { id: 'facebook', name: 'Facebook', type: 'oauth' },
+];
+
+const methods = {
+  signIn: () => {},
+  signOut: async () => {
+    try {
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/signout`, {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ csrfToken: await methods.getCsrf() }),
+      });
+      return response;
+    } catch (e) {
+      console.error(e);
+    }
   },
-  cookies: {
-    pkceCodeVerifier: {
-      name: 'next-auth.pkce.code_verifier',
-      options: {
-        httpOnly: true,
-        sameSite: 'none',
-        path: '/',
-        secure: true,
-      },
-    },
+  getCsrf: async () => {
+    try {
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/csrf`);
+      const csrf = await response.json();
+      return csrf.csrfToken;
+    } catch (e) {
+      console.error(e);
+    }
   },
-  pages: {
-    signIn: '/signin',
-    signOut: '/',
-    error: '/error', // Error code passed in query string as ?error=
-    verifyRequest: '/verify', // (used for check email message)
-    newUser: '/services/rickmorty', // New users will be directed here on first sign in (leave the property out if not of interest)
+  getSession: async () => {
+    try {
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/session`);
+      const session = await response.json();
+      return session;
+    } catch (e) {
+      console.error(e);
+    }
   },
 };
+
+export const { signIn, signOut, getCsrf, getSession } = methods;

lib/auth/index.ts

@@ -1,2 +1,2 @@
 // index.ts
-export { authOptions } from './constants';
+export { getCsrf, getSession, signIn, signOut, providers } from './constants';

lib/model/decorators/hypnos-public-decorator.ts

@@ -1,11 +1,10 @@
 /* eslint @typescript-eslint/consistent-type-assertions:0, @typescript-eslint/no-unused-vars:0 */
 // hypnos-public-decorator.ts input: hypnos meta; output: decorated hypnos meta;
 'use server';
-import type { UserSchema } from '@types';
 import type { ICard } from '@dreampipcom/oneiros';
 
 /* private */
-const decorateListing = (listing: Record<string, any>, uMeta: UserSchema): ICard => {
+const decorateListing = (listing: Record<string, any>, uMeta: any): ICard => {
   const decd: ICard = {
     id: `list__card--${listing?.title?.es}`,
     className: '',
@@ -29,6 +28,6 @@ const decorateListing = (listing: Record<string, any>, uMeta: UserSchema): ICard
 /* public */
 export const decorateHypnosPublicListings = async (listings: Record<string, any>[], uid: string): Promise<ICard[]> => {
   // const uMeta: UserSchema = await getUserMeta({ email: uid });
-  const decd: ICard[] = listings?.map((card) => decorateListing(card, { email: uid } as UserSchema));
+  const decd: ICard[] = listings?.map((card) => decorateListing(card, { email: uid }));
   return decd;
 };

lib/model/decorators/rm-decorator.ts

@@ -1,10 +1,10 @@
 /* eslint @typescript-eslint/consistent-type-assertions:0 */
 // rm-decorator.ts input: rm meta; output: decorated rm meta;
 'use server';
-import type { IDCharacter, INCharacter, UserSchema } from '@types';
+import type { IDCharacter, INCharacter } from '@types';
 
 /* private */
-const decorateCharacter = (character: INCharacter, uMeta: UserSchema): IDCharacter => {
+const decorateCharacter = (character: INCharacter, uMeta: any): IDCharacter => {
   const decd: IDCharacter = { ...character };
   decd.favorite = undefined;
   if (uMeta?.rickmorty?.favorites?.characters?.includes(character?.id)) decd.favorite = true;
@@ -15,6 +15,6 @@ const decorateCharacter = (character: INCharacter, uMeta: UserSchema): IDCharact
 /* public */
 export const decorateRMCharacters = async (characters: INCharacter[], uid: string): Promise<IDCharacter[]> => {
   // const uMeta: UserSchema = await getUserMeta({ email: uid });
-  const decd: IDCharacter[] = characters.map((char) => decorateCharacter(char, { email: uid } as UserSchema));
+  const decd: IDCharacter[] = characters.map((char) => decorateCharacter(char, { email: uid }));
   return decd;
 };

lib/state/providers.tsx

@@ -3,7 +3,6 @@
 'use client';
 import type { IAuthContext, IGlobalContext, IRMContext, IHypnosPublicContext } from '@types';
 import { useContext, useState, useEffect, useRef } from 'react';
-import { SessionProvider } from 'next-auth/react';
 import { AuthContext, GlobalContext, RMContext, HypnosPublicContext } from '@state';
 import { Globals } from '@dreampipcom/oneiros';
 
@@ -13,7 +12,6 @@ export function RootProviders({ children }: { children: React.ReactNode }) {
   const [authState, setAuthState] = useState<IAuthContext>({ ...authContext });
   const [globalState, setGlobalState] = useState<IGlobalContext>({ ...globalContext });
   const init = useRef(false);
-  const base = process.env.NEXT_PUBLIC_NEXUS_BASE_PATH || '';
 
   useEffect(() => {
     if (!init.current && authContext && !authState?.setter) {
@@ -28,15 +26,13 @@ export function RootProviders({ children }: { children: React.ReactNode }) {
   if (!authState?.initd) return;
 
   return (
-    <SessionProvider basePath={base ? `${base}/api/auth` : '/api/auth'}>
-      <AuthContext.Provider value={authState}>
-        <GlobalContext.Provider value={globalState}>
-          <Globals theme={globalState?.theme || 'dark'}>
-            <main className="min-h-screen">{children}</main>
-          </Globals>
-        </GlobalContext.Provider>
-      </AuthContext.Provider>
-    </SessionProvider>
+    <AuthContext.Provider value={authState}>
+      <GlobalContext.Provider value={globalState}>
+        <Globals theme={globalState?.theme || 'dark'}>
+          <main className="min-h-screen">{children}</main>
+        </Globals>
+      </GlobalContext.Provider>
+    </AuthContext.Provider>
   );
 }