📈 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
fix: twoFA, register
kruzhambus4e1553189274
diff --git a/src/pages/Auth/Signin/Signin.jsx b/src/pages/Auth/Signin/Signin.jsxindex 6f232108e..1897e07e6 100644--- a/src/pages/Auth/Signin/Signin.jsx+++ b/src/pages/Auth/Signin/Signin.jsx@@ -16,8 +16,9 @@ import {isValidEmail, isValidPassword, MIN_PASSWORD_CHARS,} from 'utils/validator'import { isSelfhosted } from 'redux/constants'-import { submit2FA } from 'api'+import { submit2FA, authMe } from 'api'import { setAccessToken } from 'utils/accessToken'+import { setRefreshToken } from 'utils/refreshToken'const Signin = ({ login, loginSuccess, loginFailed }) => {const { t } = useTranslation('common')@@ -81,8 +82,9 @@ const Signin = ({ login, loginSuccess, loginFailed }) => {setIsLoading(true)try {- const { accessToken, user } = await submit2FA(twoFACode)- setAccessToken(accessToken, form.dontRemember)+ const { accessToken, refreshToken, user } = await submit2FA(twoFACode)+ setAccessToken(accessToken)+ setRefreshToken(refreshToken)loginSuccess(user)} catch (err) {if (_isString(err)) {diff --git a/src/pages/UserSettings/components/TwoFA.jsx b/src/pages/UserSettings/components/TwoFA.jsxindex 8c3de71ac..a1d4a69f7 100644--- a/src/pages/UserSettings/components/TwoFA.jsx+++ b/src/pages/UserSettings/components/TwoFA.jsx@@ -11,6 +11,7 @@ import {generate2FA, enable2FA, disable2FA,} from 'api'import { setAccessToken } from 'utils/accessToken'+import { setRefreshToken } from 'utils/refreshToken'const TwoFA = ({user, dontRemember, updateUserData, login, genericError,@@ -59,9 +60,10 @@ const TwoFA = ({setIsTwoFaLoading(true)try {- const { twoFactorRecoveryCode, accessToken, user: updatedUser } = await enable2FA(twoFACode)- login(updatedUser)+ const { twoFactorRecoveryCode, accessToken, refreshToken } = await enable2FA(twoFACode)+ setRefreshToken(refreshToken)setAccessToken(accessToken, dontRemember)+ updateUserData({ isTwoFactorAuthenticationEnabled: true })setTwoFARecovery(twoFactorRecoveryCode)} catch (e) {if (_isString(e)) {diff --git a/src/redux/sagas/auth/workers/signin.js b/src/redux/sagas/auth/workers/signin.jsindex cbf93fbd8..c568a645d 100644--- a/src/redux/sagas/auth/workers/signin.js+++ b/src/redux/sagas/auth/workers/signin.js@@ -20,6 +20,7 @@ export default function* singinWorker({ payload: { credentials, callback } }) {if (user.isTwoFactorAuthenticationEnabled) {yield call(setAccessToken, accessToken, true)+ yield call(setRefreshToken, refreshToken)yield put(authActions.updateUserData(user))callback(false, true)return