From cee509011bbdb193d6afbef24e5a7ded64576a0c Mon Sep 17 00:00:00 2001
From: Rishabh Saxena <rishabh.robben@gmail.com>
Date: Sat, 7 Aug 2021 09:40:06 +0530
Subject: [PATCH] Dont fetch feature flags if not logged in (#6444)

---
 app/client/src/sagas/userSagas.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/client/src/sagas/userSagas.tsx b/app/client/src/sagas/userSagas.tsx
index 9701313f70..8c96adfe43 100644
--- a/app/client/src/sagas/userSagas.tsx
+++ b/app/client/src/sagas/userSagas.tsx
@@ -101,6 +101,11 @@ export function* getCurrentUserSaga() {
         response.data.username !== ANONYMOUS_USERNAME
       ) {
         AnalyticsUtil.identifyUser(response.data);
+        // make fetch feature call only if logged in
+        yield put(fetchFeatureFlagsInit());
+      } else {
+        // reset the flagsFetched flag
+        yield put(fetchFeatureFlagsSuccess());
       }
       if (window.location.pathname === BASE_URL) {
         if (response.data.isAnonymous) {
@@ -116,8 +121,6 @@ export function* getCurrentUserSaga() {
       PerformanceTracker.stopAsyncTracking(
         PerformanceTransactionName.USER_ME_API,
       );
-
-      yield put(fetchFeatureFlagsInit());
     }
   } catch (error) {
     PerformanceTracker.stopAsyncTracking(