Seperate SIWN and SIWF

src/auth.ts

@@ -6,8 +6,15 @@ declare module 'next-auth' {
   interface Session {
     user: {
       fid: number;
+      provider?: string;
+      username?: string;
     };
   }
+
+  interface User {
+    provider?: string;
+    username?: string;
+  }
 }
 
 function getDomainFromUrl(urlString: string | undefined): string {
@@ -29,6 +36,7 @@ export const authOptions: AuthOptions = {
   // Configure one or more authentication providers
   providers: [
     CredentialsProvider({
+      id: 'farcaster',
       name: 'Sign in with Farcaster',
       credentials: {
         message: {
@@ -62,9 +70,7 @@ export const authOptions: AuthOptions = {
         },
       },
       async authorize(credentials, req) {
-        const csrfToken = req?.body?.csrfToken;
-
-        const nonce = credentials?.nonce || csrfToken;
+        const nonce = req?.body?.csrfToken;
 
         if (!nonce) {
           console.error('No nonce or CSRF token provided');
@@ -91,17 +97,123 @@ export const authOptions: AuthOptions = {
 
         return {
           id: fid.toString(),
+          name: credentials?.name || `User ${fid}`,
+          image: credentials?.pfp || null,
+          provider: 'farcaster',
         };
       },
     }),
+    CredentialsProvider({
+      id: 'neynar',
+      name: 'Sign in with Neynar',
+      credentials: {
+        message: {
+          label: 'Message',
+          type: 'text',
+          placeholder: '0x0',
+        },
+        signature: {
+          label: 'Signature',
+          type: 'text',
+          placeholder: '0x0',
+        },
+        nonce: {
+          label: 'Nonce',
+          type: 'text',
+          placeholder: 'Custom nonce (optional)',
+        },
+        fid: {
+          label: 'FID',
+          type: 'text',
+          placeholder: '0',
+        },
+        username: {
+          label: 'Username',
+          type: 'text',
+          placeholder: 'username',
+        },
+        displayName: {
+          label: 'Display Name',
+          type: 'text',
+          placeholder: 'Display Name',
+        },
+        pfpUrl: {
+          label: 'Profile Picture URL',
+          type: 'text',
+          placeholder: 'https://...',
+        },
+      },
+      async authorize(credentials) {
+        const nonce = credentials?.nonce;
+
+        if (!nonce) {
+          console.error('No nonce or CSRF token provided for Neynar auth');
+          return null;
+        }
+
+        // For Neynar, we can use a different validation approach
+        // This could involve validating against Neynar's API or using their SDK
+        try {
+          // Validate the signature using Farcaster's auth client (same as Farcaster provider)
+          const appClient = createAppClient({
+            ethereum: viemConnector(),
+          });
+
+          const domain = getDomainFromUrl(process.env.NEXTAUTH_URL);
+
+          const verifyResponse = await appClient.verifySignInMessage({
+            message: credentials?.message as string,
+            signature: credentials?.signature as `0x${string}`,
+            domain,
+            nonce,
+          });
+
+          const { success, fid } = verifyResponse;
+
+          if (!success) {
+            return null;
+          }
+
+          // Validate that the provided FID matches the verified FID
+          if (credentials?.fid && parseInt(credentials.fid) !== fid) {
+            console.error('FID mismatch in Neynar auth');
+            return null;
+          }
+
+          return {
+            id: fid.toString(),
+            name:
+              credentials?.displayName ||
+              credentials?.username ||
+              `User ${fid}`,
+            image: credentials?.pfpUrl || null,
+            provider: 'neynar',
+            username: credentials?.username || undefined,
+          };
+        } catch (error) {
+          console.error('Error in Neynar auth:', error);
+          return null;
+        }
+      },
+    }),
   ],
   callbacks: {
     session: async ({ session, token }) => {
       if (session?.user) {
         session.user.fid = parseInt(token.sub ?? '');
+        // Add provider information to session
+        session.user.provider = token.provider as string;
+        session.user.username = token.username as string;
       }
       return session;
     },
+    jwt: async ({ token, user }) => {
+      if (user) {
+        token.provider = user.provider;
+        token.username = user.username;
+      }
+      return token;
+    },
   },
   cookies: {
     sessionToken: {