Delete logout cookie

frontend/logout.ts

@@ -8,7 +8,12 @@ window.addEventListener('DOMContentLoaded', () => {
     }
 
     console.log("Logging out all chatrix sessions");
-    logoutAndDeleteData().catch(error => console.log(error));
+    logoutAndDeleteData().then(() => {
+        // Logout has been done and data has been deleted.
+        // We can now expire the logout cookie.
+        const now = (new Date).toUTCString();
+        document.cookie = `${logoutCookieName}=false; expires=${now};path=/;`;
+    }).catch(error => console.error(error));
 });
 
 async function logoutAndDeleteData() {
@@ -53,10 +58,16 @@ async function logoutSession(session) {
         headers: {
             'Authorization': 'Bearer ' + session.accessToken,
         },
+    }).then((response) => {
+        // Fetch considers 403 and 404 to be a success but to us, it's a failure.
+        if (!response.ok) {
+            throw response;
+        }
+        return response;
     });
 
     promise.catch(error => {
-        console.log(`Failed to logout chatrix session. deviceId: ${session.deviceId}`, error);
+        console.error(`Failed to logout chatrix session. deviceId: ${session.deviceId}`);
     });
 
     return promise;

src/Sessions/logout.php

@@ -2,14 +2,16 @@
 
 namespace Automattic\Chatrix\Sessions;
 
+use const Automattic\Chatrix\LOGOUT_COOKIE_NAME;
+
 function init_logout() {
 	// Set a cookie when user logs out.
 	add_action(
 		'wp_logout',
 		function () {
 			// Expire in 10 minutes.
 			$expiration = time() + ( 10 * 60 );
-			setcookie( 'chatrix-logout', 'true', $expiration, COOKIEPATH, COOKIE_DOMAIN );
+			setcookie( LOGOUT_COOKIE_NAME, 'true', $expiration, COOKIEPATH, COOKIE_DOMAIN );
 		}
 	);
 }

src/plugin.php

@@ -10,6 +10,7 @@
 const SCRIPT_HANDLE_APP    = 'chatrix-app';
 const SCRIPT_HANDLE_LOGOUT = 'chatrix-logout';
 const CONFIG_VARIABLE      = 'ChatrixConfig';
+const LOGOUT_COOKIE_NAME   = 'chatrix-logout';
 
 function main() {
 	init_logout();
@@ -51,6 +52,7 @@ function () {
 					automattic_chatrix_version(),
 					false
 				);
+
 				wp_enqueue_script( SCRIPT_HANDLE_LOGOUT );
 			}
 		}