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!

fix: user being logged out on page refresh

Blue Mouse0f6415cf05bf
diff --git a/web/app/api/index.ts b/web/app/api/index.ts
index b523a0588..878dd9498 100644
--- a/web/app/api/index.ts
+++ b/web/app/api/index.ts
@@ -14,9 +14,9 @@ import { Stats } from '~/lib/models/Stats'
import { Subscriber } from '~/lib/models/Subscriber'
import { User, FeatureFlag } from '~/lib/models/User'
import { Filter, ProjectViewCustomEvent } from '~/pages/Project/View/interfaces/traffic'
-import { getAccessToken, removeAccessToken, setAccessToken } from '~/utils/accessToken'
+import { getAccessToken, setAccessToken } from '~/utils/accessToken'
import { logout } from '~/utils/auth'
-import { getRefreshToken, removeRefreshToken } from '~/utils/refreshToken'
+import { getRefreshToken } from '~/utils/refreshToken'
const api = axios.create({
baseURL: API_URL,
@@ -78,11 +78,7 @@ export const logoutApi = (refreshToken: string | null) =>
Authorization: `Bearer ${refreshToken}`,
},
})
- .then((response) => {
- removeAccessToken()
- removeRefreshToken()
- return response.data
- })
+ .then((response) => response.data)
.catch((error) => {
throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
})
diff --git a/web/app/pages/UserSettings/UserSettings.tsx b/web/app/pages/UserSettings/UserSettings.tsx
index 4cdc33dcd..49bdc97b0 100644
--- a/web/app/pages/UserSettings/UserSettings.tsx
+++ b/web/app/pages/UserSettings/UserSettings.tsx
@@ -326,7 +326,7 @@ const UserSettings = () => {
const onAccountDelete = async () => {
try {
await deleteUser(deletionFeedback)
- logout(true)
+ logout()
toast.success(t('apiNotifications.accountDeleted'))
trackCustom('ACCOUNT_DELETED', {
reason_stated: deletionFeedback ? 'true' : 'false',
diff --git a/web/app/providers/AuthProvider.tsx b/web/app/providers/AuthProvider.tsx
index 60e992252..434c6d8d4 100644
--- a/web/app/providers/AuthProvider.tsx
+++ b/web/app/providers/AuthProvider.tsx
@@ -1,3 +1,4 @@
+import { isCancel } from 'axios'
import { createContext, useCallback, useContext, useEffect, useState } from 'react'
import { authMe } from '~/api'
@@ -56,7 +57,7 @@ export const AuthProvider = ({ children, initialIsAuthenticated }: AuthProviderP
setTotalMonthlyEvents(totalMonthlyEvents)
setIsAuthenticated(true)
} catch (error) {
- if (error instanceof Error && error.name === 'AbortError') {
+ if (isCancel(error)) {
return
}