📈 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
some improvements
Blue Mouse81e976be921c
diff --git a/package.json b/package.jsonindex 400cab301..ea1a5302d 100644--- a/package.json+++ b/package.json@@ -9,6 +9,7 @@"@swetrix/sdk": "^1.0.0","@tailwindcss/forms": "^0.5.3","axios": "^1.2.2",+ "axios-auth-refresh": "^3.3.6","billboard.js": "^3.6.3","clsx": "^1.2.1","d3": "^7.8.0",diff --git a/src/api/index.js b/src/api/index.jsindex 27a72eb1f..36a2de0ff 100644--- a/src/api/index.js+++ b/src/api/index.js@@ -1,5 +1,6 @@/* eslint-disable implicit-arrow-linebreak */import axios from 'axios'+import createAuthRefreshInterceptor from 'axios-auth-refresh'import { store } from 'redux/store'import Debug from 'debug'import _map from 'lodash/map'@@ -7,15 +8,36 @@ import _isEmpty from 'lodash/isEmpty'import _isArray from 'lodash/isArray'import { authActions } from 'redux/actions/auth'-import { getAccessToken, removeAccessToken } from 'utils/accessToken'+import { getAccessToken, removeAccessToken, setAccessToken } from 'utils/accessToken'+import { getRefreshToken, removeRefreshToken } from 'utils/refreshToken'import { DEFAULT_ALERTS_TAKE, isSelfhosted } from 'redux/constants'const debug = Debug('swetrix:api')+const baseURL = isSelfhosted ? window.env.API_URL : process.env.REACT_APP_API_URLconst api = axios.create({- baseURL: isSelfhosted ? window.env.API_URL : process.env.REACT_APP_API_URL,+ baseURL,})+// Function that will be called to refresh authorization+const refreshAuthLogic = (failedRequest) =>+ axios+ .post(`${baseURL}/v1/auth/refresh-token`, null, {+ headers: {+ Authorization: `Bearer ${getRefreshToken}`,+ },+ })+ .then((tokenRefreshResponse) => {+ const { accessToken } = tokenRefreshResponse.data+ setAccessToken(accessToken)+ // eslint-disable-next-line+ failedRequest.response.config.headers.Authorization = `Bearer ${accessToken}`+ return Promise.resolve()+ })++// Instantiate the interceptor+createAuthRefreshInterceptor(api, refreshAuthLogic)+api.interceptors.request.use((config) => {const token = getAccessToken()@@ -33,17 +55,29 @@ api.interceptors.request.use(api.interceptors.response.use((response) => response,(error) => {- if (error.response?.data.statusCode === 401) {- removeAccessToken()- store.dispatch(authActions.logout())- }+ // if (error.response?.data.statusCode === 401) {+ // removeAccessToken()+ // removeRefreshToken()+ // store.dispatch(authActions.logout())+ // }return Promise.reject(error)},)export const authMe = () =>api- .get('v1/auth/me')+ .get('user/me')+ .then((response) => response.data)+ .catch((error) => {+ debug('%s', error)+ throw _isEmpty(error.response.data?.message)+ ? error.response.data+ : error.response.data.message+ })++export const refreshToken = () =>+ api+ .post('v1/auth/refresh-token').then((response) => response.data).catch((error) => {debug('%s', error)diff --git a/src/redux/actions/auth/index.js b/src/redux/actions/auth/index.jsindex bff08f4fa..58bf19821 100644--- a/src/redux/actions/auth/index.js+++ b/src/redux/actions/auth/index.js@@ -1,5 +1,6 @@import { removeItem } from 'utils/localstorage'import { removeAccessToken } from 'utils/accessToken'+import { removeRefreshToken } from 'utils/refreshToken'import { LS_VIEW_PREFS_SETTING } from 'redux/constants'import { types } from './types'@@ -33,6 +34,7 @@ export const authActions = {logout() {removeAccessToken()+ removeRefreshToken()removeItem(LS_VIEW_PREFS_SETTING)return {diff --git a/src/redux/constants/index.js b/src/redux/constants/index.jsindex 18a3da56d..69dbbd7a7 100644--- a/src/redux/constants/index.js+++ b/src/redux/constants/index.js@@ -138,6 +138,7 @@ export const GDPR_REQUEST = 'gdpr_request'export const CONFIRMATION_TIMEOUT = 'confirmation_timeout'export const LOW_EVENTS_WARNING = 'low_events_warning'export const TOKEN = 'access_token'+export const REFRESH_TOKEN = 'refresh_token'// List of languages with translations availableexport const whitelist = ['en', 'uk', 'de', 'sv', 'el', 'ru', 'hi', 'zh']diff --git a/src/redux/sagas/auth/workers/signin.js b/src/redux/sagas/auth/workers/signin.jsindex a7a842415..f1b979c6b 100644--- a/src/redux/sagas/auth/workers/signin.js+++ b/src/redux/sagas/auth/workers/signin.js@@ -7,11 +7,14 @@ import _omit from 'lodash/omit'import UIActions from 'redux/actions/ui'import { setAccessToken } from 'utils/accessToken'import { login } from 'api'+import { setRefreshToken } from 'utils/refreshToken'export default function* singinWorker({ payload: { credentials, callback } }) {try {const { dontRemember } = credentials- const { user, accessToken } = yield call(login, _omit(credentials, ['dontRemember']))+ const {+ user, accessToken, refreshToken,+ } = yield call(login, _omit(credentials, ['dontRemember']))yield put(authActions.setDontRemember(dontRemember))@@ -24,6 +27,7 @@ export default function* singinWorker({ payload: { credentials, callback } }) {yield put(authActions.loginSuccess(user))yield call(setAccessToken, accessToken, dontRemember)+ yield call(setRefreshToken, refreshToken)yield put(UIActions.setThemeType(user.theme))yield put(UIActions.loadProjects())yield put(UIActions.loadSharedProjects())diff --git a/src/redux/sagas/auth/workers/signup.js b/src/redux/sagas/auth/workers/signup.jsindex 3325d8a89..427829469 100644--- a/src/redux/sagas/auth/workers/signup.js+++ b/src/redux/sagas/auth/workers/signup.js@@ -6,17 +6,21 @@ import _omit from 'lodash/omit'import UIActions from 'redux/actions/ui'import { setAccessToken } from 'utils/accessToken'import { signup } from 'api'+import { setRefreshToken } from 'utils/refreshToken'export default function* signupWorder({ payload: { data: rawData, callback, t } }) {try {const { repeat, ...data } = rawDataconst { dontRemember } = data- const response = yield call(signup, _omit(data, ['dontRemember']))+ const {+ user, accessToken, refreshToken, // theme,+ } = yield call(signup, _omit(data, ['dontRemember']))- yield put(authActions.signupSuccess(response.user))- yield call(setAccessToken, response.accessToken, dontRemember)+ yield put(authActions.signupSuccess(user))+ yield call(setAccessToken, accessToken, dontRemember)+ yield call(setRefreshToken, refreshToken)yield put(authActions.setDontRemember(dontRemember))- yield put(UIActions.setThemeType(response.theme))+ // yield put(UIActions.setThemeType(response.theme))yield put(UIActions.loadProjects())yield put(UIActions.loadSharedProjects())yield put(UIActions.loadProjectAlerts())diff --git a/src/utils/refreshToken.js b/src/utils/refreshToken.jsnew file mode 100644index 000000000..8177d3ce2--- /dev/null+++ b/src/utils/refreshToken.js@@ -0,0 +1,18 @@+import _isEmpty from 'lodash/isEmpty'+import { REFRESH_TOKEN } from 'redux/constants'+import { getCookie, setCookie } from './cookie'++// 14 weeks in seconds+const STORE_REFRESH_TOKEN_FOR = 8467200++export const getRefreshToken = () => {+ return getCookie(REFRESH_TOKEN)+}++export const setRefreshToken = (token) => {+ setCookie(REFRESH_TOKEN, token, STORE_REFRESH_TOKEN_FOR)+}++export const removeRefreshToken = () => {+ setCookie(REFRESH_TOKEN, '', 0)+}