#130 Logout RMP on logout

railmapgen · Sep 28, 2024 · 4ccb1ca · 4ccb1ca
1 parent f118771
commit 4ccb1ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/components/menu/account-view/account-info.tsx b/src/components/menu/account-view/account-info.tsx
@@ -19,11 +19,12 @@ import {
 import { RmgDebouncedInput } from '@railmapgen/rmg-components';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { MdDriveFileRenameOutline, MdLogout, MdPassword } from 'react-icons/md';
 import { useRootDispatch, useRootSelector } from '../../../redux';
 import { logout, setToken, updateName } from '../../../redux/account/account-slice';
 import { API_ENDPOINT, API_URL } from '../../../util/constants';
+import { notifyRMPTokenUpdate } from '../../../util/local-storage-save';
 import { apiFetch } from '../../../util/utils';
-import { MdDriveFileRenameOutline, MdLogout, MdPassword } from 'react-icons/md';
 
 const style: SystemStyleObject = {
     alignItems: 'center',
@@ -52,6 +53,7 @@ const AccountInfo = () => {
             body: JSON.stringify({ refreshToken }),
         });
         dispatch(logout());
+        notifyRMPTokenUpdate();
     };
 
     return (

diff --git a/src/util/local-storage-save.ts b/src/util/local-storage-save.ts
@@ -97,7 +97,7 @@ const onSaveUpdate = async (currentSaveId: number, token: string, refreshToken:
 };
 
 // This should triggger RMP to refetch subscription info.
-export const notifyRMPTokenUpdate = (token: string) => {
+export const notifyRMPTokenUpdate = (token?: string) => {
     channel.postMessage({
         type: SaveManagerEventType.TOKEN_REQUEST,
         token: token,
@@ -113,11 +113,7 @@ export const registerOnTokenRequest = (store: ReturnType<typeof createStore>) =>
 
             const { isLoggedIn, token, refreshToken } = store.getState().account;
             if (!isLoggedIn || !token || !refreshToken) {
-                channel.postMessage({
-                    type: SaveManagerEventType.TOKEN_REQUEST,
-                    token: undefined,
-                    from: 'rmt',
-                } as SaveManagerEvent);
+                notifyRMPTokenUpdate();
                 return;
             }
 
@@ -129,11 +125,7 @@ export const registerOnTokenRequest = (store: ReturnType<typeof createStore>) =>
                 refreshToken: refreshTokenAfterFetch,
             } = store.getState().account;
             if (!isLoggedInAfterFetch || !tokenAfterFetch || !refreshTokenAfterFetch) {
-                channel.postMessage({
-                    type: SaveManagerEventType.TOKEN_REQUEST,
-                    token: undefined,
-                    from: 'rmt',
-                } as SaveManagerEvent);
+                notifyRMPTokenUpdate();
                 return;
             }