m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-12-25 02:36:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into analytics

Browse Source
This commit is contained in:
Mike Cao 2022-10-06 14:19:19 -07:00
commit 186f484ff1
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/auth.js
View File

@ -1,6 +1,7 @@
import { validate } from 'uuid';
import { parseSecureToken, parseToken, getItem } from 'next-basics'; import { parseSecureToken, parseToken, getItem } from 'next-basics';
import { AUTH_TOKEN, SHARE_TOKEN_HEADER } from './constants'; import { AUTH_TOKEN, SHARE_TOKEN_HEADER } from './constants';
import { getWebsiteById } from 'queries'; import { getWebsite } from 'queries';
import { secret } from './crypto'; import { secret } from './crypto';
export async function getAuthToken(req) { export async function getAuthToken(req) {
@ -38,13 +39,12 @@ export async function isValidToken(token, validation) {
export async function allowQuery(req, skipToken) { export async function allowQuery(req, skipToken) {
const { id } = req.query; const { id } = req.query;
const token = req.headers[SHARE_TOKEN_HEADER]; const token = req.headers[SHARE_TOKEN_HEADER];
const websiteId = +id;
const website = await getWebsiteById(websiteId); const website = await getWebsite(validate(id) ? { website_uuid: id } : { website_id: +id });
if (website) { if (website) {
if (token && token !== 'undefined' && !skipToken) { if (token && token !== 'undefined' && !skipToken) {
return isValidToken(token, { website_id: websiteId }); return isValidToken(token, { website_id: website.website_id });
} }
const authToken = await getAuthToken(req); const authToken = await getAuthToken(req);

6
pages/api/websites/[id]/index.js
View File

@ -1,12 +1,14 @@
import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics'; import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { deleteWebsite, getWebsiteById, updateWebsite } from 'queries'; import { deleteWebsite, getWebsite, getWebsiteById, updateWebsite } from 'queries';
import { allowQuery } from 'lib/auth'; import { allowQuery } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware'; import { useAuth, useCors } from 'lib/middleware';
import { validate } from 'uuid';
export default async (req, res) => { export default async (req, res) => {
const { id } = req.query; const { id } = req.query;
const websiteId = +id; const websiteId = +id;
const where = validate(id) ? { website_uuid: id } : { website_id: +id };
if (req.method === 'GET') { if (req.method === 'GET') {
await useCors(req, res); await useCors(req, res);
@ -15,7 +17,7 @@ export default async (req, res) => {
return unauthorized(res); return unauthorized(res);
} }
const website = await getWebsiteById(websiteId); const website = await getWebsite(where);
return ok(res, website); return ok(res, website);
} }

7
queries/admin/website/getWebsite.js Normal file
View File

@ -0,0 +1,7 @@
import prisma from 'lib/prisma';
export async function getWebsite(where) {
return prisma.client.website.findUnique({
where,
});
}

1
queries/index.js
View File

@ -9,6 +9,7 @@ export * from './admin/website/createWebsite';
export * from './admin/website/deleteWebsite'; export * from './admin/website/deleteWebsite';
export * from './admin/website/getAllWebsites'; export * from './admin/website/getAllWebsites';
export * from './admin/website/getUserWebsites'; export * from './admin/website/getUserWebsites';
export * from './admin/website/getWebsite';
export * from './admin/website/getWebsiteById'; export * from './admin/website/getWebsiteById';
export * from './admin/website/getWebsiteByShareId'; export * from './admin/website/getWebsiteByShareId';
export * from './admin/website/getWebsiteByUuid'; export * from './admin/website/getWebsiteByUuid';