From 6f05ec7e74c1bb140f62a5d972feec0b1f9476a4 Mon Sep 17 00:00:00 2001
From: guru_sainath <gurusainath007@gmail.com>
Date: Fri, 17 May 2024 19:38:48 +0530
Subject: [PATCH] chore: after signout intead of redirecting to login page we
 are navigating to the same page where he logged out (#4507)

---
 .../plane/authentication/views/space/signout.py      | 12 ++++++------
 space/components/issues/navbar/user-avatar.tsx       |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apiserver/plane/authentication/views/space/signout.py b/apiserver/plane/authentication/views/space/signout.py
index 58bf54b80..d3f29bd8d 100644
--- a/apiserver/plane/authentication/views/space/signout.py
+++ b/apiserver/plane/authentication/views/space/signout.py
@@ -12,6 +12,8 @@ from plane.db.models import User
 class SignOutAuthSpaceEndpoint(View):
 
     def post(self, request):
+        next_path = request.POST.get("next_path")
+
         # Get user
         try:
             user = User.objects.get(pk=request.user.id)
@@ -20,10 +22,8 @@ class SignOutAuthSpaceEndpoint(View):
             user.save()
             # Log the user out
             logout(request)
-            return HttpResponseRedirect(
-                base_host(request=request, is_space=True)
-            )
+            url = f"{base_host(request=request, is_space=True)}{next_path}"
+            return HttpResponseRedirect(url)
         except Exception:
-            return HttpResponseRedirect(
-                base_host(request=request, is_space=True)
-            )
+            url = f"{base_host(request=request, is_space=True)}{next_path}"
+            return HttpResponseRedirect(url)
diff --git a/space/components/issues/navbar/user-avatar.tsx b/space/components/issues/navbar/user-avatar.tsx
index 51051a22a..4e0122198 100644
--- a/space/components/issues/navbar/user-avatar.tsx
+++ b/space/components/issues/navbar/user-avatar.tsx
@@ -98,6 +98,7 @@ export const UserAvatar: FC = observer(() => {
                   {csrfToken && (
                     <form method="POST" action={`${API_BASE_URL}/auth/spaces/sign-out/`} onSubmit={signOut}>
                       <input type="hidden" name="csrfmiddlewaretoken" value={csrfToken} />
+                      <input type="hidden" name="next_path" value={`${pathName}?${queryParam}`} />
                       <button
                         type="submit"
                         className="flex items-center gap-2 rounded p-2 whitespace-nowrap hover:bg-custom-background-80 text-sm min-w-36 cursor-pointer"