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 database queries.

Browse source
This commit is contained in:
Mike Cao 2020-08-11 22:24:41 -07:00
parent a248f35db2
commit f4ca353b5c
24 changed files with 371 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pages/api/account.js
View file

@ -1,6 +1,6 @@
import { getAccounts, getAccount, updateAccount, createAccount } from 'lib/db';
import { getAccountById, getAccountByUsername, updateAccount, createAccount } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { hashPassword, uuid } from 'lib/crypto';
import { hashPassword } from 'lib/crypto';
import { ok, unauthorized, methodNotAllowed, badRequest } from 'lib/response';
export default async (req, res) => {
@ -8,24 +8,18 @@ export default async (req, res) => {
const { user_id: current_user_id, is_admin: current_user_is_admin } = req.auth;
if (req.method === 'GET') {
if (current_user_is_admin) {
const accounts = await getAccounts();
return ok(res, accounts);
}
return unauthorized(res);
}
if (req.method === 'POST') {
const { user_id, username, password, is_admin } = req.body;
if (user_id) {
const account = await getAccount({ user_id });
const account = await getAccountById(user_id);
if (account.user_id === current_user_id || current_user_is_admin) {
const data = { password: password ? await hashPassword(password) : undefined };
const data = {};
if (password) {
data.password = await hashPassword(password);
}
// Only admin can change these fields
if (current_user_is_admin) {
@ -37,7 +31,7 @@ export default async (req, res) => {
}
if (data.username && account.username !== data.username) {
const accountByUsername = await getAccount({ username });
const accountByUsername = await getAccountByUsername(username);
if (accountByUsername) {
return badRequest(res, 'Account already exists');
@ -51,7 +45,7 @@ export default async (req, res) => {
return unauthorized(res);
} else {
const accountByUsername = await getAccount({ username });
const accountByUsername = await getAccountByUsername(username);
if (accountByUsername) {
return badRequest(res, 'Account already exists');

4
pages/api/account/[id].js
View file

@ -1,4 +1,4 @@
import { getAccount, deleteAccount } from 'lib/db';
import { getAccountById, deleteAccount } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { methodNotAllowed, ok, unauthorized } from 'lib/response';
@ -11,7 +11,7 @@ export default async (req, res) => {
if (req.method === 'GET') {
if (is_admin) {
const account = await getAccount({ user_id });
const account = await getAccountById(user_id);
return ok(res, account);
}

4
pages/api/account/password.js
View file

@ -1,4 +1,4 @@
import { getAccount, updateAccount } from 'lib/db';
import { getAccountById, updateAccount } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { badRequest, methodNotAllowed, ok } from 'lib/response';
import { checkPassword, hashPassword } from 'lib/crypto';
@ -10,7 +10,7 @@ export default async (req, res) => {
const { current_password, new_password } = req.body;
if (req.method === 'POST') {
const account = await getAccount({ user_id });
const account = await getAccountById(user_id);
const valid = await checkPassword(current_password, account.password);
if (!valid) {

21
pages/api/accounts.js Normal file
View file

@ -0,0 +1,21 @@
import { getAccounts } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { ok, unauthorized, methodNotAllowed } from 'lib/response';
export default async (req, res) => {
await useAuth(req, res);
const { is_admin: current_user_is_admin } = req.auth;
if (req.method === 'GET') {
if (current_user_is_admin) {
const accounts = await getAccounts();
return ok(res, accounts);
}
return unauthorized(res);
}
return methodNotAllowed(res);
};

4
pages/api/auth/login.js
View file

@ -1,13 +1,13 @@
import { serialize } from 'cookie';
import { checkPassword, createSecureToken } from 'lib/crypto';
import { getAccount } from 'lib/db';
import { getAccountByUsername } from 'lib/queries';
import { AUTH_COOKIE_NAME } from 'lib/constants';
import { ok, unauthorized } from 'lib/response';
export default async (req, res) => {
const { username, password } = req.body;
const account = await getAccount({ username });
const account = await getAccountByUsername(username);
if (account && (await checkPassword(password, account.password))) {
const { user_id, username, is_admin } = account;

2
pages/api/collect.js
View file

@ -1,4 +1,4 @@
import { savePageView, saveEvent } from 'lib/db';
import { savePageView, saveEvent } from 'lib/queries';
import { useCors, useSession } from 'lib/middleware';
import { createToken } from 'lib/crypto';
import { ok, badRequest } from 'lib/response';

10
pages/api/website.js
View file

@ -1,4 +1,4 @@
import { getWebsites, updateWebsite, createWebsite, getWebsite } from 'lib/db';
import { updateWebsite, createWebsite, getWebsiteById } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { uuid } from 'lib/crypto';
import { ok, unauthorized, methodNotAllowed } from 'lib/response';
@ -9,17 +9,11 @@ export default async (req, res) => {
const { user_id, is_admin } = req.auth;
const { website_id } = req.body;
if (req.method === 'GET') {
const websites = await getWebsites(user_id);
return ok(res, websites);
}
if (req.method === 'POST') {
const { name, domain } = req.body;
if (website_id) {
const website = getWebsite(website_id);
const website = getWebsiteById(website_id);
if (website.user_id === user_id || is_admin) {
await updateWebsite(website_id, { name, domain });

6
pages/api/website/[id]/index.js
View file

@ -1,4 +1,4 @@
import { deleteWebsite, getWebsite } from 'lib/db';
import { deleteWebsite, getWebsiteById } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { methodNotAllowed, ok, unauthorized } from 'lib/response';
@ -10,13 +10,13 @@ export default async (req, res) => {
const website_id = +id;
if (req.method === 'GET') {
const website = await getWebsite({ website_id });
const website = await getWebsiteById(website_id);
return ok(res, website);
}
if (req.method === 'DELETE') {
const website = await getWebsite({ website_id });
const website = await getWebsiteById(website_id);
if (website.user_id === user_id || is_admin) {
await deleteWebsite(website_id);

2
pages/api/website/[id]/metrics.js
View file

@ -1,4 +1,4 @@
import { getMetrics } from 'lib/db';
import { getMetrics } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { ok } from 'lib/response';

6
pages/api/website/[id]/pageviews.js
View file

@ -1,5 +1,5 @@
import moment from 'moment-timezone';
import { getPageviewData } from 'lib/db';
import { getPageviews } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { ok, badRequest } from 'lib/response';
@ -18,8 +18,8 @@ export default async (req, res) => {
const end = new Date(+end_at);
const [pageviews, uniques] = await Promise.all([
getPageviewData(+id, start, end, tz, unit, '*'),
getPageviewData(+id, start, end, tz, unit, 'distinct session_id'),
getPageviews(+id, start, end, tz, unit, '*'),
getPageviews(+id, start, end, tz, unit, 'distinct session_id'),
]);
return ok(res, { pageviews, uniques });

2
pages/api/website/[id]/rankings.js
View file

@ -1,4 +1,4 @@
import { getRankings } from 'lib/db';
import { getRankings } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { ok, badRequest } from 'lib/response';

17
pages/api/websites.js Normal file
View file

@ -0,0 +1,17 @@
import { getUserWebsites } from 'lib/queries';
import { useAuth } from 'lib/middleware';
import { ok, methodNotAllowed } from 'lib/response';
export default async (req, res) => {
await useAuth(req, res);
const { user_id } = req.auth;
if (req.method === 'GET') {
const websites = await getUserWebsites(user_id);
return ok(res, websites);
}
return methodNotAllowed(res);
};

5
pages/login.js
View file

@ -1,13 +1,10 @@
import React from 'react';
import Layout from 'components/layout/Layout';
import LoginForm from 'components/forms/LoginForm';
import Icon from 'components/common/Icon';
import Logo from 'assets/logo.svg';
export default function LoginPage() {
return (
<Layout title="login" header={false} footer={false} center middle>
<Icon icon={<Logo />} size="xlarge" />
<Layout title="login" header={false} footer={false} center>
<LoginForm />
</Layout>
);