watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 14:17:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed team website create.

Browse source
This commit is contained in:
Mike Cao 2024-02-04 00:09:15 -08:00
parent e971f2533d
commit d9670f10a4
8 changed files with 29 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/pages/api/scripts/telemetry.js → src/pages/api/scripts/telemetry.ts
View file

@ -1,7 +1,8 @@
import { ok } from 'next-basics';
import { CURRENT_VERSION, TELEMETRY_PIXEL } from 'lib/constants';
import { NextApiRequest, NextApiResponse } from 'next';
export default function handler(req, res) {
export default function handler(req: NextApiRequest, res: NextApiResponse) {
if (process.env.NODE_ENV === 'production') {
res.setHeader('content-type', 'text/javascript');

21
src/pages/api/teams/[teamId]/websites/index.ts
View file

@ -1,12 +1,11 @@
import * as yup from 'yup';
import { canCreateTeamWebsite, canViewTeam } from 'lib/auth';
import { canViewTeam } from 'lib/auth';
import { useAuth, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createWebsite, getTeamWebsites } from 'queries';
import { uuid } from 'lib/crypto';
import { ok, unauthorized } from 'next-basics';
import { getTeamWebsites } from 'queries';
export interface TeamWebsiteRequestQuery extends SearchFilter {
teamId: string;
@ -54,18 +53,4 @@ export default async (
return ok(res, websites);
}
if (req.method === 'POST') {
if (!(await canCreateTeamWebsite(req.auth, teamId))) {
return unauthorized(res);
}
const { name, domain, shareId } = req.body;
const website = await createWebsite({ id: uuid(), name, domain, shareId });
return ok(res, website);
}
return methodNotAllowed(res);
};

16
src/pages/api/websites/index.ts
View file

@ -1,4 +1,4 @@
import { canCreateWebsite } from 'lib/auth';
import { canCreateTeamWebsite, canCreateWebsite } from 'lib/auth';
import { uuid } from 'lib/crypto';
import { useAuth, useCors, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
@ -15,6 +15,7 @@ export interface WebsitesRequestBody {
name: string;
domain: string;
shareId: string;
teamId: string;
}
const schema = {
@ -25,6 +26,7 @@ const schema = {
name: yup.string().max(100).required(),
domain: yup.string().max(500).required(),
shareId: yup.string().max(50).nullable(),
teamId: yup.string().nullable(),
}),
};
@ -49,9 +51,12 @@ export default async (
}
if (req.method === 'POST') {
const { name, domain, shareId } = req.body;
const { name, domain, shareId, teamId } = req.body;
if (!(await canCreateWebsite(req.auth))) {
if (
(teamId && !(await canCreateTeamWebsite(req.auth, teamId))) ||
!(await canCreateWebsite(req.auth))
) {
return unauthorized(res);
}
@ -60,9 +65,12 @@ export default async (
name,
domain,
shareId,
teamId,
};
data.userId = userId;
if (!teamId) {
data.userId = userId;
}
const website = await createWebsite(data);