Merge pull request #493 from Sid-80/fix/editorjs

Fix/editorjs
subhadeeproy3902 · Jul 26, 2024 · e932c03 · e932c03
2 parents 5db84a5 + cc04f6d
commit e932c03
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 63 deletions.
diff --git a/src/app/api/auth/[...nextauth]/options.ts b/src/app/api/auth/[...nextauth]/options.ts
@@ -3,6 +3,7 @@ import CredentialsProvider from "next-auth/providers/credentials";
 import UserModel from "@/models/user";
 import bcrypt from "bcryptjs";
 import { mongoDB } from "@/lib/MongoDB";
+import GoogleProvider from "next-auth/providers/google";
 
 export const options: NextAuthOptions = {
   providers: [
@@ -26,7 +27,7 @@ export const options: NextAuthOptions = {
         try {
           await mongoDB();
           const user = await UserModel.findOne({ email });
-          console.log(user)
+
           if (!user) {
             throw new Error("Not Registered!");
           }
@@ -36,19 +37,23 @@ export const options: NextAuthOptions = {
 
           return user;
         } catch (e) {
-          console.log(e)
+          console.log(e);
         }
       },
     }),
+    GoogleProvider({
+      clientId: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!,
+      clientSecret: process.env.NEXT_PUBLIC_GOOGLE_SECRET_ID!,
+    }),
   ],
