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

Renamed id routes for API.

Browse source
This commit is contained in:
Mike Cao 2024-01-31 22:08:48 -08:00
parent 53a991176b
commit 4429198397
42 changed files with 154 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pages/api/me/password.ts
View file

@ -12,10 +12,6 @@ import {
import { getUser, updateUser } from 'queries';
import * as yup from 'yup';
export interface UserPasswordRequestQuery {
id: string;
}
export interface UserPasswordRequestBody {
currentPassword: string;
newPassword: string;
@ -29,7 +25,7 @@ const schema = {
};
export default async (
req: NextApiRequestQueryBody<UserPasswordRequestQuery, UserPasswordRequestBody>,
req: NextApiRequestQueryBody<any, UserPasswordRequestBody>,
res: NextApiResponse<User>,
) => {
if (process.env.CLOUD_MODE) {
@ -40,10 +36,10 @@ export default async (
await useValidate(schema, req, res);
const { currentPassword, newPassword } = req.body;
const { id } = req.auth.user;
const { id: userId } = req.auth.user;
if (req.method === 'POST') {
const user = await getUser(id, { includePassword: true });
const user = await getUser(userId, { includePassword: true });
if (!checkPassword(currentPassword, user.password)) {
return badRequest(res, 'Current password is incorrect');
@ -51,7 +47,7 @@ export default async (
const password = hashPassword(newPassword);
const updated = await updateUser({ password }, { id });
const updated = await updateUser(userId, { password });
return ok(res, updated);
}

15
src/pages/api/me/teams.ts
View file

@ -1,30 +1,23 @@
import { useCors, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { NextApiRequestQueryBody } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { methodNotAllowed } from 'next-basics';
import userTeams from 'pages/api/users/[id]/teams';
import userTeams from 'pages/api/users/[userId]/teams';
import * as yup from 'yup';
export interface MyTeamsRequestQuery extends SearchFilter {
id: string;
}
const schema = {
GET: yup.object().shape({
...pageInfo,
}),
};
export default async (
req: NextApiRequestQueryBody<MyTeamsRequestQuery, any>,
res: NextApiResponse,
) => {
export default async (req: NextApiRequestQueryBody, res: NextApiResponse) => {
await useCors(req, res);
await useValidate(schema, req, res);
if (req.method === 'GET') {
req.query.id = req.auth.user.id;
req.query.userId = req.auth.user.id;
return userTeams(req, res);
}

15
src/pages/api/me/websites.ts
View file

@ -1,31 +1,24 @@
import { useAuth, useCors, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { NextApiRequestQueryBody } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { methodNotAllowed } from 'next-basics';
import userWebsites from 'pages/api/users/[id]/websites';
import userWebsites from 'pages/api/users/[userId]/websites';
import * as yup from 'yup';
export interface MyWebsitesRequestQuery extends SearchFilter {
id: string;
}
const schema = {
GET: yup.object().shape({
...pageInfo,
}),
};
export default async (
req: NextApiRequestQueryBody<MyWebsitesRequestQuery, any>,
res: NextApiResponse,
) => {
export default async (req: NextApiRequestQueryBody, res: NextApiResponse) => {
await useCors(req, res);
await useAuth(req, res);
await useValidate(schema, req, res);
if (req.method === 'GET') {
req.query.id = req.auth.user.id;
req.query.userId = req.auth.user.id;
return userWebsites(req, res);
}