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

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse source 
# Conflicts:
#	public/iso-3166-2.json
This commit is contained in:
Mike Cao 2023-04-13 22:30:22 -07:00
commit e286994397
17 changed files with 47 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/auth.ts
View file

@ -95,17 +95,11 @@ export async function canViewWebsite({ user, shareToken }: Auth, websiteId: stri
return false;
}
export async function canCreateWebsite({ user }: Auth, teamId?: string) {
export async function canCreateWebsite({ user }: Auth) {
if (user.isAdmin) {
return true;
}
if (teamId) {
const teamUser = await getTeamUser(teamId, user.id);
return hasPermission(teamUser?.role, PERMISSIONS.websiteCreate);
}
return hasPermission(user.role, PERMISSIONS.websiteCreate);
}

1
lib/types.ts
View file

@ -43,6 +43,7 @@ export interface User {
id: string;
username: string;
password?: string;
role: string;
createdAt?: Date;
}