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

v1.39.2 (#1599)

Browse source 
* Fixed issue with realtime page rendering.

* fix auth, add pg extension (#1596)

* Fixed change password issue. API refactoring. Closes #1592.

* Fixed account lookup.

* Fixed issue with accessing user dashboards. Closes #1590

* fix sort on dashboard (#1600)

Co-authored-by: Brian Cao <brian@umami.is>
This commit is contained in:
Mike Cao 2022-10-25 16:50:12 -07:00 • committed by GitHub
parent 94dc915272
commit aceb904398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 145 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,19 +2,20 @@ import { allowQuery } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware';
import { getRandomChars, methodNotAllowed, ok, serverError, unauthorized } from 'next-basics';
import { deleteWebsite, getAccount, getWebsite, updateWebsite } from 'queries';
import { TYPE_WEBSITE } from 'lib/constants';
export default async (req, res) => {
await useCors(req, res);
await useAuth(req, res);
const { id: websiteId } = req.query;
const { id: websiteUuid } = req.query;
if (!(await allowQuery(req))) {
if (!(await allowQuery(req, TYPE_WEBSITE))) {
return unauthorized(res);
}
if (req.method === 'GET') {
const website = await getWebsite({ websiteUuid: websiteId });
const website = await getWebsite({ websiteUuid });
return ok(res, website);
}
@ -32,7 +33,7 @@ export default async (req, res) => {
}
}
const website = await getWebsite({ websiteUuid: websiteId });
const website = await getWebsite({ websiteUuid });
const newShareId = enableShareUrl ? website.shareId || getRandomChars(8) : null;
@ -44,7 +45,7 @@ export default async (req, res) => {
shareId: shareId ? shareId : newShareId,
userId: account ? account.id : +owner || undefined,
},
{ websiteUuid: websiteId },
{ websiteUuid },
);
} catch (e) {
if (e.message.includes('Unique constraint') && e.message.includes('share_id')) {
@ -56,11 +57,11 @@ export default async (req, res) => {
}
if (req.method === 'DELETE') {
if (!(await allowQuery(req, true))) {
if (!(await allowQuery(req, TYPE_WEBSITE))) {
return unauthorized(res);
}
await deleteWebsite(websiteId);
await deleteWebsite(websiteUuid);
return ok(res);
}