From 16f862d3892dff37a129bb4282809badcdb6f266 Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Sun, 16 Jun 2024 22:19:36 -0300 Subject: [PATCH 1/2] rename method --- src/main/events/auth/signout.ts | 4 ++-- src/preload/index.ts | 2 +- src/renderer/src/declaration.d.ts | 2 +- src/renderer/src/hooks/use-user-auth.ts | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/events/auth/signout.ts b/src/main/events/auth/signout.ts index 3294088a..4525fdb2 100644 --- a/src/main/events/auth/signout.ts +++ b/src/main/events/auth/signout.ts @@ -2,11 +2,11 @@ import { userAuthRepository } from "@main/repository"; import { registerEvent } from "../register-event"; import { HydraApi } from "@main/services/hydra-api"; -const signout = async (_event: Electron.IpcMainInvokeEvent): Promise => { +const signOut = async (_event: Electron.IpcMainInvokeEvent): Promise => { await Promise.all([ userAuthRepository.delete({ id: 1 }), HydraApi.post("/auth/logout"), ]); }; -registerEvent("signout", signout); +registerEvent("signOut", signOut); diff --git a/src/preload/index.ts b/src/preload/index.ts index 53fc6f47..faae6ef9 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -133,7 +133,7 @@ contextBridge.exposeInMainWorld("electron", { getUser: (userId: string) => ipcRenderer.invoke("getUser", userId), /* Auth */ - signout: () => ipcRenderer.invoke("signout"), + signOut: () => ipcRenderer.invoke("signOut"), onSignIn: (cb: () => void) => { const listener = (_event: Electron.IpcRendererEvent) => cb(); ipcRenderer.on("on-signin", listener); diff --git a/src/renderer/src/declaration.d.ts b/src/renderer/src/declaration.d.ts index b97b4379..48c7bdc6 100644 --- a/src/renderer/src/declaration.d.ts +++ b/src/renderer/src/declaration.d.ts @@ -112,7 +112,7 @@ declare global { restartAndInstallUpdate: () => Promise; /* Authg */ - signout: () => Promise; + signOut: () => Promise; onSignIn: (cb: () => void) => () => Electron.IpcRenderer; onSignOut: (cb: () => void) => () => Electron.IpcRenderer; diff --git a/src/renderer/src/hooks/use-user-auth.ts b/src/renderer/src/hooks/use-user-auth.ts index 1b887a85..597bc8c5 100644 --- a/src/renderer/src/hooks/use-user-auth.ts +++ b/src/renderer/src/hooks/use-user-auth.ts @@ -5,13 +5,13 @@ import { setUserAuth } from "@renderer/features"; export function useUserAuth() { const dispatch = useAppDispatch(); - const [isLoading, setIsLoading] = useState(false); + const [isLoading, setIsLoading] = useState(true); const { userAuth } = useAppSelector((state) => state.userAuth); const signOut = useCallback(async () => { dispatch(setUserAuth(null)); - return window.electron.signout(); + return window.electron.signOut(); }, [dispatch]); const updateUserAuth = useCallback(async () => { From 15176a12dea5fea5f79cff61abadb12efb8cce3b Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Sun, 16 Jun 2024 23:47:31 -0300 Subject: [PATCH 2/2] add missing dependency on useEffect --- src/renderer/src/hooks/use-user-auth.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/hooks/use-user-auth.ts b/src/renderer/src/hooks/use-user-auth.ts index 597bc8c5..ad376ce7 100644 --- a/src/renderer/src/hooks/use-user-auth.ts +++ b/src/renderer/src/hooks/use-user-auth.ts @@ -27,7 +27,7 @@ export function useUserAuth() { useEffect(() => { updateUserAuth(); - }, []); + }, [updateUserAuth]); const clearUserAuth = useCallback(async () => { dispatch(setUserAuth(null));