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

Split up account update logic.

Browse Source
This commit is contained in:
Mike Cao 2022-09-29 15:15:11 -07:00
parent d4abe51331
commit 5fb1f08df8
3 changed files with 66 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/forms/AccountEditForm.js
View File

@ -33,7 +33,8 @@ export default function AccountEditForm({ values, onSave, onClose }) {
const [message, setMessage] = useState();
const handleSubmit = async values => {
const { ok, data } = await post('/account', values);
const { user_id } = values;
const { ok, data } = await post(user_id ? `/account/${user_id}` : '/account', values);
if (ok) {
onSave();

55
pages/api/account/[id].js
View File

@ -1,26 +1,65 @@
import { getAccountById, deleteAccount } from 'queries';
import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getAccountById, deleteAccount, getAccountByUsername, updateAccount } from 'queries';
import { useAuth } from 'lib/middleware';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
export default async (req, res) => {
await useAuth(req, res);
const { is_admin } = req.auth;
const { is_admin: currentUserIsAdmin, user_id: currentUserId } = req.auth;
const { id } = req.query;
const user_id = +id;
const userId = +id;
if (!is_admin) {
if (req.method === 'GET') {
if (userId !== currentUserId && !currentUserIsAdmin) {
return unauthorized(res);
}
if (req.method === 'GET') {
const account = await getAccountById(user_id);
const account = await getAccountById(userId);
return ok(res, account);
}
if (req.method === 'POST') {
const { username, password, is_admin } = req.body;
if (userId !== currentUserId && !currentUserIsAdmin) {
return unauthorized(res);
}
const account = await getAccountById(userId);
const data = {};
if (password) {
data.password = hashPassword(password);
}
// Only admin can change these fields
if (currentUserIsAdmin) {
data.username = username;
data.is_admin = is_admin;
}
// Check when username changes
if (data.username && account.username !== data.username) {
const accountByUsername = await getAccountByUsername(username);
if (accountByUsername) {
return badRequest(res, 'Account already exists');
}
}
const updated = await updateAccount(userId, data);
return ok(res, updated);
}
if (req.method === 'DELETE') {
await deleteAccount(user_id);
if (!currentUserIsAdmin) {
return unauthorized(res);
}
await deleteAccount(userId);
return ok(res);
}

44
pages/api/account/index.js
View File

@ -1,46 +1,17 @@
import { ok, unauthorized, methodNotAllowed, badRequest, hashPassword } from 'next-basics';
import { getAccountById, getAccountByUsername, updateAccount, createAccount } from 'queries';
import { getAccountByUsername, createAccount } from 'queries';
import { useAuth } from 'lib/middleware';
export default async (req, res) => {
if (req.method === 'POST') {
await useAuth(req, res);
const { user_id: current_user_id, is_admin: current_user_is_admin } = req.auth;
if (req.method === 'POST') {
const { user_id, username, password, is_admin } = req.body;
if (user_id) {
const account = await getAccountById(user_id);
if (account.user_id === current_user_id || current_user_is_admin) {
const data = {};
if (password) {
data.password = hashPassword(password);
}
// Only admin can change these fields
if (current_user_is_admin) {
data.username = username;
data.is_admin = is_admin;
}
if (data.username && account.username !== data.username) {
const accountByUsername = await getAccountByUsername(username);
if (accountByUsername) {
return badRequest(res, 'Account already exists');
}
}
const updated = await updateAccount(user_id, data);
return ok(res, updated);
}
if (!req.auth.is_admin) {
return unauthorized(res);
} else {
}
const { username, password } = req.body;
const accountByUsername = await getAccountByUsername(username);
if (accountByUsername) {
@ -51,7 +22,6 @@ export default async (req, res) => {
return ok(res, created);
}
}
return methodNotAllowed(res);
};