watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 05:37:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Update team/website permission check.

Browse source
This commit is contained in:
Brian Cao 2023-08-23 11:26:41 -07:00
parent c5345b01bb
commit f794b5674b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/auth.ts
View file

@ -4,7 +4,7 @@ import debug from 'debug';
import { PERMISSIONS, ROLE_PERMISSIONS, SHARE_TOKEN_HEADER } from 'lib/constants';
import { secret } from 'lib/crypto';
import { createSecureToken, ensureArray, getRandomChars, parseToken } from 'next-basics';
import { findTeamWebsiteByUserId, getTeamUser, getTeamWebsite, getWebsitesByUserId } from 'queries';
import { findTeamWebsiteByUserId, getTeamUser, getTeamWebsite } from 'queries';
import { loadWebsite } from './load';
import { Auth } from './types';
@ -60,11 +60,11 @@ export async function canViewWebsite({ user, shareToken }: Auth, websiteId: stri
export async function canCreateWebsite({ user, grant }: Auth) {
if (cloudMode) {
if (grant.find(a => a === PERMISSIONS.websiteCreate)) {
if (grant?.find(a => a === PERMISSIONS.websiteCreate)) {
return true;
}
return (await getWebsitesByUserId(user.id)).count < Number(process.env.WEBSITE_LIMIT);
return false;
}
if (user.isAdmin) {
@ -120,7 +120,7 @@ export async function canDeleteReport(auth: Auth, report: Report) {
export async function canCreateTeam({ user, grant }: Auth) {
if (cloudMode) {
if (grant.find(a => a === PERMISSIONS.teamCreate)) {
if (grant?.find(a => a === PERMISSIONS.teamCreate)) {
return true;
}

0
src/lib/date.js → src/lib/date.ts
View file