m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-15 09:45:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/forms/AccountEditForm.js
View File

@ -15,13 +15,13 @@ const initialValues = {
password: '',
};
const validate = ({ userId, username, password }) => {
const validate = ({ id, username, password }) => {
const errors = {};
if (!username) {
errors.username = <FormattedMessage id="label.required" defaultMessage="Required" />;
}
if (!userId && !password) {
if (!id && !password) {
errors.password = <FormattedMessage id="label.required" defaultMessage="Required" />;
}
@ -33,8 +33,8 @@ export default function AccountEditForm({ values, onSave, onClose }) {
const [message, setMessage] = useState();
const handleSubmit = async values => {
const { userId } = values;
const { ok, data } = await post(userId ? `/accounts/${userId}` : '/accounts', values);
const { id } = values;
const { ok, data } = await post(id ? `/accounts/${id}` : '/accounts', values);
if (ok) {
onSave();

4
components/forms/WebsiteEditForm.js
View File

@ -94,7 +94,7 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {
return (
<FormLayout>
<Formik
initialValues={{ ...initialValues, ...values, enable_share_url: !!values?.shareId }}
initialValues={{ ...initialValues, ...values, enableShareUrl: !!values?.shareId }}
validate={validate}
onSubmit={handleSubmit}
>
@ -128,7 +128,7 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {
<OwnerDropDown accounts={accounts} user={user} />
<FormRow>
<label />
<Field name="enable_share_url">
<Field name="enableShareUrl">
{({ field }) => (
<Checkbox
{...field}

26
lib/auth.js
View File

@ -1,4 +1,3 @@
import { validate } from 'uuid';
import { parseSecureToken, parseToken } from 'next-basics';
import { getWebsite } from 'queries';
import { SHARE_TOKEN_HEADER } from 'lib/constants';
@ -38,24 +37,23 @@ export function isValidToken(token, validation) {
return false;
}
export async function allowQuery(req, skipToken) {
const { id } = req.query;
const token = req.headers[SHARE_TOKEN_HEADER];
export async function allowQuery(req) {
const { id: websiteId } = req.query;
const website = await getWebsite(validate(id) ? { websiteUuid: id } : { id: +id });
const { userId, isAdmin, shareToken } = req.auth ?? {};
if (website) {
if (token && token !== 'undefined' && !skipToken) {
return isValidToken(token, { websiteId: website.id });
}
if (isAdmin) {
return true;
}
const authToken = await getAuthToken(req);
if (shareToken) {
return isValidToken(shareToken, { websiteUuid: websiteId });
}
if (authToken) {
const { userId, isAdmin } = authToken;
if (userId) {
const website = await getWebsite({ websiteUuid: websiteId });
return isAdmin || website.userId === userId;
}
return website && website.userId === userId;
}
return false;

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);

6
queries/admin/account/updateAccount.js
View File

@ -1,10 +1,8 @@
import prisma from 'lib/prisma';
export async function updateAccount(userId, data) {
export async function updateAccount(data, where) {
return prisma.client.account.update({
where: {
id: userId,
},
where,
data,
});
}