From e546a77f993802445e7c4a1a4fe3cac15f3f4192 Mon Sep 17 00:00:00 2001 From: Margarita Date: Thu, 18 May 2023 15:27:35 +0400 Subject: [PATCH 1/3] feat(in-575): mailings bugfix --- src/features/AuthStore/hooks/useAuth.tsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/features/AuthStore/hooks/useAuth.tsx b/src/features/AuthStore/hooks/useAuth.tsx index 50f41613..ce3a0133 100644 --- a/src/features/AuthStore/hooks/useAuth.tsx +++ b/src/features/AuthStore/hooks/useAuth.tsx @@ -87,6 +87,21 @@ export const useAuth = () => { const loadedUser = await userManager.getUser() if (!loadedUser) { + if (window.location.pathname.includes(PAGES.mailings)) { + const url = new URL(window.location.href) + const access_token = url.searchParams.get('access_token') || '' + + writeToken(access_token) + setCookie({ + exdays: 1, + name: 'access_token', + value: access_token, + }) + + access_token && await fetchUserInfo() + return Promise.resolve() + } + if (!readToken()) { const token = await getTemporaryToken() token && await fetchUserInfo() -- 2.30.2 From 061b09d1c4a29295a90c051c107ba89a0be92125 Mon Sep 17 00:00:00 2001 From: Margarita Date: Mon, 22 May 2023 20:31:39 +0400 Subject: [PATCH 2/3] feat(in-575): pr fixes --- src/features/AuthStore/hooks/useAuth.tsx | 33 ++++++++++-------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/features/AuthStore/hooks/useAuth.tsx b/src/features/AuthStore/hooks/useAuth.tsx index ce3a0133..c31be46b 100644 --- a/src/features/AuthStore/hooks/useAuth.tsx +++ b/src/features/AuthStore/hooks/useAuth.tsx @@ -55,6 +55,15 @@ export const useAuth = () => { const [isNewDeviceLogin, setIsNewDeviceLogin] = useState(false) const [userInfo, setUserInfo] = useState() + const saveToken = (value: string) => { + writeToken(value) + setCookie({ + exdays: 1, + name: 'access_token', + value, + }) + } + const login = useCallback(async () => { userManager.signinRedirect({ extraQueryParams: { lang } }) }, [lang]) @@ -75,29 +84,18 @@ export const useAuth = () => { const storeUser = useCallback((loadedUser: User) => { setUser(loadedUser) - writeToken(loadedUser.access_token) - setCookie({ - exdays: 1, - name: 'access_token', - value: loadedUser.access_token, - }) + saveToken(loadedUser.access_token) }, []) const checkUser = useCallback(async () => { const loadedUser = await userManager.getUser() if (!loadedUser) { - if (window.location.pathname.includes(PAGES.mailings)) { + if (history.location.pathname.includes(PAGES.mailings)) { const url = new URL(window.location.href) const access_token = url.searchParams.get('access_token') || '' - writeToken(access_token) - setCookie({ - exdays: 1, - name: 'access_token', - value: access_token, - }) - + saveToken(access_token) access_token && await fetchUserInfo() return Promise.resolve() } @@ -151,12 +149,7 @@ export const useAuth = () => { try { const { access_token } = await getTokenVirtualUser() - writeToken(access_token) - setCookie({ - exdays: 1, - name: 'access_token', - value: access_token, - }) + saveToken(access_token) return access_token // eslint-disable-next-line no-empty } catch { -- 2.30.2 From 0697dbf07262cac40f7ee7f7377c521b1ada3c20 Mon Sep 17 00:00:00 2001 From: Ruslan Khayrullin Date: Tue, 23 May 2023 15:58:45 +0500 Subject: [PATCH 3/3] fix: match stats bugfix --- src/features/StreamPlayer/hooks/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/features/StreamPlayer/hooks/index.tsx b/src/features/StreamPlayer/hooks/index.tsx index da9752e2..b70c5f4a 100644 --- a/src/features/StreamPlayer/hooks/index.tsx +++ b/src/features/StreamPlayer/hooks/index.tsx @@ -629,7 +629,7 @@ export const useVideoPlayer = ({ // ведем статистику просмотра матча const { start: startCollectingStats, stop: stopCollectingStats } = useInterval({ - callback: () => { + callback: useCallback(() => { if (timeForStatistics.current !== 0) { saveMatchStats({ matchId: profileId, @@ -637,7 +637,7 @@ export const useVideoPlayer = ({ sportType, }) } - }, + }, [profileId, sportType]), intervalDuration: VIEW_INTERVAL_MS, startImmediate: false, }) -- 2.30.2