github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactored queries.

Browse Source
This commit is contained in:
Mike Cao
2023-07-29 22:03:34 -07:00
parent f36a689817
commit 8904b7b4ed
27 changed files with 137 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pages/api/users/[id]/index.ts
View File

@@ -3,7 +3,7 @@ import { canDeleteUser, canUpdateUser, canViewUser } from 'lib/auth';
import { useAuth } from 'lib/middleware';
import { NextApiResponse } from 'next';
import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { deleteUser, getUser, updateUser } from 'queries';
import { deleteUser, getUserById, getUserByUsername, updateUser } from 'queries';
export interface UserRequestQuery {
id: string;
@@ -31,7 +31,7 @@ export default async (
return unauthorized(res);
}
const user = await getUser({ id });
const user = await getUserById(id);
return ok(res, user);
}
@@ -43,7 +43,7 @@ export default async (
const { username, password, role } = req.body;
const user = await getUser({ id });
const user = await getUserById(id);
const data: any = {};
@@ -62,9 +62,9 @@ export default async (
// Check when username changes
if (data.username && user.username !== data.username) {
const userByUsername = await getUser({ username });
const user = await getUserByUsername(username);
if (userByUsername) {
if (user) {
return badRequest(res, 'User already exists');
}
}

4
pages/api/users/index.ts
View File

@@ -5,7 +5,7 @@ import { useAuth } from 'lib/middleware';
import { NextApiRequestQueryBody, Role, User } from 'lib/types';
import { NextApiResponse } from 'next';
import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createUser, getUser, getUsers } from 'queries';
import { createUser, getUserByUsername, getUsers } from 'queries';
export interface UsersRequestBody {
username: string;
@@ -37,7 +37,7 @@ export default async (
const { username, password, role, id } = req.body;
const existingUser = await getUser({ username }, { showDeleted: true });
const existingUser = await getUserByUsername(username, { showDeleted: true });
if (existingUser) {
return badRequest(res, 'User already exists');