diff --git a/src/App.vue b/src/App.vue index 33604c491..a3de41f1b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -139,15 +139,13 @@ interval.value = window.setInterval(async () => { } }, 60000) as unknown as number; -const { load: loadIdentities } = useLazyCurrentUserIdentities(); - onBeforeMount(async () => { console.debug("Before mount App"); if (initializeCurrentUser()) { try { - const result = await loadIdentities(); + const result = useLazyCurrentUserIdentities(); if (!result) return; - await initializeCurrentActor(result.loggedUser.actors); + await initializeCurrentActor(result.result.value?.loggedUser.actors); } catch (err) { if (err instanceof NoIdentitiesException) { await router.push({ diff --git a/src/composition/apollo/actor.ts b/src/composition/apollo/actor.ts index 5e2e8a922..455cd5749 100644 --- a/src/composition/apollo/actor.ts +++ b/src/composition/apollo/actor.ts @@ -23,7 +23,7 @@ export function useCurrentActorClient() { } export function useLazyCurrentUserIdentities() { - return useLazyQuery<{ + return useQuery<{ loggedUser: Pick; }>(IDENTITIES); } diff --git a/src/views/User/LoginView.vue b/src/views/User/LoginView.vue index e41641dca..ad1388058 100644 --- a/src/views/User/LoginView.vue +++ b/src/views/User/LoginView.vue @@ -238,17 +238,15 @@ const loginAction = (e: Event) => { }); }; -const { load: loadIdentities } = useLazyCurrentUserIdentities(); - const { onDone: onCurrentUserMutationDone, mutate: updateCurrentUserMutation } = useMutation(UPDATE_CURRENT_USER_CLIENT); onCurrentUserMutationDone(async () => { console.debug("Current user mutation done, now setuping actors…"); try { - const result = await loadIdentities(); + const result = useLazyCurrentUserIdentities(); if (!result) return; - await initializeCurrentActor(result.loggedUser.actors); + await initializeCurrentActor(result.result.value?.loggedUser.actors); } catch (err: any) { if (err instanceof NoIdentitiesException && currentUser.value) { await router.push({