diff --git a/lib/components/keyserver-connection-handler.js b/lib/components/keyserver-connection-handler.js --- a/lib/components/keyserver-connection-handler.js +++ b/lib/components/keyserver-connection-handler.js @@ -42,6 +42,7 @@ state => !!connectionSelector(keyserverID)(state)?.connectionIssue, ); const cookie = useSelector(cookieSelector(keyserverID)); + const dataLoaded = useSelector(state => state.dataLoaded); const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID)); // We have an assumption that we should be always connected to Ashoat's @@ -143,6 +144,9 @@ `Error while authenticating to keyserver with id ${keyserverID}`, e, ); + if (!dataLoaded && keyserverID === ashoatKeyserverID) { + await dispatchActionPromise(logOutActionTypes, callLogOut()); + } } finally { authInProgress.current = false; } @@ -158,6 +162,8 @@ deviceToken, calendarQuery, isUserAuthenticated, + callLogOut, + dataLoaded, ]); if (keyserverID !== ashoatKeyserverID) {