From 4f372adddcd7bd28a53ea1202dce1c16a045df5a Mon Sep 17 00:00:00 2001 From: Montassar Ghanmy Date: Wed, 28 Feb 2024 09:40:54 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9Bfix:=20public=20shared=20view=20sso?= =?UTF-8?q?=20redirect=20(#389)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Monta --- .../src/app/features/router/services/router-service.ts | 1 + .../src/app/features/users/hooks/use-user-quota.ts | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tdrive/frontend/src/app/features/router/services/router-service.ts b/tdrive/frontend/src/app/features/router/services/router-service.ts index aa131db8..5671404b 100644 --- a/tdrive/frontend/src/app/features/router/services/router-service.ts +++ b/tdrive/frontend/src/app/features/router/services/router-service.ts @@ -34,6 +34,7 @@ export type ClientStateType = { threadId?: string; tabId?: string; directoryId?: string; + appName?: string; }; export type Pathnames = { diff --git a/tdrive/frontend/src/app/features/users/hooks/use-user-quota.ts b/tdrive/frontend/src/app/features/users/hooks/use-user-quota.ts index bfde33bb..bd6b3163 100644 --- a/tdrive/frontend/src/app/features/users/hooks/use-user-quota.ts +++ b/tdrive/frontend/src/app/features/users/hooks/use-user-quota.ts @@ -3,6 +3,7 @@ import { UserQuota } from '@features/users/types/user-quota'; import UserAPIClient from '@features/users/api/user-api-client'; import { useCurrentUser } from "features/users/hooks/use-current-user"; import { atom, useRecoilState } from "recoil"; +import useRouteState from "app/features/router/hooks/use-route-state"; export const QuotaState = atom({ key: 'QuotaState', @@ -19,12 +20,14 @@ export const useUserQuota = () => { remaining: 1, total: 1 } - const {user } = useCurrentUser(); + const { appName } = useRouteState(); + const isPublic = appName === 'drive'; + const { user } = isPublic ? { user: null } : useCurrentUser(); const [quota, setQuota] = useRecoilState(QuotaState); const getQuota = useCallback(async () => { let data: UserQuota = nullQuota; - if (user?.id) { + if (user && user?.id) { data = await UserAPIClient.getQuota(user.id); } else { data = nullQuota;