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
Changed HASH_SALT to APP_SECRET.
Mike Cao7bbed0e12bb3
diff --git a/app.json b/app.jsonindex ba8b8c457..cec5fda10 100644--- a/app.json+++ b/app.json@@ -6,7 +6,7 @@"repository": "https://github.com/umami-software/umami","addons": ["heroku-postgresql"],"env": {- "HASH_SALT": {+ "APP_SECRET": {"description": "Used to generate unique values for your installation","required": true,"generator": "secret"diff --git a/components/forms/WebsiteEditForm.js b/components/forms/WebsiteEditForm.jsindex 1678fea8d..dd3d39899 100644--- a/components/forms/WebsiteEditForm.js+++ b/components/forms/WebsiteEditForm.js@@ -2,11 +2,10 @@ import { SubmitButton, Form, FormInput, FormRow, FormButtons, TextField } from 'import { useMutation } from '@tanstack/react-query';import { useRef } from 'react';import useApi from 'hooks/useApi';-import { getClientAuthToken } from 'lib/client';import { DOMAIN_REGEX } from 'lib/constants';export default function WebsiteEditForm({ websiteId, data, onSave }) {- const { post } = useApi(getClientAuthToken());+ const { post } = useApi();const { mutate, error } = useMutation(data => post(`/websites/${websiteId}`, data));const ref = useRef(null);diff --git a/docker-compose.yml b/docker-compose.ymlindex 9864486c5..84b45f27e 100644--- a/docker-compose.yml+++ b/docker-compose.yml@@ -8,7 +8,7 @@ services:environment:DATABASE_URL: postgresql://umami:umami@db:5432/umamiDATABASE_TYPE: postgresql- HASH_SALT: replace-me-with-a-random-string+ APP_SECRET: replace-me-with-a-random-stringdepends_on:- dbrestart: alwaysdiff --git a/hooks/useApi.js b/hooks/useApi.jsindex 662a1da93..72683df10 100644--- a/hooks/useApi.js+++ b/hooks/useApi.js@@ -1,71 +1,13 @@-import { useCallback } from 'react';+import { useApi as nextUseApi } from 'next-basics';+import { getClientAuthToken } from 'lib/client';import { useRouter } from 'next/router';-import { get, post, put, del, getItem } from 'next-basics';-import { AUTH_TOKEN, SHARE_TOKEN_HEADER } from 'lib/constants';-import useStore from 'store/app';-const selector = state => state.shareToken;--function parseHeaders(headers, { authToken, shareToken }) {- if (authToken) {- headers.authorization = `Bearer ${authToken}`;- }-- if (shareToken) {- headers[SHARE_TOKEN_HEADER] = shareToken.token;- }-- return headers;-}--export default function useApi() {+export function useApi() {const { basePath } = useRouter();- const authToken = getItem(AUTH_TOKEN);- const shareToken = useStore(selector);-- return {- get: useCallback(- async (url, params = {}, headers = {}) => {- return get(- `${basePath}/api${url}`,- params,- parseHeaders(headers, { authToken, shareToken }),- );- },- [get],- ),- post: useCallback(- async (url, params = {}, headers = {}) => {- return post(- `${basePath}/api${url}`,- params,- parseHeaders(headers, { authToken, shareToken }),- );- },- [post],- ),+ const { get, post, put, del } = nextUseApi(getClientAuthToken(), basePath);- put: useCallback(- async (url, params = {}, headers = {}) => {- return put(- `${basePath}/api${url}`,- params,- parseHeaders(headers, { authToken, shareToken }),- );- },- [put],- ),-- del: useCallback(- async (url, params = {}, headers = {}) => {- return del(- `${basePath}/api${url}`,- params,- parseHeaders(headers, { authToken, shareToken }),- );- },- [del],- ),- };+ return { get, post, put, del };}++export default useApi;diff --git a/lib/crypto.js b/lib/crypto.jsindex ceb8aa995..ae609d0f2 100644--- a/lib/crypto.js+++ b/lib/crypto.js@@ -3,7 +3,7 @@ import { startOfMonth } from 'date-fns';import { hash } from 'next-basics';export function secret() {- return hash(process.env.HASH_SALT || process.env.DATABASE_URL);+ return hash(process.env.APP_SECRET || process.env.DATABASE_URL);}export function salt() {