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

Refactor API authentication.

Browse source
This commit is contained in:
Mike Cao 2022-10-12 13:11:44 -07:00
parent c33729e185
commit 5a4fc96ebc
13 changed files with 71 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pages/api/accounts/[id]/index.js
View file

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

7
pages/api/websites/[id]/active.js
View file

@ -1,12 +1,13 @@
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { allowQuery } from 'lib/auth';
import { useCors } from 'lib/middleware';
import { useAuth, useCors } from 'lib/middleware';
import { getActiveVisitors } from 'queries';
export default async (req, res) => {
if (req.method === 'GET') {
await useCors(req, res);
await useCors(req, res);
await useAuth(req, res);
if (req.method === 'GET') {
if (!(await allowQuery(req))) {
return unauthorized(res);
}

7
pages/api/websites/[id]/events.js
View file

@ -2,14 +2,15 @@ import moment from 'moment-timezone';
import { getEventMetrics } from 'queries';
import { ok, badRequest, methodNotAllowed, unauthorized } from 'next-basics';
import { allowQuery } from 'lib/auth';
import { useCors } from 'lib/middleware';
import { useAuth, useCors } from 'lib/middleware';
const unitTypes = ['year', 'month', 'hour', 'day'];
export default async (req, res) => {
if (req.method === 'GET') {
await useCors(req, res);
await useCors(req, res);
await useAuth(req, res);
if (req.method === 'GET') {
if (!(await allowQuery(req))) {
return unauthorized(res);
}

33
pages/api/websites/[id]/index.js
View file

@ -1,47 +1,42 @@
import { allowQuery } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware';
import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { deleteWebsite, getAccount, getWebsite, getWebsiteByUuid, updateWebsite } from 'queries';
import { deleteWebsite, getAccount, getWebsite, updateWebsite } from 'queries';
export default async (req, res) => {
await useCors(req, res);
await useAuth(req, res);
const { id: websiteId } = req.query;
if (!(await allowQuery(req))) {
return unauthorized(res);
}
if (req.method === 'GET') {
await useCors(req, res);
if (!(await allowQuery(req))) {
return unauthorized(res);
}
const website = await getWebsiteByUuid(websiteId);
const website = await getWebsite({ websiteUuid: websiteId });
return ok(res, website);
}
if (req.method === 'POST') {
await useAuth(req, res);
const { isAdmin: currentUserIsAdmin, userId: currentUserId, accountUuid } = req.auth;
const { name, domain, owner, enable_share_url } = req.body;
const { name, domain, owner, enableShareUrl, shareId } = req.body;
const { accountUuid } = req.auth;
let account;
if (accountUuid) {
account = await getAccount({ accountUuid });
}
const website = await getWebsite(websiteId);
const website = await getWebsite({ websiteUuid: websiteId });
const shareId = enable_share_url ? website.shareId || getRandomChars(8) : null;
if (website.userId !== currentUserId && !currentUserIsAdmin) {
return unauthorized(res);
}
const newShareId = enableShareUrl ? website.shareId || getRandomChars(8) : null;
await updateWebsite(
{
name,
domain,
shareId: shareId,
shareId: shareId ? shareId : newShareId,
userId: account ? account.id : +owner,
},
{ websiteUuid: websiteId },

7
pages/api/websites/[id]/metrics.js
View file

@ -1,6 +1,6 @@
import { allowQuery } from 'lib/auth';
import { FILTER_IGNORED } from 'lib/constants';
import { useCors } from 'lib/middleware';
import { useAuth, useCors } from 'lib/middleware';
import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getPageviewMetrics, getSessionMetrics, getWebsiteByUuid } from 'queries';
@ -34,9 +34,10 @@ function getColumn(type) {
}
export default async (req, res) => {
if (req.method === 'GET') {
await useCors(req, res);
await useCors(req, res);
await useAuth(req, res);
if (req.method === 'GET') {
if (!(await allowQuery(req))) {
return unauthorized(res);
}

7
pages/api/websites/[id]/pageviews.js
View file

@ -2,14 +2,15 @@ import moment from 'moment-timezone';
import { getPageviewStats } from 'queries';
import { ok, badRequest, methodNotAllowed, unauthorized } from 'next-basics';
import { allowQuery } from 'lib/auth';
import { useCors } from 'lib/middleware';
import { useAuth, useCors } from 'lib/middleware';
const unitTypes = ['year', 'month', 'hour', 'day'];
export default async (req, res) => {
if (req.method === 'GET') {
await useCors(req, res);
await useCors(req, res);
await useAuth(req, res);
if (req.method === 'GET') {
if (!(await allowQuery(req))) {
return unauthorized(res);
}

4
pages/api/websites/[id]/reset.js
View file

@ -1,8 +1,12 @@
import { resetWebsite } from 'queries';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { allowQuery } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware';
export default async (req, res) => {
await useCors(req, res);
await useAuth(req, res);
const { id: websiteId } = req.query;
if (req.method === 'POST') {

7
pages/api/websites/[id]/stats.js
View file

@ -1,12 +1,13 @@
import { getWebsiteStats } from 'queries';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { allowQuery } from 'lib/auth';
import { useCors } from 'lib/middleware';
import { useAuth, useCors } from 'lib/middleware';
export default async (req, res) => {
if (req.method === 'GET') {
await useCors(req, res);
await useCors(req, res);
await useAuth(req, res);
if (req.method === 'GET') {
if (!(await allowQuery(req))) {
return unauthorized(res);
}

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

@ -30,7 +30,7 @@ export default async (req, res) => {
}
if (req.method === 'POST') {
const { name, domain, owner, enable_share_url } = req.body;
const { name, domain, owner, enableShareUrl } = req.body;
const website_owner = account ? account.id : +owner;
@ -39,7 +39,7 @@ export default async (req, res) => {
}
const websiteUuid = uuid();
const shareId = enable_share_url ? getRandomChars(8) : null;
const shareId = enableShareUrl ? getRandomChars(8) : null;
const website = await createWebsite(website_owner, { websiteUuid, name, domain, shareId });
return ok(res, website);