Skip to content

📈 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!

using new 'accessToken' spelling

Blue Mouse1e51f2d54db6
diff --git a/src/pages/Auth/Signin/Signin.jsx b/src/pages/Auth/Signin/Signin.jsx
index 7ff774f4c..6f232108e 100644
--- a/src/pages/Auth/Signin/Signin.jsx
+++ b/src/pages/Auth/Signin/Signin.jsx
@@ -81,7 +81,7 @@ const Signin = ({ login, loginSuccess, loginFailed }) => {
setIsLoading(true)
try {
- const { access_token: accessToken, user } = await submit2FA(twoFACode)
+ const { accessToken, user } = await submit2FA(twoFACode)
setAccessToken(accessToken, form.dontRemember)
loginSuccess(user)
} catch (err) {
diff --git a/src/pages/UserSettings/components/TwoFA.jsx b/src/pages/UserSettings/components/TwoFA.jsx
index 5d82a1836..8c3de71ac 100644
--- a/src/pages/UserSettings/components/TwoFA.jsx
+++ b/src/pages/UserSettings/components/TwoFA.jsx
@@ -59,7 +59,7 @@ const TwoFA = ({
setIsTwoFaLoading(true)
try {
- const { twoFactorRecoveryCode, access_token: accessToken, user: updatedUser } = await enable2FA(twoFACode)
+ const { twoFactorRecoveryCode, accessToken, user: updatedUser } = await enable2FA(twoFACode)
login(updatedUser)
setAccessToken(accessToken, dontRemember)
setTwoFARecovery(twoFactorRecoveryCode)
diff --git a/src/redux/sagas/auth/workers/signin.js b/src/redux/sagas/auth/workers/signin.js
index acc3ff841..a7a842415 100644
--- a/src/redux/sagas/auth/workers/signin.js
+++ b/src/redux/sagas/auth/workers/signin.js
@@ -2,6 +2,7 @@ import { call, put } from 'redux-saga/effects'
import { authActions } from 'redux/actions/auth'
import { errorsActions } from 'redux/actions/errors'
import _isObject from 'lodash/isPlainObject'
+import _omit from 'lodash/omit'
import UIActions from 'redux/actions/ui'
import { setAccessToken } from 'utils/accessToken'
@@ -10,7 +11,7 @@ import { login } from 'api'
export default function* singinWorker({ payload: { credentials, callback } }) {
try {
const { dontRemember } = credentials
- const { user, access_token: accessToken } = yield call(login, credentials)
+ const { user, accessToken } = yield call(login, _omit(credentials, ['dontRemember']))
yield put(authActions.setDontRemember(dontRemember))
diff --git a/src/redux/sagas/auth/workers/signup.js b/src/redux/sagas/auth/workers/signup.js
index 13140c912..9bce341e2 100644
--- a/src/redux/sagas/auth/workers/signup.js
+++ b/src/redux/sagas/auth/workers/signup.js
@@ -13,7 +13,7 @@ export default function* signupWorder({ payload: { data: rawData, callback, t }
const response = yield call(signup, data)
yield put(authActions.signupSuccess(response.user))
- yield call(setAccessToken, response.access_token, dontRemember)
+ yield call(setAccessToken, response.accessToken, dontRemember)
yield put(authActions.setDontRemember(dontRemember))
yield put(UIActions.setThemeType(response.theme))
yield put(UIActions.loadProjects())