Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Account settings page.
Mike Caob5cf9f87193c
diff --git a/components/Account.js b/components/Account.jsdeleted file mode 100644index 08ebe815f..000000000--- a/components/Account.js+++ /dev/null@@ -1,15 +0,0 @@-import React from 'react';-import { useSelector } from 'react-redux';-import Page from './layout/Page';-import styles from './Account.module.css';--export default function Account() {- const user = useSelector(state => state.user);- return (- <Page>- <h2>Account</h2>- <div className={styles.label}>username</div>- <div>{user.username}</div>- </Page>- );-}diff --git a/components/AccountSettings.js b/components/AccountSettings.jsnew file mode 100644index 000000000..482670163--- /dev/null+++ b/components/AccountSettings.js@@ -0,0 +1,83 @@+import React, { useState, useEffect } from 'react';+import { useSelector } from 'react-redux';+import PageHeader from './layout/PageHeader';+import Button from './common/Button';+import Table from './common/Table';+import Pen from 'assets/pen.svg';+import Plus from 'assets/plus.svg';+import Trash from 'assets/trash.svg';+import { get } from 'lib/web';+import styles from './AccountSettings.module.css';+import Modal from './common/Modal';+import WebsiteEditForm from './forms/WebsiteEditForm';+import AccountEditForm from './forms/AccountEditForm';++export default function AccountSettings() {+ const user = useSelector(state => state.user);+ const [data, setData] = useState();+ const [addAccount, setAddAccount] = useState();+ const [editAccount, setEditAccount] = useState();+ const [deleteAccount, setDeleteAccount] = useState();+ const [saved, setSaved] = useState(0);++ const columns = [+ { key: 'username', label: 'Username' },+ {+ render: row => (+ <>+ <Button icon={<Pen />} size="small" onClick={() => setEditAccount(row)}>+ <div>Edit</div>+ </Button>+ <Button icon={<Trash />} size="small" onClick={() => setDeleteAccount(row)}>+ <div>Delete</div>+ </Button>+ </>+ ),+ },+ ];++ function handleSave() {+ setSaved(state => state + 1);+ handleClose();+ }++ function handleClose() {+ setEditAccount(null);+ setAddAccount(null);+ setDeleteAccount(null);+ }++ async function loadData() {+ setData(await get(`/api/account`));+ }++ useEffect(() => {+ loadData();+ }, [saved]);++ if (!data) {+ return null;+ }++ return (+ <>+ <PageHeader>+ <div>Accounts</div>+ <Button icon={<Plus />} size="small" onClick={() => setAddAccount(true)}>+ <div>Add account</div>+ </Button>+ </PageHeader>+ <Table columns={columns} rows={data} />+ {editAccount && (+ <Modal title="Edit account">+ <AccountEditForm values={editAccount} onSave={handleSave} onClose={handleClose} />+ </Modal>+ )}+ {addAccount && (+ <Modal title="Add account">+ <AccountEditForm onSave={handleSave} onClose={handleClose} />+ </Modal>+ )}+ </>+ );+}diff --git a/components/Account.module.css b/components/AccountSettings.module.csssimilarity index 100%rename from components/Account.module.cssrename to components/AccountSettings.module.cssdiff --git a/components/ProfileSettings.js b/components/ProfileSettings.jsnew file mode 100644index 000000000..23f037ecb--- /dev/null+++ b/components/ProfileSettings.js@@ -0,0 +1,29 @@+import React, { useState } from 'react';+import { useSelector } from 'react-redux';+import PageHeader from './layout/PageHeader';+import Button from './common/Button';+import ChangePasswordForm from './forms/ChangePasswordForm';+import Modal from './common/Modal';++export default function ProfileSettings() {+ const user = useSelector(state => state.user);+ const [changePassword, setChangePassword] = useState(false);++ return (+ <>+ <PageHeader>+ <div>Profile</div>+ <Button size="small" onClick={() => setChangePassword(true)}>+ Change password+ </Button>+ </PageHeader>+ <dt>Username</dt>+ <dd>{user.username}</dd>+ {changePassword && (+ <Modal title="Change password">+ <ChangePasswordForm values={user} onClose={() => setChangePassword(false)} />+ </Modal>+ )}+ </>+ );+}diff --git a/components/Settings.js b/components/Settings.jsindex e9c56610f..4b4e4197b 100644--- a/components/Settings.js+++ b/components/Settings.js@@ -1,108 +1,26 @@-import React, { useState, useEffect } from 'react';-import Page from './layout/Page';-import Table from './common/Table';-import Button from './common/Button';-import PageHeader from './layout/PageHeader';-import Pen from 'assets/pen.svg';-import Trash from 'assets/trash.svg';-import Plus from 'assets/plus.svg';-import Code from 'assets/code.svg';-import { get } from 'lib/web';-import Modal from './common/Modal';-import WebsiteEditForm from './forms/WebsiteEditForm';-import styles from './Settings.module.css';-import WebsiteDeleteForm from './forms/WebsiteDeleteForm';-import WebsiteCodeForm from './forms/WebsiteCodeForm';+import React from 'react';+import Page from 'components/layout/Page';+import MenuLayout from 'components/layout/MenuLayout';+import WebsiteSettings from './WebsiteSettings';+import AccountSettings from './AccountSettings';+import ProfileSettings from './ProfileSettings';-export default function Settings() {- const [data, setData] = useState();- const [edit, setEdit] = useState();- const [del, setDelete] = useState();- const [add, setAdd] = useState();- const [code, setCode] = useState();- const [saved, setSaved] = useState(0);-- const columns = [- { key: 'name', label: 'Name' },- { key: 'domain', label: 'Domain' },- {- key: 'action',- cell: {- className: styles.buttons,- },- render: row => (- <>- <Button icon={<Code />} size="S" onClick={() => setCode(row)}>- <div>Get Code</div>- </Button>- <Button icon={<Pen />} size="S" onClick={() => setEdit(row)}>- <div>Edit</div>- </Button>- <Button icon={<Trash />} size="S" onClick={() => setDelete(row)}>- <div>Delete</div>- </Button>- </>- ),- },- ];-- function handleSave() {- setSaved(state => state + 1);- handleClose();- }-- function handleClose() {- setAdd(null);- setEdit(null);- setDelete(null);- setCode(null);- }-- async function loadData() {- setData(await get(`/api/website`));- }-- useEffect(() => {- loadData();- }, [saved]);-- if (!data) {- return null;- }+const menuOptions = ['Websites', 'Accounts', 'Profile'];+export default function Settings() {return (<Page>- <PageHeader>- <div>Websites</div>- <Button icon={<Plus />} size="S" onClick={() => setAdd(true)}>- <div>Add website</div>- </Button>- </PageHeader>- <Table columns={columns} rows={data} />- {edit && (- <Modal title="Edit website">- <WebsiteEditForm values={edit} onSave={handleSave} onClose={handleClose} />- </Modal>- )}- {add && (- <Modal title="Add website">- <WebsiteEditForm- values={{ name: '', domain: '' }}- onSave={handleSave}- onClose={handleClose}- />- </Modal>- )}- {del && (- <Modal title="Delete website">- <WebsiteDeleteForm values={del} onSave={handleSave} onClose={handleClose} />- </Modal>- )}- {code && (- <Modal title="Tracking code">- <WebsiteCodeForm values={code} onClose={handleClose} />- </Modal>- )}+ <MenuLayout menu={menuOptions} selectedOption="Websites">+ {option => {+ if (option === 'Websites') {+ return <WebsiteSettings />;+ } else if (option === 'Accounts') {+ return <AccountSettings />;+ } else if (option === 'Profile') {+ return <ProfileSettings />;+ }+ }}+ </MenuLayout></Page>);}diff --git a/components/WebsiteList.js b/components/WebsiteList.jsindex 1ac294f52..00668673e 100644--- a/components/WebsiteList.js+++ b/components/WebsiteList.js@@ -41,7 +41,7 @@ export default function WebsiteList() {shallow: true,})}- size="S"+ size="small"><div>View details</div></Button>diff --git a/components/WebsiteSettings.js b/components/WebsiteSettings.jsnew file mode 100644index 000000000..84f7f0148--- /dev/null+++ b/components/WebsiteSettings.js@@ -0,0 +1,101 @@+import React, { useState, useEffect } from 'react';+import Table from './common/Table';+import Button from './common/Button';+import PageHeader from './layout/PageHeader';+import Pen from 'assets/pen.svg';+import Trash from 'assets/trash.svg';+import Plus from 'assets/plus.svg';+import Code from 'assets/code.svg';+import { get } from 'lib/web';+import Modal from './common/Modal';+import WebsiteEditForm from './forms/WebsiteEditForm';+import WebsiteDeleteForm from './forms/WebsiteDeleteForm';+import WebsiteCodeForm from './forms/WebsiteCodeForm';+import styles from './WebsiteSettings.module.css';++export default function WebsiteSettings() {+ const [data, setData] = useState();+ const [editWebsite, setEditWebsite] = useState();+ const [deleteWebsite, setDeleteWebsite] = useState();+ const [addWebsite, setAddWebsite] = useState();+ const [showCode, setShowCode] = useState();+ const [saved, setSaved] = useState(0);++ const columns = [+ { key: 'name', label: 'Name', className: styles.col },+ { key: 'domain', label: 'Domain', className: styles.col },+ {+ key: 'action',+ className: styles.buttons,+ render: row => (+ <>+ <Button icon={<Code />} size="small" onClick={() => setShowCode(row)}>+ <div>Get Code</div>+ </Button>+ <Button icon={<Pen />} size="small" onClick={() => setEditWebsite(row)}>+ <div>Edit</div>+ </Button>+ <Button icon={<Trash />} size="small" onClick={() => setDeleteWebsite(row)}>+ <div>Delete</div>+ </Button>+ </>+ ),+ },+ ];++ function handleSave() {+ setSaved(state => state + 1);+ handleClose();+ }++ function handleClose() {+ setAddWebsite(null);+ setEditWebsite(null);+ setDeleteWebsite(null);+ setShowCode(null);+ }++ async function loadData() {+ setData(await get(`/api/website`));+ }++ useEffect(() => {+ loadData();+ }, [saved]);++ if (!data) {+ return null;+ }++ return (+ <>+ <PageHeader>+ <div>Websites</div>+ <Button icon={<Plus />} size="small" onClick={() => setAddWebsite(true)}>+ <div>Add website</div>+ </Button>+ </PageHeader>+ <Table columns={columns} rows={data} />+ {editWebsite && (+ <Modal title="Edit website">+ <WebsiteEditForm values={editWebsite} onSave={handleSave} onClose={handleClose} />+ </Modal>+ )}+ {addWebsite && (+ <Modal title="Add website">+ <WebsiteEditForm onSave={handleSave} onClose={handleClose} />+ </Modal>+ )}+ {deleteWebsite && (+ <Modal title="Delete website">+ <WebsiteDeleteForm values={deleteWebsite} onSave={handleSave} onClose={handleClose} />+ </Modal>+ )}+ {showCode && (+ <Modal title="Tracking code">+ <WebsiteCodeForm values={showCode} onClose={handleClose} />+ </Modal>+ )}+ </>+ );+}diff --git a/components/Settings.module.css b/components/WebsiteSettings.module.csssimilarity index 64%rename from components/Settings.module.cssrename to components/WebsiteSettings.module.cssindex 91af32469..9283578f1 100644--- a/components/Settings.module.css+++ b/components/WebsiteSettings.module.css@@ -1,4 +1,9 @@+.col {+ flex: 2;+}+.buttons {+ flex: 3;display: flex;justify-content: flex-end;}diff --git a/components/common/Button.js b/components/common/Button.jsindex 7963a36aa..b61f05d3d 100644--- a/components/common/Button.js+++ b/components/common/Button.js@@ -16,8 +16,8 @@ export default function Button({<buttontype={type}className={classNames(styles.button, className, {- [styles.small]: size === 'S',- [styles.large]: size === 'L',+ [styles.small]: size === 'small',+ [styles.large]: size === 'large',[styles.action]: variant === 'action',[styles.danger]: variant === 'danger',})}diff --git a/components/common/Button.module.css b/components/common/Button.module.cssindex d6e6602c5..2345ccdad 100644--- a/components/common/Button.module.css+++ b/components/common/Button.module.css@@ -9,6 +9,7 @@border: 0;outline: none;cursor: pointer;+ white-space: nowrap;}.button:hover {diff --git a/components/common/DropDown.js b/components/common/DropDown.jsindex 1f8bfda02..70c68db7f 100644--- a/components/common/DropDown.js+++ b/components/common/DropDown.js@@ -36,7 +36,7 @@ export default function DropDown({<div ref={ref} className={classNames(styles.dropdown, className)} onClick={handleShowMenu}><div className={styles.value}>{options.find(e => e.value === value)?.label}- <Icon icon={<Chevron />} size="S" />+ <Icon icon={<Chevron />} size="small" /></div>{showMenu && <Menu className={menuClassName} options={options} onSelect={handleSelect} />}</div>diff --git a/components/common/Icon.js b/components/common/Icon.jsindex 30bd90817..f15a7d818 100644--- a/components/common/Icon.js+++ b/components/common/Icon.js@@ -6,10 +6,10 @@ export default function Icon({ icon, className, size = 'M' }) {return (<divclassName={classNames(styles.icon, className, {- [styles.xl]: size === 'XL',- [styles.large]: size === 'L',- [styles.medium]: size === 'M',- [styles.small]: size === 'S',+ [styles.xlarge]: size === 'xlarge',+ [styles.large]: size === 'large',+ [styles.medium]: size === 'medium',+ [styles.small]: size === 'small',})}>{icon}diff --git a/components/common/Icon.module.css b/components/common/Icon.module.cssindex e234799f6..1759a1308 100644--- a/components/common/Icon.module.css+++ b/components/common/Icon.module.css@@ -13,7 +13,7 @@fill: currentColor;}-.xl > svg {+.xlarge > svg {width: 48px;height: 48px;}diff --git a/components/common/Table.js b/components/common/Table.jsindex 169bfd22e..380d5b663 100644--- a/components/common/Table.js+++ b/components/common/Table.js@@ -6,11 +6,11 @@ export default function Table({ columns, rows }) {return (<div className={styles.table}><div className={styles.header}>- {columns.map(({ key, label, header }) => (+ {columns.map(({ key, label, className, style, header }) => (<divkey={key}- className={classNames(styles.head, header?.className)}- style={header?.style}+ className={classNames(styles.head, className, header?.className)}+ style={{ ...style, ...header?.style }}>{label}</div>@@ -19,11 +19,11 @@ export default function Table({ columns, rows }) {<div className={styles.body}>{rows.map((row, rowIndex) => (<div className={styles.row} key={rowIndex}>- {columns.map(({ key, render, cell }) => (+ {columns.map(({ key, render, className, style, cell }) => (<divkey={`${rowIndex}${key}`}- className={classNames(styles.cell, cell?.className)}- style={cell?.style}+ className={classNames(styles.cell, className, cell?.className)}+ style={{ ...style, ...cell?.style }}>{render ? render(row) : row[key]}</div>diff --git a/components/common/UserButton.js b/components/common/UserButton.jsindex dec8f37f0..0718b98f5 100644--- a/components/common/UserButton.js+++ b/components/common/UserButton.js@@ -24,16 +24,13 @@ export default function UserButton() {value: 'username',className: styles.username,},- { label: 'Account', value: 'account' },{ label: 'Logout', value: 'logout' },];function handleSelect(value) {setShowMenu(false);- if (value === 'account') {- router.push('/account');- } else if (value === 'logout') {+ if (value === 'logout') {router.push('/logout');}}@@ -47,8 +44,8 @@ export default function UserButton() {return (<div ref={ref} className={styles.container}><div onClick={() => setShowMenu(state => !state)}>- <Icon icon={<User />} size="L" />- <Icon icon={<Chevron />} size="S" />+ <Icon icon={<User />} size="large" />+ <Icon icon={<Chevron />} size="small" /></div>{showMenu && <Menu options={menuOptions} onSelect={handleSelect} align="right" />}</div>diff --git a/components/forms/AccountEditForm.js b/components/forms/AccountEditForm.jsnew file mode 100644index 000000000..f877d3865--- /dev/null+++ b/components/forms/AccountEditForm.js@@ -0,0 +1,74 @@+import React, { useState } from 'react';+import { Formik, Form, Field } from 'formik';+import { post } from 'lib/web';+import Button from 'components/common/Button';+import FormLayout, {+ FormButtons,+ FormError,+ FormMessage,+ FormRow,+} from 'components/layout/FormLayout';++const initialValues = {+ username: '',+ password: '',+};++const validate = ({ username, password }) => {+ const errors = {};++ if (!username) {+ errors.username = 'Required';+ }+ if (!password) {+ errors.password = 'Required';+ }++ return errors;+};++export default function AccountEditForm({ values, onSave, onClose }) {+ const [message, setMessage] = useState();++ const handleSubmit = async values => {+ const response = await post(`/api/account`, values);++ if (response) {+ onSave();+ } else {+ setMessage('Something went wrong.');+ }+ };++ return (+ <FormLayout>+ <Formik+ initialValues={{ ...initialValues, ...values }}+ validate={validate}+ onSubmit={handleSubmit}+ >+ {() => (+ <Form>+ <FormRow>+ <label htmlFor="username">Username</label>+ <Field name="username" type="text" />+ <FormError name="username" />+ </FormRow>+ <FormRow>+ <label htmlFor="password">Password</label>+ <Field name="password" type="text" />+ <FormError name="password" />+ </FormRow>+ <FormButtons>+ <Button type="submit" variant="action">+ Save+ </Button>+ <Button onClick={onClose}>Cancel</Button>+ </FormButtons>+ <FormMessage>{message}</FormMessage>+ </Form>+ )}+ </Formik>+ </FormLayout>+ );+}diff --git a/components/forms/ChangePasswordForm.js b/components/forms/ChangePasswordForm.jsnew file mode 100644index 000000000..a59de0bac--- /dev/null+++ b/components/forms/ChangePasswordForm.js@@ -0,0 +1,85 @@+import React, { useState } from 'react';+import { Formik, Form, Field } from 'formik';+import { post } from 'lib/web';+import Button from 'components/common/Button';+import FormLayout, {+ FormButtons,+ FormError,+ FormMessage,+ FormRow,+} from 'components/layout/FormLayout';++const initialValues = {+ password: '',+ newPassword: '',+ defaultPassword: '',+};++const validate = ({ password, newPassword, confirmPassword }) => {+ const errors = {};++ if (!password) {+ errors.password = 'Required';+ }+ if (!newPassword) {+ errors.newPassword = 'Required';+ }+ if (!confirmPassword) {+ errors.confirmPassword = 'Required';+ } else if (newPassword !== confirmPassword) {+ errors.confirmPassword = `Passwords don't match`;+ }++ return errors;+};++export default function ChangePasswordForm({ values, onSave, onClose }) {+ const [message, setMessage] = useState();++ const handleSubmit = async values => {+ const response = await post(`/api/website`, values);++ if (response) {+ onSave();+ } else {+ setMessage('Something went wrong.');+ }+ };++ return (+ <FormLayout>+ <Formik+ initialValues={{ ...initialValues, ...values }}+ validate={validate}+ onSubmit={handleSubmit}+ >+ {() => (+ <Form>+ <FormRow>+ <label htmlFor="password">Current password</label>+ <Field name="password" type="password" />+ <FormError name="password" />+ </FormRow>+ <FormRow>+ <label htmlFor="newPassword">New password</label>+ <Field name="newPassword" type="password" />+ <FormError name="newPassword" />+ </FormRow>+ <FormRow>+ <label htmlFor="confirmPassword">Confirm password</label>+ <Field name="confirmPassword" type="password" />+ <FormError name="confirmPassword" />+ </FormRow>+ <FormButtons>+ <Button type="submit" variant="action">+ Save+ </Button>+ <Button onClick={onClose}>Cancel</Button>+ </FormButtons>+ <FormMessage>{message}</FormMessage>+ </Form>+ )}+ </Formik>+ </FormLayout>+ );+}diff --git a/components/forms/WebsiteEditForm.js b/components/forms/WebsiteEditForm.jsindex 10f98ff51..5473da3c9 100644--- a/components/forms/WebsiteEditForm.js+++ b/components/forms/WebsiteEditForm.js@@ -9,6 +9,11 @@ import FormLayout, {FormRow,} from 'components/layout/FormLayout';+const initialValues = {+ name: '',+ domain: '',+};+const validate = ({ name, domain }) => {const errors = {};@@ -37,7 +42,11 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {return (<FormLayout>- <Formik initialValues={values} validate={validate} onSubmit={handleSubmit}>+ <Formik+ initialValues={{ ...initialValues, ...values }}+ validate={validate}+ onSubmit={handleSubmit}+ >{() => (<Form><FormRow>diff --git a/components/layout/FormLayout.module.css b/components/layout/FormLayout.module.cssindex f2b915960..ef73310fa 100644--- a/components/layout/FormLayout.module.css+++ b/components/layout/FormLayout.module.css@@ -5,7 +5,7 @@}.form label {- display: inline-block;+ display: block;min-width: 100px;}@@ -37,6 +37,7 @@margin-left: 16px;padding: 4px 10px;border-radius: 4px;+ white-space: nowrap;}.error:after {diff --git a/components/layout/Header.js b/components/layout/Header.jsindex d382bcaf2..4eaa97982 100644--- a/components/layout/Header.js+++ b/components/layout/Header.js@@ -15,7 +15,7 @@ export default function Header() {<div className="row align-items-center"><div className="col"><div className={styles.title}>- <Icon icon={<Logo />} size="L" className={styles.logo} />+ <Icon icon={<Logo />} size="large" className={styles.logo} />{user ? <Link href="/">umami</Link> : 'umami'}</div></div>diff --git a/components/layout/MenuLayout.js b/components/layout/MenuLayout.jsnew file mode 100644index 000000000..c4776abe4--- /dev/null+++ b/components/layout/MenuLayout.js@@ -0,0 +1,25 @@+import React, { useState } from 'react';+import classNames from 'classnames';+import styles from './MenuLayout.module.css';++export default function MenuLayout({ menu, selectedOption, onMenuSelect, children }) {+ const [option, setOption] = useState(selectedOption);++ return (+ <div className={styles.container}>+ <div className={styles.menu}>+ {menu.map(item => (+ <div+ className={classNames(styles.option, { [styles.active]: option === item })}+ onClick={() => setOption(item)}+ >+ {item}+ </div>+ ))}+ </div>+ <div className={styles.content}>+ {typeof children === 'function' ? children(option) : children}+ </div>+ </div>+ );+}diff --git a/components/layout/MenuLayout.module.css b/components/layout/MenuLayout.module.cssnew file mode 100644index 000000000..cddc6c2f3--- /dev/null+++ b/components/layout/MenuLayout.module.css@@ -0,0 +1,34 @@+.container {+ display: flex;+ flex: 1;+}++.menu {+ display: flex;+ flex-direction: column;+ padding-top: 30px;+}++.content {+ display: flex;+ flex-direction: column;+ border-left: 1px solid var(--gray300);+ padding-left: 30px;+ flex: 1;+}++.option {+ padding: 8px 20px;+ cursor: pointer;+ min-width: 140px;+ margin-right: 30px;+ border-radius: 4px;+}++.option:hover {+ background: var(--gray75);+}++.active {+ font-weight: 600;+}diff --git a/components/layout/PageHeader.js b/components/layout/PageHeader.jsindex 9e4d8b618..62ec1947b 100644--- a/components/layout/PageHeader.js+++ b/components/layout/PageHeader.js@@ -1,12 +1,6 @@-import React, { Children } from 'react';+import React from 'react';import styles from './PageHeader.module.css';export default function PageHeader({ children }) {- const [firstChild, ...otherChildren] = Children.toArray(children);- return (- <div className={styles.header}>- <div className={styles.title}> {firstChild}</div>- {otherChildren && <div>{otherChildren}</div>}- </div>- );+ return <div className={styles.header}>{children}</div>;}diff --git a/components/layout/PageHeader.module.css b/components/layout/PageHeader.module.cssindex fc93b0491..0c88c0f2a 100644--- a/components/layout/PageHeader.module.css+++ b/components/layout/PageHeader.module.css@@ -3,8 +3,5 @@justify-content: space-between;align-items: center;line-height: 80px;-}--.title {font-size: var(--font-size-large);}diff --git a/lib/crypto.js b/lib/crypto.jsindex 32ce80f83..ec9be3921 100644--- a/lib/crypto.js+++ b/lib/crypto.js@@ -3,6 +3,7 @@ import { v4, v5, validate } from 'uuid';import bcrypt from 'bcrypt';import { JWT, JWE, JWK } from 'jose';+const SALT_ROUNDS = 10;const KEY = JWK.asKey(Buffer.from(secret()));export function hash(...args) {@@ -23,6 +24,10 @@ export function isValidId(s) {return validate(s);}+export function hashPassword(password) {+ return bcrypt.hash(password, SALT_ROUNDS);+}+export function checkPassword(password, hash) {return bcrypt.compare(password, hash);}diff --git a/lib/db.js b/lib/db.jsindex 515877f2e..ff7774e87 100644--- a/lib/db.js+++ b/lib/db.js@@ -124,8 +124,8 @@ export async function getSession({ session_id, session_uuid }) {return runQuery(prisma.session.findOne({where: {- ...(session_id && { session_id }),- ...(session_uuid && { session_uuid }),+ session_id,+ session_uuid,},}),);@@ -174,13 +174,50 @@ export async function saveEvent(website_id, session_id, url, event_type, event_v);}-export async function getAccount(username = '') {+export async function getAccounts() {+ return runQuery(prisma.account.findMany());+}++export async function getAccount({ user_id, username }) {return runQuery(prisma.account.findOne({where: {username,+ user_id,+ },+ }),+ );+}++export async function updateAccount(user_id, data) {+ return runQuery(+ prisma.account.update({+ where: {+ user_id,+ },+ data,+ }),+ );+}++export async function deleteAccount(user_id) {+ return runQuery(+ /* Prisma bug, does not cascade on non-nullable foreign keys+ prisma.account.delete({+ where: {+ user_id,},}),+ */+ prisma.queryRaw(`delete from account where user_id=$1`, user_id),+ );+}++export async function createAccount(data) {+ return runQuery(+ prisma.account.create({+ data,+ }),);}diff --git a/lib/session.js b/lib/session.jsindex 9cdb1c7cc..901c9023b 100644--- a/lib/session.js+++ b/lib/session.js@@ -4,6 +4,11 @@ import { uuid, isValidId, parseToken } from 'lib/crypto';export async function verifySession(req) {const { payload } = req.body;++ if (!payload) {+ throw new Error('Invalid request');+ }+const { website: website_uuid, hostname, screen, language, session } = payload;const token = await parseToken(session);diff --git a/lib/web.js b/lib/web.jsindex ad9db7c82..3be2ef57b 100644--- a/lib/web.js+++ b/lib/web.js@@ -11,7 +11,7 @@ export const apiRequest = (method, url, body) =>if (res.ok) {return res.json();}- return null;+ return res.text();});function parseQuery(url, params = {}) {diff --git a/pages/account.js b/pages/account.jsindex d97b63252..0fddfeb11 100644--- a/pages/account.js+++ b/pages/account.js@@ -1,6 +1,6 @@import React from 'react';import Layout from 'components/layout/Layout';-import Account from 'components/Account';+import AccountSettings from 'components/AccountSettings';import useRequireLogin from 'hooks/useRequireLogin';export default function AccountPage() {@@ -12,7 +12,7 @@ export default function AccountPage() {return (<Layout>- <Account />+ <AccountSettings /></Layout>);}diff --git a/pages/api/account.js b/pages/api/account.jsnew file mode 100644index 000000000..f04fae101--- /dev/null+++ b/pages/api/account.js@@ -0,0 +1,48 @@+import { getAccounts, getAccount, updateAccount, createAccount } from 'lib/db';+import { useAuth } from 'lib/middleware';+import { hashPassword, uuid } from 'lib/crypto';+import { ok, unauthorized, methodNotAllowed } from 'lib/response';++export default async (req, res) => {+ await useAuth(req, res);++ const { user_id: current_user_id, is_admin } = req.auth;++ if (req.method === 'GET') {+ if (is_admin) {+ const accounts = await getAccounts();++ return ok(res, accounts);+ }++ return unauthorized(res);+ }++ if (req.method === 'POST') {+ const { user_id, username, password } = req.body;++ if (user_id) {+ const account = getAccount({ user_id });++ if (account.user_id === current_user_id || is_admin) {+ const data = { password: password ? await hashPassword(password) : undefined };++ if (is_admin) {+ data.username = username;+ }++ const updated = await updateAccount(user_id, { username, password });++ return ok(res, updated);+ }++ return unauthorized(res);+ } else {+ const account = await createAccount({ username, password: await hashPassword(password) });++ return ok(res, account);+ }+ }++ return methodNotAllowed(res);+};diff --git a/pages/login.js b/pages/login.jsindex fbbab1d17..4c8228b93 100644--- a/pages/login.js+++ b/pages/login.js@@ -7,7 +7,7 @@ import Logo from 'assets/logo.svg';export default function LoginPage() {return (<Layout title="login" header={false} footer={false} center middle>- <Icon icon={<Logo />} size="XL" />+ <Icon icon={<Logo />} size="xlarge" /><LoginForm /></Layout>);diff --git a/styles/index.css b/styles/index.cssindex d84248f0a..a6dfe968f 100644--- a/styles/index.css+++ b/styles/index.css@@ -59,10 +59,12 @@ textarea {resize: none;}-select {- padding: 4px 8px;- border: 1px solid var(--gray500) !important;- border-radius: 4px;+dt {+ font-weight: 600;+}++dd {+ margin: 0 0 10px 0;}main {