merge main to dev

src/actions/auth/oauth.ts

@@ -2,22 +2,22 @@
 
 import { signIn } from '@/auth';
 import { redirect } from 'next/navigation';
-
+import { OAuthAccountNotLinked } from '@auth/core/errors';
 import { deleteUserAccount } from '@/db/query/User';
 import { revalidatePath } from 'next/cache';
 
 // =============================== Oauth Login ===============================
 export async function oAuthLogin(provider: string) {
-  let user = '/';
   try {
-    user = await signIn(provider, { redirect: false });
-    console.log('user', user);
+    await signIn(provider);
   } catch (error) {
-    console.log('error', error);
+    console.log('Error------', error);
+    if (error instanceof OAuthAccountNotLinked) {
+      redirect('/error?error=OAuthAccountNotLinked');
+    } else {
+      throw error;
+    }
   }
-  // console.log(user);
-
-  if (user) redirect(user);
 }
 
 // =============================== Oauth Remove ===============================

src/app/(auth)/sign-in/page.tsx

@@ -1,8 +1,25 @@
 import Link from 'next/link';
 import SignInForm from './SignInForm';
 import { GithubSignIn, GoogleSignIn } from '@/components/AuthButton';
+import { redirect } from 'next/navigation';
+import { auth } from '@/auth';
 
-export default function SignIn() {
+export default async function SignIn({
+  searchParams,
+}: {
+  searchParams?: {
+    error?: string;
+  };
+}) {
+  const error = searchParams?.error || '';
+  if (error) {
+    redirect(`/error?error=${error}`);
+  }
+  const session = await auth();
+  const user = session?.user;
+  if (user) {
+    redirect('/profile');
+  }
   return (
     <div className='mx-auto flex min-h-screen flex-col items-center justify-center'>
       <div className='mx-auto flex flex-col gap-2 rounded-lg p-8 shadow-lg shadow-black dark:shadow-white'>

src/auth.ts

@@ -1,18 +1,12 @@
 import NextAuth, { AuthError } from 'next-auth';
-// import { OAuthAccountNotLinked } from '@auth/core/errors';
 import Google from 'next-auth/providers/google';
 import Github from 'next-auth/providers/github';
 import Credentials from 'next-auth/providers/credentials';
 import { DrizzleAdapter } from '@auth/drizzle-adapter';
 import { db } from '@/db';
-import {
-  getUserById,
-  getUserByProviderAccountId,
-  loginUser,
-} from './db/query/User';
+import { getUserById, loginUser } from './db/query/User';
 import bcrypt from 'bcryptjs';
 import { encode, decode } from 'next-auth/jwt';
-import { cookies } from 'next/headers';
 
 class InvalidCredentialsError extends AuthError {
   code = 'invalid-credentials';
@@ -71,35 +65,14 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
     }),
   ],
   callbacks: {
-    async signIn({ account }) {
-      const cookieStore = cookies();
-      const session = cookieStore.has('authjs.session-token');
-      // If not logged in, let user login
-      if (!session) {
-        return true;
-      }
-      // If already logged in, and try to connect another account, throw error if already linked
-      if (account?.provider === 'github' || account?.provider === 'google') {
-        // check if user already exists with this account.providerAccountId
-        const existingUser = await getUserByProviderAccountId(
-          account?.providerAccountId as string,
-        );
-        if (existingUser) {
-          return '/error?error=OAuthAccountNotLinked';
-        } else {
-          return true;
-        }
-      }
-      return true;
-    },
     authorized({ auth, request: { nextUrl } }) {
       const isLoggedIn = !!auth?.user;
       const paths = ['/profile', '/dashboard'];
       const isProtected = paths.some((path) =>
         nextUrl.pathname.startsWith(path),
       );
 
-      const publicPath = ['/sign-in', '/sign-up'];
+      const publicPath = ['/sign-up'];
       const isPublic = publicPath.some((path) =>
         nextUrl.pathname.startsWith(path),
       );

src/db/query/User.ts

@@ -39,17 +39,17 @@ export const getUserById = async (id: string) => {
   return result;
 };
 
-export const getUserByProviderAccountId = async (id: string) => {
-  const result = await db.query.accounts.findFirst({
-    where: (accounts: { providerAccountId: any }, { eq }: any) =>
-      eq(accounts.providerAccountId, id),
-    columns: {
-      // Include only fields you want from users table, excluding password
-      userId: true,
-    },
-  });
-  return result;
-};
+// export const getUserByProviderAccountId = async (id: string) => {
+//   const result = await db.query.accounts.findFirst({
+//     where: (accounts: { providerAccountId: any }, { eq }: any) =>
+//       eq(accounts.providerAccountId, id),
+//     columns: {
+//       // Include only fields you want from users table, excluding password
+//       userId: true,
+//     },
+//   });
+//   return result;
+// };
 
 export const createUser = async (
   name: string,