Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Updated useConfig. Added SSO page.
Mike Caoc58e037a7e97
diff --git a/hooks/useConfig.js b/hooks/useConfig.jsindex 8adedcaf2..678b6d1c3 100644--- a/hooks/useConfig.js+++ b/hooks/useConfig.js@@ -2,7 +2,7 @@ import { useEffect } from 'react';import useStore, { setConfig } from 'store/app';import useApi from 'hooks/useApi';-let fetched = false;+let loading = false;export default function useConfig() {const { config } = useStore();@@ -10,12 +10,13 @@ export default function useConfig() {async function loadConfig() {const { data } = await get('/config');+ loading = false;setConfig(data);}useEffect(() => {- if (!config && !fetched) {- fetched = true;+ if (!config && !loading) {+ loading = true;loadConfig();}}, []);diff --git a/lib/auth.js b/lib/auth.jsindex 93027544f..25985168c 100644--- a/lib/auth.js+++ b/lib/auth.js@@ -1,22 +1,26 @@import { parseSecureToken, parseToken } from 'next-basics';import { getAccount, getWebsite } from 'queries';+import debug from 'debug';import { SHARE_TOKEN_HEADER, TYPE_ACCOUNT, TYPE_WEBSITE } from 'lib/constants';import { secret } from 'lib/crypto';-export function getAuthToken(req) {+const log = debug('umami:auth');++export function parseAuthToken(req) {try {const token = req.headers.authorization;-return parseSecureToken(token.split(' ')[1], secret());- } catch {+ } catch (e) {+ log(e);return null;}}-export function getShareToken(req) {+export function parseShareToken(req) {try {return parseToken(req.headers[SHARE_TOKEN_HEADER], secret());- } catch {+ } catch (e) {+ log(e);return null;}}@@ -29,6 +33,7 @@ export function isValidToken(token, validation) {return validation(token);}} catch (e) {+ log(e);return false;}diff --git a/lib/crypto.js b/lib/crypto.jsindex 74470549e..ceb8aa995 100644--- a/lib/crypto.js+++ b/lib/crypto.js@@ -9,11 +9,11 @@ export function secret() {export function salt() {const ROTATING_SALT = hash(startOfMonth(new Date()).toUTCString());- return hash([secret(), ROTATING_SALT]);+ return hash(secret(), ROTATING_SALT);}export function uuid(...args) {if (!args.length) return v4();- return v5(hash([...args, salt()]), v5.DNS);+ return v5(hash(...args, salt()), v5.DNS);}diff --git a/lib/middleware.js b/lib/middleware.jsindex 8189ea662..d42823faf 100644--- a/lib/middleware.js+++ b/lib/middleware.js@@ -1,7 +1,7 @@import { createMiddleware, unauthorized, badRequest, serverError } from 'next-basics';import cors from 'cors';import { getSession } from './session';-import { getAuthToken, getShareToken } from './auth';+import { parseAuthToken, parseShareToken } from './auth';export const useCors = createMiddleware(cors());@@ -26,8 +26,8 @@ export const useSession = createMiddleware(async (req, res, next) => {});export const useAuth = createMiddleware(async (req, res, next) => {- const token = await getAuthToken(req);- const shareToken = await getShareToken(req);+ const token = await parseAuthToken(req);+ const shareToken = await parseShareToken(req);if (!token && !shareToken) {return unauthorized(res);diff --git a/package.json b/package.jsonindex aad3b913b..e27b1f61c 100644--- a/package.json+++ b/package.json@@ -84,7 +84,7 @@"maxmind": "^4.3.6","moment-timezone": "^0.5.35","next": "^12.3.1",- "next-basics": "^0.18.0",+ "next-basics": "^0.20.0","node-fetch": "^3.2.8","npm-run-all": "^4.1.5","prop-types": "^15.7.2",diff --git a/pages/_app.js b/pages/_app.jsindex 0d942f9d8..c3617a089 100644--- a/pages/_app.js+++ b/pages/_app.js@@ -2,34 +2,27 @@ import Head from 'next/head';import { useRouter } from 'next/router';import { IntlProvider } from 'react-intl';import useLocale from 'hooks/useLocale';+import useConfig from 'hooks/useConfig';import 'styles/variables.css';import 'styles/bootstrap-grid.css';import 'styles/index.css';import '@fontsource/inter/400.css';import '@fontsource/inter/600.css';-const Intl = ({ children }) => {- const { locale, messages } = useLocale();-- const Wrapper = ({ children }) => <span className={locale}>{children}</span>;-- return (- <IntlProvider locale={locale} messages={messages[locale]} textComponent={Wrapper}>- {children}- </IntlProvider>- );-};-export default function App({ Component, pageProps }) {+ const { locale, messages } = useLocale();const { basePath } = useRouter();const { dir } = useLocale();+ useConfig();++ const Wrapper = ({ children }) => <span className={locale}>{children}</span>;if (process.env.uiDisabled) {return null;}return (- <Intl>+ <IntlProvider locale={locale} messages={messages[locale]} textComponent={Wrapper}><Head><link rel="icon" href={`${basePath}/favicon.ico`} /><link rel="apple-touch-icon" sizes="180x180" href={`${basePath}/apple-touch-icon.png`} />@@ -45,6 +38,6 @@ export default function App({ Component, pageProps }) {<div className="container" dir={dir}><Component {...pageProps} /></div>- </Intl>+ </IntlProvider>);}diff --git a/pages/sso.js b/pages/sso.jsnew file mode 100644index 000000000..c2c337abc--- /dev/null+++ b/pages/sso.js@@ -0,0 +1,38 @@+import { useEffect } from 'react';+import debug from 'debug';+import { useRouter } from 'next/router';+import { setItem } from 'next-basics';+import { AUTH_TOKEN } from 'lib/constants';+import useApi from 'hooks/useApi';+import { setUser } from 'store/app';++const log = debug('umami:sso');++export default function SingleSignOnPage() {+ const router = useRouter();+ const { get } = useApi();+ const { token, url } = router.query;++ useEffect(() => {+ async function verify() {+ setItem(AUTH_TOKEN, token);++ const { ok, data } = await get('/auth/verify');++ if (ok) {+ log(data);+ setUser(data);++ if (url) {+ await router.push(url);+ }+ }+ }++ if (token) {+ verify();+ }+ }, [token]);++ return null;+}diff --git a/yarn.lock b/yarn.lockindex ef95aaec1..5aa6d8416 100644--- a/yarn.lock+++ b/yarn.lock@@ -5244,10 +5244,10 @@ natural-compare@^1.4.0:resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=-next-basics@^0.18.0:- version "0.18.0"- resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.18.0.tgz#7683ec67d562fb57a6f3fb346c989802157450d1"- integrity sha512-KJZjAHahQ++YYaSPuJVAY0wH9QYXVq85ZUGW5mBMq+qDfL8ZVG4nTWc8GhuI8EYLLR+oZp/eInvoqYgiW/dbhg==+next-basics@^0.20.0:+ version "0.20.0"+ resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.20.0.tgz#f88791dcc538438b5044695e37d58b4fdccc6dd8"+ integrity sha512-KPqVVSzkKUvu9shvZt5Bp7Xv1nZ2xJRRqwqQ+a6a5JjsdE10Q3p07VLrT2ykl+v/CvR4sz98c0n+MaWpgO3Ckw==dependencies:base-x "^4.0.0"bcryptjs "^2.4.3"