📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
added temp refresh token logic
Blue Mousee76d797137eb
diff --git a/src/pages/Auth/Signin/Signin.tsx b/src/pages/Auth/Signin/Signin.tsxindex 6e924cbd2..dffdb598a 100644--- a/src/pages/Auth/Signin/Signin.tsx+++ b/src/pages/Auth/Signin/Signin.tsx@@ -21,7 +21,7 @@ import { isSelfhosted } from 'redux/constants'import { IUser } from 'redux/models/IUser'import { submit2FA } from 'api'import { setAccessToken, removeAccessToken } from 'utils/accessToken'-import { setRefreshToken } from 'utils/refreshToken'+import { setRefreshToken, removeRefreshToken } from 'utils/refreshToken'interface ISigninForm {email: string,@@ -119,6 +119,7 @@ const Signin = ({try {const { accessToken, refreshToken, user } = await submit2FA(twoFACode)removeAccessToken()+ removeRefreshToken()setAccessToken(accessToken)setRefreshToken(refreshToken)loginSuccess(user)diff --git a/src/redux/sagas/auth/workers/signin.ts b/src/redux/sagas/auth/workers/signin.tsindex c348560fb..39e73a8b1 100644--- a/src/redux/sagas/auth/workers/signin.ts+++ b/src/redux/sagas/auth/workers/signin.ts@@ -30,7 +30,7 @@ export default function* singinWorker({ payload: { credentials, callback } }: {if (user.isTwoFactorAuthenticationEnabled) {yield call(setAccessToken, accessToken, true)- yield call(setRefreshToken, refreshToken)+ yield call(setRefreshToken, refreshToken, true)yield put(authActions.updateUserData(user))callback(false, true)returndiff --git a/src/utils/refreshToken.ts b/src/utils/refreshToken.tsindex 00b2f3a76..28b5014f7 100644--- a/src/utils/refreshToken.ts+++ b/src/utils/refreshToken.ts@@ -1,3 +1,5 @@+import _isEmpty from 'lodash/isEmpty'+import { REFRESH_TOKEN } from 'redux/constants'import { getCookie, setCookie, deleteCookie } from './cookie'@@ -5,13 +7,25 @@ import { getCookie, setCookie, deleteCookie } from './cookie'const STORE_REFRESH_TOKEN_FOR = 8467200export const getRefreshToken = () => {- return getCookie(REFRESH_TOKEN)+ let refreshToken = getCookie(REFRESH_TOKEN)++ if (_isEmpty(refreshToken)) {+ refreshToken = sessionStorage.getItem(REFRESH_TOKEN)+ }++ return refreshToken}-export const setRefreshToken = (token: string) => {+export const setRefreshToken = (token: string, temporary: boolean = false) => {+ if (temporary) {+ sessionStorage.setItem(REFRESH_TOKEN, token)+ return+ }+setCookie(REFRESH_TOKEN, token, STORE_REFRESH_TOKEN_FOR)}export const removeRefreshToken = () => {deleteCookie(REFRESH_TOKEN)+ sessionStorage.removeItem(REFRESH_TOKEN)}