mirror of
https://github.com/kremalicious/umami.git
synced 2024-06-28 16:57:52 +02:00
Merge branch 'dev' into feat/um-23-new-schema
This commit is contained in:
commit
b0c7980a20
|
@ -71,6 +71,6 @@ SELECT website_id,
|
|||
country,
|
||||
event_type,
|
||||
event_name,
|
||||
event_data,
|
||||
if((empty(event_data) = 0) AND startsWith(event_data, '"'), concat('{', event_data, ': true}'), event_data) AS event_data,
|
||||
created_at
|
||||
FROM event_queue;
|
11
lib/auth.js
11
lib/auth.js
|
@ -50,12 +50,9 @@ export function isValidToken(token, validation) {
|
|||
export async function allowQuery(req, type) {
|
||||
const { id } = req.query;
|
||||
|
||||
const {
|
||||
user: { id: userId, isAdmin },
|
||||
shareToken,
|
||||
} = req.auth;
|
||||
const { user, shareToken } = req.auth;
|
||||
|
||||
if (isAdmin) {
|
||||
if (user?.isAdmin) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -63,11 +60,11 @@ export async function allowQuery(req, type) {
|
|||
return isValidToken(shareToken, { id });
|
||||
}
|
||||
|
||||
if (userId) {
|
||||
if (user?.id) {
|
||||
if (type === TYPE_WEBSITE) {
|
||||
const website = await getWebsite({ id });
|
||||
|
||||
return website && website.userId === userId;
|
||||
return website && website.userId === user.id;
|
||||
} else if (type === TYPE_USER) {
|
||||
const user = await getUser({ id });
|
||||
|
||||
|
|
|
@ -29,12 +29,12 @@ export const useAuth = createMiddleware(async (req, res, next) => {
|
|||
const payload = parseSecureToken(token, secret());
|
||||
const shareToken = await parseShareToken(req);
|
||||
|
||||
let user;
|
||||
let user = null;
|
||||
const { userId, key } = payload || {};
|
||||
|
||||
if (validate(userId)) {
|
||||
user = await getUser({ id: userId });
|
||||
} else if (redis.enabled) {
|
||||
} else if (redis.enabled && key) {
|
||||
user = await redis.get(key);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user