fix: logout issue #509

fixed logout issue
Planet-NULLCAST · Jan 17, 2022 · 06fccf0 · 06fccf0
1 parent f1d6e75
commit 06fccf0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/component/profile/ProfileDetails.jsx b/component/profile/ProfileDetails.jsx
@@ -12,7 +12,7 @@ export default function ProfileDetails({ userData, userCurrentLogin }) {
             className={`rounded p-4 h-full text-gray-700 relative ${Profilestyles?.bg_red_110} overflow-auto`}
           >
             <div className="flex">
-              {`${userData.id}` === userCurrentLogin && (
+              {`${userData.id}` === `${userCurrentLogin}` && (
                 <Link href="/settings">
                   <a>
                     <img

diff --git a/pages/u/[username].js b/pages/u/[username].js
@@ -1,6 +1,5 @@
 import { useState, useEffect } from "react";
 import Head from "next/head";
-
 import Navbar from "../../component/profile/Navbar";
 import { getCookieValue } from "../../lib/cookie";
 import Activity from "../../component/profile/Activity";
@@ -12,10 +11,8 @@ import LuckEgg from "../../component/profile/LuckEgg";
 import SiteHeader from "../../component/layout/SiteHeader/SiteHeader";
 import UserService from "../../services/UserService";
 import PostService from "../../services/PostService";
-import Cookies from "universal-cookie";
 import Profilestyles from "../../styles/Profile.module.css";
 import SkillSet from "../../component/profile/SkillSet";
-import notify from "../../lib/notify";
 
 export async function getServerSideProps(context) {
   try {
@@ -29,7 +26,6 @@ export async function getServerSideProps(context) {
         const userId = cookie.id;
         const username = context.params.username;
 
-        // let isThisUserTheCurrentLoggedIn = false;
         const data = await UserService.getUserByUsername(username);
         return {
           props: {
@@ -38,18 +34,22 @@ export async function getServerSideProps(context) {
           }
         };
       } else {
+        //user logout from user profile
+        const data = await UserService.getUserByUsername(context.params.username);
         return {
-          redirect: {
-            permanent: false,
-            destination: "/404"
-          }
+           props : {
+              userData : data?.data,
+              userCurrentLogin: 0
+           }
         };
       }
     } else {
       const data = await UserService.getUserByUsername(context.params.username);
       return {
          props : {
-            userData : data?.data
+            userData : data?.data,
+            userCurrentLogin: data.data.id
+
          }
       };
     }
@@ -66,6 +66,7 @@ export async function getServerSideProps(context) {
 }
 
 export default function Username({ userData, userCurrentLogin }) {
+  console.log(userCurrentLogin);
   const [currentNav, setCurrentNav] = useState("profile");
   const [newBlogs, setNewBlogs] = useState();
   const [postsCount, setPostsCount] = useState();

diff --git a/services/AuthService.js b/services/AuthService.js
@@ -112,14 +112,12 @@ async function changePassword(passwords, userCookie) {
 }
 
 async function logout() {
-  // console.log("logout");
   try {
     await axios.post(`${logoutUrl}`, {});
   } catch {}
   window.localStorage.removeItem("progress");
   sessionStorage.removeItem("userNullcast");
-  document.cookie = "userNullcast=''; Max-Age=0;";
-  // console.log(router);
+  document.cookie = "userNullcast=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
   if (router.pathname === "/posts" || router.pathname === "/posts/write") {
     router.push("/");
   } else if (router.pathname !== "/login") {