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

Rewrite admin. (#1713)

Browse source 
* Rewrite admin.

* Clean up password forms.

* Fix naming issues.

* CSS Naming.
This commit is contained in:
Brian Cao 2022-12-26 16:57:59 -08:00 • committed by GitHub
parent f4db04c3c6
commit e1f99a7d01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
113 changed files with 2054 additions and 1872 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pages/api/users/[id]/index.ts
View file

@ -26,7 +26,7 @@ export default async (
const { id } = req.query;
if (req.method === 'GET') {
if (await canViewUser(userId, id)) {
if (!isAdmin && !(await canViewUser(userId, id))) {
return unauthorized(res);
}
@ -36,7 +36,7 @@ export default async (
}
if (req.method === 'POST') {
if (await canUpdateUser(userId, id)) {
if (!isAdmin && !(await canUpdateUser(userId, id))) {
return unauthorized(res);
}
@ -46,7 +46,8 @@ export default async (
const data: any = {};
if (password) {
// Only admin can change these fields
if (password && isAdmin) {
data.password = hashPassword(password);
}
@ -70,7 +71,7 @@ export default async (
}
if (req.method === 'DELETE') {
if (isAdmin) {
if (!isAdmin) {
return unauthorized(res);
}

6
pages/api/users/[id]/password.ts
View file

@ -30,15 +30,15 @@ export default async (
const { current_password, new_password } = req.body;
const { id } = req.query;
const {
user: { id: userId },
user: { id: userId, isAdmin },
} = req.auth;
if (req.method === 'POST') {
if (canUpdateUser(userId, id)) {
if (!isAdmin && !(await canUpdateUser(userId, id))) {
return unauthorized(res);
}
const user = await getUser({ id });
const user = await getUser({ id }, { includePassword: true });
if (!checkPassword(current_password, user.password)) {
return badRequest(res, 'Current password is incorrect');