DBC22-4971: fixed logout and redirect on deactivation

Author: ray-oxd

src/backend/apps/authentication/adapters.py

@@ -28,6 +28,9 @@ def get_logout_redirect_url(self, request):
             else:
                 redirect_url += path
 
+        elif request.GET.get('deactivate'):
+            redirect_url += 'account-deactivated'
+
         url = f'{settings.KEYCLOAK_URL}/protocol/openid-connect/logout'
 
         token = request.session.get('id_token')

src/frontend/src/pages/AccountPage.js

@@ -54,8 +54,9 @@ export default function AccountPage() {
     // Show login modal once if user is not logged in
     if (!authContext.username && !showedModal.current) {
       toggleAuthModal('Sign in');
-      showedModal.current = true;
     }
+
+    showedModal.current = true;
   }, [authContext]);
 
   /* Handlers */
@@ -71,11 +72,17 @@ export default function AccountPage() {
       credentials: 'include'
     });
 
+    return response;
+  };
+
+  const handleDeactivateAndSignout = async (e) => {
+    e.preventDefault();
+    const response = await deactivateHandler();
     if (response.status === 204) {
       // Successfully deleted the user, handle logout or redirect
-      setAuthContext({ ...authContext, username: null });
+      setAuthContext({ ...authContext, showingModal: false, username: null });
       logoutDispatch(dispatch, selectedRoute, searchedRoutes);
-      navigate('/account-deactivated');
+      e.target.submit();
     }
   };
 
@@ -169,7 +176,10 @@ export default function AccountPage() {
             </p>
 
             <div className="modal-buttons">
-              <Button variant="danger" onClick={deactivateHandler}>Yes, deactivate my account</Button>
+              <form id="signout-link" className="nav-link" method='post' action={`${window.API_HOST}/accounts/logout/?deactivate=true`} onSubmit={handleDeactivateAndSignout}>
+                <input type='hidden' name='csrfmiddlewaretoken' value={getCookie('csrftoken')} />
+                <button type='submit' className="btn btn-outline-primary">Yes, deactivate my account</button>
+              </form>
               <Button variant="outline-primary" onClick={() => setShowDeactivate(false)}>Cancel</Button>
             </div>
           </Modal.Body>

src/frontend/src/pages/AccountPage.scss

@@ -75,6 +75,11 @@
 
   .modal-buttons {
     margin-top: 3rem;
+    display: flex;
+
+    form {
+      margin-right: .5rem;
+    }
 
     button {
       & + button {