-  session:{
-    strategy:"jwt",
+  session: {
+    strategy: "jwt",
   },
   pages: {
     signIn: "/signin",
   },
   secret: process.env.NEXTAUTH_SECRET,
-  callbacks:{
+  callbacks: {
     async session({ session, token }) {
       session.user = {
         ...session.user,
@@ -62,27 +67,55 @@ export const options: NextAuthOptions = {
       };
       return session;
     },
-    async jwt({ token, user }:any) {
-      if (user) {
-        // Generate access and refresh tokens when the user is defined
-        const accessToken = user.generateAccessToken();
-        const refreshToken = user.generateRefreshToken();
+    async jwt({ token, user, account }: any) {
+      try {
+        if (user) {
+          // Generate access and refresh tokens when the user is defined
+          const accessToken = user.generateAccessToken();
+          const refreshToken = user.generateRefreshToken();
+
+          // Save the refresh token to the user document
+          user.refreshToken = refreshToken;
+          await user.save({ validateBeforeSave: false });
+
+          token.id = user._id;
+          token.email = user.email;
+          token.firstName = user.firstName;
+          token.lastName = user.lastName;
+
+          token.accessToken = accessToken;
+          token.refreshToken = refreshToken;
+
+          token.image = user.image;
+        } else{
+          // User authenticated with Google, generate tokens here
+          const existingUser = await UserModel.findOne({ email: token.email });
+          if (existingUser) {
+            const accessToken = existingUser.generateAccessToken();
+            const refreshToken = existingUser.generateRefreshToken();
 
-        // Save the refresh token to the user document
-        user.refreshToken = refreshToken;
-        await user.save({ validateBeforeSave: false });
-
-        token.id = user._id;
-        token.email = user.email;
-        token.firstName = user.firstName;
-        token.lastName = user.lastName;
-
-        token.accessToken = accessToken;
-        token.refreshToken = refreshToken;
+            existingUser.refreshToken = refreshToken;
+            await existingUser.save({ validateBeforeSave: false });
 
-        token.image = user.image
+            token.id = existingUser._id;
+            token.email = existingUser.email;
+            token.firstName = existingUser.firstName;
+            token.lastName = existingUser.lastName;
+
+            token.accessToken = accessToken;
+            token.refreshToken = refreshToken;
+
+            token.image = existingUser.image;
+          }
+            if (!existingUser) {
+              throw new Error("Not Registered!");
+            }
+
+        }
+      } catch (err) {
+        console.log(err);
       }
       return token;
-    }
+    },
   },
 };
diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx
@@ -36,6 +36,8 @@ function DashboardLayout({
   const dispatch = useDispatch();
   const axiosInstance = createAxiosInstance(user.accessToken);
 
+  console.log(session)
+
   useEffect(() => {
     if (session && !hasCheckedTeam) {
       checkTeam();

diff --git a/src/app/signin/page.tsx b/src/app/signin/page.tsx
@@ -14,6 +14,8 @@ export default function Page() {
   const { data: session,status } = useSession();
   const dispatch = useDispatch();
 
+  console.log(session)
+
   useEffect(() => {
     if (session) {
       dispatch(

diff --git a/src/app/workspace/_components/Editor.tsx b/src/app/workspace/_components/Editor.tsx
@@ -82,21 +82,13 @@ const Editor = forwardRef((props: EditorProps, ref) => {
   );
 
   useEffect(() => {
-    if (props.fileData) {
+    if(editorInstanceRef === null){
       initEditor();
     }
 
     return () => {
-      if (editorInstanceRef.current) {
-        editorInstanceRef.current.isReady
-          .then(() => {
-            editorInstanceRef.current?.destroy();
-            editorInstanceRef.current = null;
-          })
-          .catch((error) => {
-            console.error("Error while destroying EditorJS instance:", error);
-          });
-      }
+      editorInstanceRef?.current?.destroy();
+      editorInstanceRef.current = null;
     };
   }, [props.fileData]);
 
@@ -107,17 +99,6 @@ const Editor = forwardRef((props: EditorProps, ref) => {
   }, [props.onSaveTrigger]);
 
   const initEditor = () => {
-    if (editorInstanceRef.current) {
-      editorInstanceRef.current.isReady
-        .then(() => {
-          editorInstanceRef.current?.destroy();
-          editorInstanceRef.current = null;
-        })
-        .catch((error) => {
-          console.error("Error while destroying EditorJS instance:", error);
-        });
-    }
-
     editorInstanceRef.current = new EditorJS({
       tools: {
         header: {
@@ -130,7 +111,7 @@ const Editor = forwardRef((props: EditorProps, ref) => {
           },
         },
         list: {
-          class: List,
+          class: List as unknown as ToolConstructable,
           inlineToolbar: true,
           config: {
             defaultStyle: "unordered",
@@ -181,8 +162,6 @@ const Editor = forwardRef((props: EditorProps, ref) => {
       editorInstanceRef.current
         .save()
         .then(async (outputData) => {
-          console.log(outputData);
-
           try {
             const saveUrl = props.fileData.filePrivate
               ? saveWorkspacePrivateUrl

diff --git a/src/components/shared/SigninForm.tsx b/src/components/shared/SigninForm.tsx
@@ -16,12 +16,13 @@ import { LogInIcon } from "lucide-react";
 import Link from "next/link";
 import { Separator } from "../ui/separator";
 import Image from "next/image";
-import { signIn } from "next-auth/react";
+import { signIn, signOut } from "next-auth/react";
 import { useRouter } from "next/navigation";
 import { useDispatch } from "react-redux";
 import { useSelector } from "react-redux";
 import { RootState } from "@/config/store";
 import { toast } from "sonner";
+import { logOut } from "@/app/Redux/Auth/auth-slice";
 
 const FormSchema = z.object({
   email: z.string().email().min(1, {
@@ -43,12 +44,6 @@ export function SigninForm({session}: Props) {
     router.push('/dashboard');
   }
 
-  // const isAuth  = useSelector((state:RootState)=>state.auth.user?.isAuth);
-
-  // if(isAuth){
-  //   router.push('/dashboard');
-  // }
-
   const form = useForm<z.infer<typeof FormSchema>>({
     resolver: zodResolver(FormSchema),
     defaultValues: {
@@ -132,7 +127,9 @@ export function SigninForm({session}: Props) {
           <Separator className="w-full" />
 
           <div className="flex items-center justify-center">
-            <Button className="flex gap-2" variant={"secondary"}>
+            <Button type="button" onClick={() => {
+               signIn('google')
+            }} className="flex gap-2" variant={"secondary"}>
               Sign-in with Google{" "}
               <Image src={"/google.svg"} alt="google" width={18} height={18} />
             </Button>

diff --git a/src/components/shared/SignupForm.tsx b/src/components/shared/SignupForm.tsx
@@ -165,13 +165,6 @@ export function SignupForm({session}: Props) {
 
           <Separator className="w-full" />
 
-          <div className="flex items-center justify-center">
-            <Button className="flex gap-2" variant={"secondary"}>
-              Sign-in with Google{" "}
-              <Image src={"/google.svg"} alt="google" width={18} height={18} />
-            </Button>
-          </div>
-
           <p className=" text-xs text-center text-gray-400">
             Already have an account?{" "}
             <Link href={`/signin`} className=" underline">