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

Merged auth into new parseRequest method.

Browse source
This commit is contained in:
Mike Cao 2025-01-25 00:19:22 -08:00
parent e51f182403
commit 2d6428172b
39 changed files with 296 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts
View file

@ -1,7 +1,7 @@
import { z } from 'zod';
import { checkRequest } from 'lib/request';
import { badRequest, unauthorized, json } from 'lib/response';
import { canViewWebsite, checkAuth } from 'lib/auth';
import { parseRequest } from 'lib/request';
import { unauthorized, json } from 'lib/response';
import { canViewWebsite } from 'lib/auth';
import { getSessionActivity } from 'queries';
export async function GET(
@ -13,18 +13,16 @@ export async function GET(
endAt: z.coerce.number().int(),
});
const { query, error } = await checkRequest(request, schema);
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return badRequest(error);
return error();
}
const { websiteId, sessionId } = await params;
const { startAt, endAt } = query;
const auth = await checkAuth(request);
if (!auth || !(await canViewWebsite(auth, websiteId))) {
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}

13
src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts
View file

@ -1,16 +1,21 @@
import { unauthorized, json } from 'lib/response';
import { canViewWebsite, checkAuth } from 'lib/auth';
import { canViewWebsite } from 'lib/auth';
import { getSessionData } from 'queries';
import { parseRequest } from 'lib/request';
export async function GET(
request: Request,
{ params }: { params: Promise<{ websiteId: string; sessionId: string }> },
) {
const { auth, error } = await parseRequest(request);
if (error) {
return error();
}
const { websiteId, sessionId } = await params;
const auth = await checkAuth(request);
if (!auth || !(await canViewWebsite(auth, websiteId))) {
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}

13
src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts
View file

@ -1,16 +1,21 @@
import { unauthorized, json } from 'lib/response';
import { canViewWebsite, checkAuth } from 'lib/auth';
import { canViewWebsite } from 'lib/auth';
import { getWebsiteSession } from 'queries';
import { parseRequest } from 'lib/request';
export async function GET(
request: Request,
{ params }: { params: Promise<{ websiteId: string; sessionId: string }> },
) {
const { auth, error } = await parseRequest(request);
if (error) {
return error();
}
const { websiteId, sessionId } = await params;
const auth = await checkAuth(request);
if (!auth || !(await canViewWebsite(auth, websiteId))) {
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}

14
src/app/api/websites/[websiteId]/sessions/route.ts
View file

@ -1,7 +1,7 @@
import { z } from 'zod';
import { checkRequest } from 'lib/request';
import { badRequest, unauthorized, json } from 'lib/response';
import { canViewWebsite, checkAuth } from 'lib/auth';
import { parseRequest } from 'lib/request';
import { unauthorized, json } from 'lib/response';
import { canViewWebsite } from 'lib/auth';
import { pagingParams } from 'lib/schema';
import { getWebsiteSessions } from 'queries';
@ -15,18 +15,16 @@ export async function GET(
...pagingParams,
});
const { query, error } = await checkRequest(request, schema);
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return badRequest(error);
return error();
}
const { websiteId } = await params;
const { startAt, endAt } = query;
const auth = await checkAuth(request);
if (!auth || !(await canViewWebsite(auth, websiteId))) {
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}

14
src/app/api/websites/[websiteId]/sessions/stats/route.ts
View file

@ -1,7 +1,7 @@
import { z } from 'zod';
import { checkRequest, getRequestDateRange, getRequestFilters } from 'lib/request';
import { badRequest, unauthorized, json } from 'lib/response';
import { canViewWebsite, checkAuth } from 'lib/auth';
import { parseRequest, getRequestDateRange, getRequestFilters } from 'lib/request';
import { unauthorized, json } from 'lib/response';
import { canViewWebsite } from 'lib/auth';
import { filterParams } from 'lib/schema';
import { getWebsiteSessionStats } from 'queries';
@ -15,17 +15,15 @@ export async function GET(
...filterParams,
});
const { error } = await checkRequest(request, schema);
const { auth, error } = await parseRequest(request, schema);
if (error) {
return badRequest(error);
return error();
}
const { websiteId } = await params;
const auth = await checkAuth(request);
if (!auth || !(await canViewWebsite(auth, websiteId))) {
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}

14
src/app/api/websites/[websiteId]/sessions/weekly/route.ts
View file

@ -1,7 +1,7 @@
import { z } from 'zod';
import { checkRequest } from 'lib/request';
import { badRequest, unauthorized, json } from 'lib/response';
import { canViewWebsite, checkAuth } from 'lib/auth';
import { parseRequest } from 'lib/request';
import { unauthorized, json } from 'lib/response';
import { canViewWebsite } from 'lib/auth';
import { pagingParams, timezoneParam } from 'lib/schema';
import { getWebsiteSessionsWeekly } from 'queries';
@ -16,18 +16,16 @@ export async function GET(
...pagingParams,
});
const { query, error } = await checkRequest(request, schema);
const { auth, query, error } = await parseRequest(request, schema);
if (error) {
return badRequest(error);
return error();
}
const { websiteId } = await params;
const { startAt, endAt, timezone } = query;
const auth = await checkAuth(request);
if (!auth || !(await canViewWebsite(auth, websiteId))) {
if (!(await canViewWebsite(auth, websiteId))) {
return unauthorized();
}