From d71e76d6921c4d630e1ec2f53964e664f44962d4 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 13 Aug 2021 16:56:51 +0200
Subject: [PATCH] Fix some queries being called even when not logged-in

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/NavBar.vue | 2 +-
 js/src/views/Event/Event.vue | 1 +
 js/src/views/Home.vue        | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue
index 44a892aef..834de6654 100644
--- a/js/src/components/NavBar.vue
+++ b/js/src/components/NavBar.vue
@@ -216,7 +216,7 @@ import RouteName from "../router/name";
     loggedUser: {
       query: USER_SETTINGS,
       skip() {
-        return this.currentUser.isLoggedIn === false;
+        return !this.currentUser || this.currentUser.isLoggedIn === false;
       },
     },
   },
diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue
index 31e4fe785..5ac44b715 100755
--- a/js/src/views/Event/Event.vue
+++ b/js/src/views/Event/Event.vue
@@ -592,6 +592,7 @@ import { eventMetaDataList } from "../../services/EventMetadata";
       },
       skip() {
         return (
+          !this.currentActor.id ||
           !this.event?.attributedTo ||
           !this.event?.attributedTo?.preferredUsername
         );
diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index fe2110ff9..3aca6994d 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -372,7 +372,9 @@ import Subtitle from "../components/Utils/Subtitle.vue";
     currentUser: CURRENT_USER_CLIENT,
     loggedUser: {
       query: USER_SETTINGS,
-      fetchPolicy: "no-cache",
+      skip() {
+        return !this.currentUser || this.currentUser.isLoggedIn === false;
+      },
       error() {
         return null;
       },