m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feat/um-23-new-schema

Browse Source
This commit is contained in:
Brian Cao 2022-11-16 18:34:03 -08:00
commit b0c7980a20
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/clickhouse/schema.sql
View File

@ -71,6 +71,6 @@ SELECT website_id,
country, country,
event_type, event_type,
event_name, event_name,
event_data, if((empty(event_data) = 0) AND startsWith(event_data, '"'), concat('{', event_data, ': true}'), event_data) AS event_data,
created_at created_at
FROM event_queue; FROM event_queue;

11
lib/auth.js
View File

@ -50,12 +50,9 @@ export function isValidToken(token, validation) {
export async function allowQuery(req, type) { export async function allowQuery(req, type) {
const { id } = req.query; const { id } = req.query;
const { const { user, shareToken } = req.auth;
user: { id: userId, isAdmin },
shareToken,
} = req.auth;
if (isAdmin) { if (user?.isAdmin) {
return true; return true;
} }
@ -63,11 +60,11 @@ export async function allowQuery(req, type) {
return isValidToken(shareToken, { id }); return isValidToken(shareToken, { id });
} }
if (userId) { if (user?.id) {
if (type === TYPE_WEBSITE) { if (type === TYPE_WEBSITE) {
const website = await getWebsite({ id }); const website = await getWebsite({ id });
return website && website.userId === userId; return website && website.userId === user.id;
} else if (type === TYPE_USER) { } else if (type === TYPE_USER) {
const user = await getUser({ id }); const user = await getUser({ id });

4
lib/middleware.js
View File

@ -29,12 +29,12 @@ export const useAuth = createMiddleware(async (req, res, next) => {
const payload = parseSecureToken(token, secret()); const payload = parseSecureToken(token, secret());
const shareToken = await parseShareToken(req); const shareToken = await parseShareToken(req);
let user; let user = null;
const { userId, key } = payload || {}; const { userId, key } = payload || {};
if (validate(userId)) { if (validate(userId)) {
user = await getUser({ id: userId }); user = await getUser({ id: userId });
} else if (redis.enabled) { } else if (redis.enabled && key) {
user = await redis.get(key); user = await redis.get(key);
} }