watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refactored queries.

Browse source
This commit is contained in:
Mike Cao 2023-07-29 22:03:34 -07:00
parent f36a689817
commit 8904b7b4ed
27 changed files with 137 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/auth.ts
View file

@ -10,8 +10,7 @@ import {
parseSecureToken,
parseToken,
} from 'next-basics';
import { getTeamUser } from 'queries';
import { getTeamWebsite, getTeamWebsiteByTeamMemberId } from 'queries/admin/teamWebsite';
import { getTeamUser, getTeamWebsite, findTeamWebsiteByUserId } from 'queries';
import { loadWebsite } from './load';
import { Auth } from './types';
@ -79,19 +78,13 @@ export async function canViewWebsite({ user, shareToken }: Auth, websiteId: stri
return true;
}
const teamWebsite = await getTeamWebsiteByTeamMemberId(websiteId, user.id);
if (teamWebsite) {
return true;
}
const website = await loadWebsite(websiteId);
if (website.userId) {
return user.id === website.userId;
}
return false;
return !!(await findTeamWebsiteByUserId(websiteId, user.id));
}
export async function canCreateWebsite({ user }: Auth) {
@ -139,15 +132,11 @@ export async function canViewReport(auth: Auth, report: Report) {
return true;
}
if ((auth.user.id = report.userId)) {
if (auth.user.id == report.userId) {
return true;
}
if (await canViewWebsite(auth, report.websiteId)) {
return true;
}
return false;
return !!(await canViewWebsite(auth, report.websiteId));
}
export async function canUpdateReport(auth: Auth, report: Report) {
@ -155,11 +144,7 @@ export async function canUpdateReport(auth: Auth, report: Report) {
return true;
}
if ((auth.user.id = report.userId)) {
return true;
}
return false;
return auth.user.id == report.userId;
}
export async function canCreateTeam({ user }: Auth) {