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

Merge branch 'dev' into feat/um-62-prisma-property-names

Browse source
This commit is contained in:
Brian Cao 2022-10-10 12:15:43 -07:00
commit 3143765954
9 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

33
pages/api/websites/[id]/index.js
View file

@ -1,5 +1,5 @@
import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { deleteWebsite, getWebsite, getWebsiteById, updateWebsite } from 'queries';
import { methodNotAllowed, ok, unauthorized, getRandomChars } from 'next-basics';
import { deleteWebsite, getAccount, getWebsite, updateWebsite } from 'queries';
import { allowQuery } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware';
import { validate } from 'uuid';
@ -25,24 +25,31 @@ export default async (req, res) => {
if (req.method === 'POST') {
await useAuth(req, res);
const { isAdmin: currentUserIsAdmin, userId: currentUserId } = req.auth;
const { isAdmin: currentUserIsAdmin, userId: currentUserId, accountUuid } = req.auth;
const { name, domain, owner, enable_share_url } = req.body;
let account;
const website = await getWebsiteById(websiteId);
if (accountUuid) {
account = await getAccount({ accountUuid });
}
const website = await getWebsite(where);
const shareId = enable_share_url ? website.shareId || getRandomChars(8) : null;
if (website.userId !== currentUserId && !currentUserIsAdmin) {
return unauthorized(res);
}
let { shareId } = website;
if (enable_share_url) {
shareId = shareId ? shareId : getRandomChars(8);
} else {
shareId = null;
}
await updateWebsite(websiteId, { name, domain, shareId, userId: +owner });
await updateWebsite(
{
name,
domain,
shareId: shareId,
userId: account ? account.id : +owner,
},
where,
);
return ok(res);
}

2
pages/api/websites/index.js
View file

@ -32,7 +32,7 @@ export default async (req, res) => {
if (req.method === 'POST') {
const { name, domain, owner, enable_share_url } = req.body;
const website_owner = account ? account.userId : +owner;
const website_owner = account ? account.id : +owner;
if (website_owner !== currentUserId && !isAdmin) {
return unauthorized(res);