watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Get account by uuid for cloud operations.

Browse source
This commit is contained in:
Mike Cao 2022-10-04 20:16:09 -07:00
parent d784b2a8db
commit f3135ee867
4 changed files with 50 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pages/api/accounts/index.js
View file

@ -19,13 +19,7 @@ export default async (req, res) => {
}
if (req.method === 'POST') {
await useAuth(req, res);
if (!req.auth.is_admin) {
return unauthorized(res);
}
const { username, password } = req.body;
const { username, password, account_uuid } = req.body;
const accountByUsername = await getAccountByUsername(username);
@ -36,7 +30,7 @@ export default async (req, res) => {
const created = await createAccount({
username,
password: hashPassword(password),
account_uuid: uuid(),
account_uuid: account_uuid || uuid(),
});
return ok(res, created);

14
pages/api/websites/index.js
View file

@ -1,4 +1,4 @@
import { createWebsite, getAllWebsites, getUserWebsites } from 'queries';
import { createWebsite, getAccount, getAllWebsites, getUserWebsites } from 'queries';
import { ok, methodNotAllowed, unauthorized, getRandomChars } from 'next-basics';
import { useAuth } from 'lib/middleware';
import { uuid } from 'lib/crypto';
@ -6,9 +6,15 @@ import { uuid } from 'lib/crypto';
export default async (req, res) => {
await useAuth(req, res);
const { user_id: current_user_id, is_admin } = req.auth;
const { user_id: current_user_id, is_admin, account_uuid } = req.auth;
const { user_id, include_all } = req.query;
const userId = +user_id;
let account;
if (account_uuid) {
account = await getAccount({ account_uuid });
}
const userId = account ? account.user_id : +user_id;
if (req.method === 'GET') {
if (userId && userId !== current_user_id && !is_admin) {
@ -29,7 +35,7 @@ export default async (req, res) => {
const { is_admin: currentUserIsAdmin, user_id: currentUserId } = req.auth;
const { name, domain, owner, enable_share_url } = req.body;
const website_owner = +owner;
const website_owner = account ? account.user_id : +owner;
if (website_owner !== currentUserId && !currentUserIsAdmin) {
return unauthorized(res);