Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Update teams features.

Mike Cao656df4f846b8
diff --git a/components/common/ErrorMessage.js b/components/common/ErrorMessage.js
index ccd96c80c..926e64ac5 100644
--- a/components/common/ErrorMessage.js
+++ b/components/common/ErrorMessage.js
@@ -1,14 +1,17 @@
-import { FormattedMessage } from 'react-intl';
-import { Icon, Icons } from 'react-basics';
+import { useIntl } from 'react-intl';
+import { Icon, Icons, Text } from 'react-basics';
+import { messages } from 'components/messages';
import styles from './ErrorMessage.module.css';
export default function ErrorMessage() {
+ const { formatMessage } = useIntl();
+
return (
<div className={styles.error}>
<Icon className={styles.icon} size="large">
<Icons.Alert />
</Icon>
- <FormattedMessage id="message.failure" defaultMessage="Something went wrong." />
+ <Text>{formatMessage(messages.error)}</Text>
</div>
);
}
diff --git a/components/icons.js b/components/icons.js
index a8d6cd794..4868edc67 100644
--- a/components/icons.js
+++ b/components/icons.js
@@ -1,4 +1,5 @@
import { Icons } from 'react-basics';
+import AddUser from 'assets/add-user.svg';
import Bolt from 'assets/bolt.svg';
import Calendar from 'assets/calendar.svg';
import Clock from 'assets/clock.svg';
@@ -15,6 +16,7 @@ import Users from 'assets/users.svg';
const icons = {
...Icons,
+ AddUser,
Bolt,
Calendar,
Clock,
diff --git a/components/messages.js b/components/messages.js
index d4299597e..c9ce76b95 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -26,8 +26,11 @@ export const labels = defineMessages({
team: { id: 'label.team', defaultMessage: 'Team' },
regenerate: { id: 'label.regenerate', defaultMessage: 'Regenerate' },
remove: { id: 'label.remove', defaultMessage: 'Remove' },
+ join: { id: 'label.join', defaultMessage: 'Join' },
createTeam: { id: 'label.create-team', defaultMessage: 'Create team' },
+ joinTeam: { id: 'label.join-team', defaultMessage: 'Join team' },
settings: { id: 'label.settings', defaultMessage: 'Settings' },
+ owner: { id: 'label.owner', defaultMessage: 'Owner' },
teamOwner: { id: 'label.team-owner', defaultMessage: 'Team owner' },
teamMember: { id: 'label.team-member', defaultMessage: 'Team member' },
teamGuest: { id: 'label.team-guest', defaultMessage: 'Team guest' },
@@ -61,6 +64,7 @@ export const labels = defineMessages({
logout: { id: 'label.logout', defaultMessage: 'Logout' },
singleDay: { id: 'label.single-day', defaultMessage: 'Single day' },
dateRange: { id: 'label.date-range', defaultMessage: 'Date range' },
+ viewDetails: { id: 'label.view-details', defaultMessage: 'View details' },
});
export const messages = defineMessages({
@@ -79,7 +83,7 @@ export const messages = defineMessages({
},
noTeams: {
id: 'message.no-teams',
- defaultMessage: 'You have no created any teams.',
+ defaultMessage: 'You have not created any teams.',
},
shareUrl: {
id: 'message.share-url',
@@ -120,6 +124,14 @@ export const messages = defineMessages({
id: 'message.go-to-settings',
defaultMessage: 'Go to settings',
},
+ activeUsers: {
+ id: 'message.active-users',
+ defaultMessage: '{x} current {x, plural, one {visitor} other {visitors}}',
+ },
+ teamNotFound: {
+ id: 'message.team-not-found',
+ defaultMessage: 'Team not found.',
+ },
});
export const devices = defineMessages({
@@ -129,6 +141,12 @@ export const devices = defineMessages({
mobile: { id: 'metrics.device.mobile', defaultMessage: 'Mobile' },
});
+export function getMessage(id, formatMessage) {
+ const message = Object.values(messages).find(value => value.id === id);
+
+ return message ? formatMessage(message) : id;
+}
+
export function getDeviceMessage(device) {
return devices[device] || labels.unknown;
}
diff --git a/components/metrics/ActiveUsers.js b/components/metrics/ActiveUsers.js
index 83895b5a7..664e23a98 100644
--- a/components/metrics/ActiveUsers.js
+++ b/components/metrics/ActiveUsers.js
@@ -1,16 +1,20 @@
import { useMemo } from 'react';
import { StatusLight } from 'react-basics';
-import { FormattedMessage } from 'react-intl';
-import classNames from 'classnames';
+import { useIntl } from 'react-intl';
import useApi from 'hooks/useApi';
+import { messages } from 'components/messages';
import styles from './ActiveUsers.module.css';
-export default function ActiveUsers({ websiteId, className, value, refetchInterval = 60000 }) {
- const url = websiteId ? `/websites/${websiteId}/active` : null;
+export default function ActiveUsers({ websiteId, value, refetchInterval = 60000 }) {
+ const { formatMessage } = useIntl();
const { get, useQuery } = useApi();
- const { data } = useQuery(['websites:active', websiteId], () => get(url), {
- refetchInterval,
- });
+ const { data } = useQuery(
+ ['websites:active', websiteId],
+ () => get(`/websites/${websiteId}/active`),
+ {
+ refetchInterval,
+ },
+ );
const count = useMemo(() => {
if (websiteId) {
@@ -25,17 +29,8 @@ export default function ActiveUsers({ websiteId, className, value, refetchInterv
}
return (
- <div className={classNames(styles.container, className)}>
- <StatusLight variant="success" />
- <div className={styles.text}>
- <div>
- <FormattedMessage
- id="message.active-users"
- defaultMessage="{x} current {x, plural, one {visitor} other {visitors}}"
- values={{ x: count }}
- />
- </div>
- </div>
- </div>
+ <StatusLight variant="success">
+ <div className={styles.text}>{formatMessage(messages.activeUsers, { x: count })}</div>
+ </StatusLight>
);
}
diff --git a/components/metrics/ChartTooltip.js b/components/metrics/ChartTooltip.js
index 503b44e1b..c409f4621 100644
--- a/components/metrics/ChartTooltip.js
+++ b/components/metrics/ChartTooltip.js
@@ -15,8 +15,9 @@ export default function ChartTooltip({ chartId, tooltip }) {
<div className={styles.content}>
<div className={styles.title}>{title}</div>
<div className={styles.metric}>
- <StatusLight color={labelColor} />
- {value} {label}
+ <StatusLight color={labelColor}>
+ {value} {label}
+ </StatusLight>
</div>
</div>
</div>
diff --git a/components/metrics/Legend.js b/components/metrics/Legend.js
index f10b29bcd..32267970d 100644
--- a/components/metrics/Legend.js
+++ b/components/metrics/Legend.js
@@ -34,8 +34,9 @@ export default function Legend({ chart }) {
className={classNames(styles.label, { [styles.hidden]: hidden })}
onClick={() => handleClick(datasetIndex)}
>
- <StatusLight color={color.alpha(color.alpha() + 0.2).toHex()} />
- <span className={locale}>{text}</span>
+ <StatusLight color={color.alpha(color.alpha() + 0.2).toHex()}>
+ <span className={locale}>{text}</span>
+ </StatusLight>
</div>
);
})}
diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.js
index daab7f720..c731cc6cd 100644
--- a/components/metrics/WebsiteChart.js
+++ b/components/metrics/WebsiteChart.js
@@ -1,5 +1,7 @@
import { useMemo } from 'react';
-import { Row, Column, Loading } from 'react-basics';
+import { useIntl } from 'react-intl';
+import { Button, Icon, Text, Row, Column, Loading } from 'react-basics';
+import Link from 'next/link';
import PageviewsChart from './PageviewsChart';
import MetricsBar from './MetricsBar';
import WebsiteHeader from './WebsiteHeader';
@@ -12,6 +14,8 @@ import useDateRange from 'hooks/useDateRange';
import useTimezone from 'hooks/useTimezone';
import usePageQuery from 'hooks/usePageQuery';
import { getDateArray, getDateLength, getDateRangeValues } from 'lib/date';
+import Icons from 'components/icons';
+import { labels } from 'components/messages';
import styles from './WebsiteChart.module.css';
export default function WebsiteChart({
@@ -20,8 +24,10 @@ export default function WebsiteChart({
domain,
stickyHeader = false,
showChart = true,
+ showDetailsButton = false,
onDataLoad = () => {},
}) {
+ const { formatMessage } = useIntl();
const [dateRange, setDateRange] = useDateRange(websiteId);
const { startDate, endDate, unit, value, modified } = dateRange;
const [timezone] = useTimezone();
@@ -82,7 +88,20 @@ export default function WebsiteChart({
return (
<>
- <WebsiteHeader websiteId={websiteId} title={title} domain={domain} />
+ <WebsiteHeader websiteId={websiteId} title={title} domain={domain}>
+ {showDetailsButton && (
+ <Link href={`/websites/${websiteId}`}>
+ <a>
+ <Button>
+ <Text>{formatMessage(labels.viewDetails)}</Text>
+ <Icon>
+ <Icons.ArrowRight />
+ </Icon>
+ </Button>
+ </a>
+ </Link>
+ )}
+ </WebsiteHeader>
<StickyHeader
className={styles.metrics}
stickyClassName={styles.sticky}
diff --git a/components/metrics/WebsiteHeader.js b/components/metrics/WebsiteHeader.js
index 5d59b1997..8f102c088 100644
--- a/components/metrics/WebsiteHeader.js
+++ b/components/metrics/WebsiteHeader.js
@@ -1,22 +1,20 @@
import { Row, Column } from 'react-basics';
import Favicon from 'components/common/Favicon';
import OverflowText from 'components/common/OverflowText';
-import PageHeader from 'components/layout/PageHeader';
import ActiveUsers from './ActiveUsers';
import styles from './WebsiteHeader.module.css';
-export default function WebsiteHeader({ websiteId, title, domain }) {
+export default function WebsiteHeader({ websiteId, title, domain, children }) {
return (
- <PageHeader>
- <Row>
- <Column className={styles.title} variant="two">
- <Favicon domain={domain} />
- <OverflowText tooltipId={`${websiteId}-title`}>{title}</OverflowText>
- </Column>
- <Column className={styles.active} variant="two">
- <ActiveUsers websiteId={websiteId} />
- </Column>
- </Row>
- </PageHeader>
+ <Row className={styles.header} justifyContent="center">
+ <Column className={styles.title} variant="two">
+ <Favicon domain={domain} />
+ <OverflowText tooltipId={`${websiteId}-title`}>{title}</OverflowText>
+ </Column>
+ <Column className={styles.body} variant="two">
+ <ActiveUsers websiteId={websiteId} />
+ {children}
+ </Column>
+ </Row>
);
}
diff --git a/components/metrics/WebsiteHeader.module.css b/components/metrics/WebsiteHeader.module.css
index f7700fe89..e3147f53f 100644
--- a/components/metrics/WebsiteHeader.module.css
+++ b/components/metrics/WebsiteHeader.module.css
@@ -1,15 +1,21 @@
+.header {
+ height: 100px;
+}
+
.title {
display: flex;
flex-direction: row;
align-items: center;
gap: 10px;
- font-size: var(--font-size-lg);
+ font-size: 24px;
+ font-weight: 700;
overflow: hidden;
}
-.active {
+.body {
display: flex;
flex-direction: row;
align-items: center;
- justify-content: center;
+ justify-content: flex-end;
+ gap: 30px;
}
diff --git a/components/pages/settings/teams/JoinTeamForm.js b/components/pages/settings/teams/JoinTeamForm.js
new file mode 100644
index 000000000..387968fd0
--- /dev/null
+++ b/components/pages/settings/teams/JoinTeamForm.js
@@ -0,0 +1,43 @@
+import { useRef } from 'react';
+import { useIntl } from 'react-intl';
+import {
+ Form,
+ FormRow,
+ FormInput,
+ FormButtons,
+ TextField,
+ Button,
+ SubmitButton,
+} from 'react-basics';
+import useApi from 'hooks/useApi';
+import { labels, getMessage } from 'components/messages';
+
+export default function TeamJoinForm({ onSave, onClose }) {
+ const { formatMessage } = useIntl();
+ const { post, useMutation } = useApi();
+ const { mutate, error } = useMutation(data => post('/teams/join', data));
+ const ref = useRef(null);
+
+ const handleSubmit = async data => {
+ mutate(data, {
+ onSuccess: async () => {
+ onSave();
+ onClose();
+ },
+ });
+ };
+
+ return (
+ <Form ref={ref} onSubmit={handleSubmit} error={error && getMessage(error, formatMessage)}>
+ <FormRow label={formatMessage(labels.accessCode)}>
+ <FormInput name="accessCode" rules={{ required: formatMessage(labels.required) }}>
+ <TextField autoComplete="off" />
+ </FormInput>
+ </FormRow>
+ <FormButtons flex>
+ <SubmitButton variant="primary">{formatMessage(labels.join)}</SubmitButton>
+ <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
+ </FormButtons>
+ </Form>
+ );
+}
diff --git a/components/pages/settings/teams/TeamMembers.js b/components/pages/settings/teams/TeamMembers.js
index f43199557..c9901e34c 100644
--- a/components/pages/settings/teams/TeamMembers.js
+++ b/components/pages/settings/teams/TeamMembers.js
@@ -4,7 +4,7 @@ import TeamMembersTable from 'components/pages/settings/teams/TeamMembersTable';
export default function TeamMembers({ teamId }) {
const { get, useQuery } = useApi();
- const { data, isLoading } = useQuery(['team-members', teamId], () =>
+ const { data, isLoading } = useQuery(['teams:users', teamId], () =>
get(`/teams/${teamId}/users`),
);
diff --git a/components/pages/settings/teams/TeamSettings.js b/components/pages/settings/teams/TeamSettings.js
index 3bcfedfc9..6d3c70fa8 100644
--- a/components/pages/settings/teams/TeamSettings.js
+++ b/components/pages/settings/teams/TeamSettings.js
@@ -40,14 +40,16 @@ export default function TeamSettings({ teamId }) {
return (
<Page loading={isLoading || !values}>
{toast}
- <PageHeader>
- <Breadcrumbs>
- <Item>
- <Link href="/settings/teams">Teams</Link>
- </Item>
- <Item>{values?.name}</Item>
- </Breadcrumbs>
- </PageHeader>
+ <PageHeader
+ title={
+ <Breadcrumbs>
+ <Item>
+ <Link href="/settings/teams">Teams</Link>
+ </Item>
+ <Item>{values?.name}</Item>
+ </Breadcrumbs>
+ }
+ />
<Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30 }}>
<Item key="details">{formatMessage(labels.details)}</Item>
<Item key="members">{formatMessage(labels.members)}</Item>
diff --git a/components/pages/settings/teams/TeamWebsites.js b/components/pages/settings/teams/TeamWebsites.js
index f00ee0576..1a04f4900 100644
--- a/components/pages/settings/teams/TeamWebsites.js
+++ b/components/pages/settings/teams/TeamWebsites.js
@@ -7,7 +7,7 @@ import { messages } from 'components/messages';
export default function TeamWebsites({ teamId }) {
const { formatMessage } = useIntl();
const { get, useQuery } = useApi();
- const { data, isLoading } = useQuery(['teams/websites', teamId], () =>
+ const { data, isLoading } = useQuery(['teams:websites', teamId], () =>
get(`/teams/${teamId}/websites`),
);
const hasData = data && data.length !== 0;
diff --git a/components/pages/settings/teams/TeamsList.js b/components/pages/settings/teams/TeamsList.js
index cae33567a..591a836e7 100644
--- a/components/pages/settings/teams/TeamsList.js
+++ b/components/pages/settings/teams/TeamsList.js
@@ -1,5 +1,5 @@
import { useState } from 'react';
-import { Button, Icon, Modal, ModalTrigger, useToast, Icons, Text } from 'react-basics';
+import { Button, Icon, Modal, ModalTrigger, useToast, Text, Flexbox } from 'react-basics';
import { useIntl } from 'react-intl';
import useApi from 'hooks/useApi';
import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
@@ -8,6 +8,8 @@ import PageHeader from 'components/layout/PageHeader';
import TeamsTable from 'components/pages/settings/teams/TeamsTable';
import Page from 'components/layout/Page';
import { labels, messages } from 'components/messages';
+import Icons from 'components/icons';
+import TeamJoinForm from './JoinTeamForm';
export default function TeamsList() {
const { formatMessage } = useIntl();
@@ -22,6 +24,24 @@ export default function TeamsList() {
showToast({ message: formatMessage(messages.saved), variant: 'success' });
};
+ const handleJoin = () => {
+ showToast({ message: formatMessage(messages.saved), variant: 'success' });
+ };
+
+ const joinButton = (
+ <ModalTrigger>
+ <Button variant="secondary">
+ <Icon>
+ <Icons.AddUser />
+ </Icon>
+ <Text>{formatMessage(labels.joinTeam)}</Text>
+ </Button>
+ <Modal title={formatMessage(labels.joinTeam)}>
+ {close => <TeamJoinForm onSave={handleJoin} onClose={close} />}
+ </Modal>
+ </ModalTrigger>
+ );
+
const createButton = (
<ModalTrigger>
<Button variant="primary">
@@ -39,7 +59,14 @@ export default function TeamsList() {
return (
<Page loading={isLoading} error={error}>
{toast}
- <PageHeader title={formatMessage(labels.team)}>{createButton}</PageHeader>
+ <PageHeader title={formatMessage(labels.team)}>
+ {hasData && (
+ <Flexbox gap={10}>
+ {joinButton}
+ {createButton}
+ </Flexbox>
+ )}
+ </PageHeader>
{hasData && <TeamsTable data={data} />}
{!hasData && (
<EmptyPlaceholder message={formatMessage(messages.noTeams)}>
diff --git a/components/pages/settings/teams/TeamsTable.js b/components/pages/settings/teams/TeamsTable.js
index 73cf0eb28..3e7dd2cdb 100644
--- a/components/pages/settings/teams/TeamsTable.js
+++ b/components/pages/settings/teams/TeamsTable.js
@@ -14,12 +14,14 @@ import {
} from 'react-basics';
import { useIntl } from 'react-intl';
import { labels } from 'components/messages';
+import { ROLES } from 'lib/constants';
export default function TeamsTable({ data = [] }) {
const { formatMessage } = useIntl();
const columns = [
{ name: 'name', label: formatMessage(labels.name), style: { flex: 2 } },
+ { name: 'owner', label: formatMessage(labels.owner) },
{ name: 'action', label: ' ' },
];
@@ -38,23 +40,27 @@ export default function TeamsTable({ data = [] }) {
{(row, keys, rowIndex) => {
const { id } = row;
- row.action = (
- <Flexbox flex={1} justifyContent="end">
- <Link href={`/settings/teams/${id}`}>
- <a>
- <Button>
- <Icon>
- <Icons.ArrowRight />
- </Icon>
- <Text>{formatMessage(labels.settings)}</Text>
- </Button>
- </a>
- </Link>
- </Flexbox>
- );
+ const rowData = {
+ ...row,
+ owner: row.teamUsers.find(({ role }) => role === ROLES.teamOwner)?.user?.username,
+ action: (
+ <Flexbox flex={1} justifyContent="end">
+ <Link href={`/settings/teams/${id}`}>
+ <a>
+ <Button>
+ <Icon>
+ <Icons.ArrowRight />
+ </Icon>
+ <Text>{formatMessage(labels.settings)}</Text>
+ </Button>
+ </a>
+ </Link>
+ </Flexbox>
+ ),
+ };
return (
- <TableRow key={rowIndex} data={row} keys={keys}>
+ <TableRow key={rowIndex} data={rowData} keys={keys}>
{(data, key, colIndex) => {
return (
<TableCell key={colIndex} style={{ ...columns[colIndex]?.style }}>
diff --git a/components/pages/settings/users/UserSettings.js b/components/pages/settings/users/UserSettings.js
index c41b9ce45..e3fad23c7 100644
--- a/components/pages/settings/users/UserSettings.js
+++ b/components/pages/settings/users/UserSettings.js
@@ -46,14 +46,16 @@ export default function UserSettings({ userId }) {
return (
<Page loading={isLoading || !values}>
{toast}
- <PageHeader>
- <Breadcrumbs>
- <Item>
- <Link href="/settings/users">{formatMessage(labels.users)}</Link>
- </Item>
- <Item>{values?.username}</Item>
- </Breadcrumbs>
- </PageHeader>
+ <PageHeader
+ title={
+ <Breadcrumbs>
+ <Item>
+ <Link href="/settings/users">{formatMessage(labels.users)}</Link>
+ </Item>
+ <Item>{values?.username}</Item>
+ </Breadcrumbs>
+ }
+ />
<Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30, fontSize: 14 }}>
<Item key="details">{formatMessage(labels.details)}</Item>
<Item key="websites">{formatMessage(labels.websites)}</Item>
diff --git a/components/pages/settings/users/UserWebsites.js b/components/pages/settings/users/UserWebsites.js
index 28fddaa47..326464f7d 100644
--- a/components/pages/settings/users/UserWebsites.js
+++ b/components/pages/settings/users/UserWebsites.js
@@ -7,7 +7,7 @@ import { messages } from 'components/messages';
export default function UserWebsites({ userId }) {
const { formatMessage } = useIntl();
const { get, useQuery } = useApi();
- const { data, isLoading } = useQuery(['user/websites', userId], () =>
+ const { data, isLoading } = useQuery(['user:websites', userId], () =>
get(`/users/${userId}/websites`),
);
const hasData = data && data.length !== 0;
diff --git a/components/pages/settings/websites/WebsiteSettings.js b/components/pages/settings/websites/WebsiteSettings.js
index a6ee50925..e61c699d2 100644
--- a/components/pages/settings/websites/WebsiteSettings.js
+++ b/components/pages/settings/websites/WebsiteSettings.js
@@ -49,13 +49,16 @@ export default function WebsiteSettings({ websiteId }) {
return (
<Page loading={isLoading || !values}>
{toast}
- <PageHeader>
- <Breadcrumbs>
- <Item>
- <Link href="/settings/websites">{formatMessage(labels.websites)}</Link>
- </Item>
- <Item>{values?.name}</Item>
- </Breadcrumbs>
+ <PageHeader
+ title={
+ <Breadcrumbs>
+ <Item>
+ <Link href="/settings/websites">{formatMessage(labels.websites)}</Link>
+ </Item>
+ <Item>{values?.name}</Item>
+ </Breadcrumbs>
+ }
+ >
<Link href={`/websites/${websiteId}`}>
<a>
<Button variant="primary">
diff --git a/components/pages/websites/WebsiteChartList.js b/components/pages/websites/WebsiteChartList.js
index d0545dcc9..1d0fc1db8 100644
--- a/components/pages/websites/WebsiteChartList.js
+++ b/components/pages/websites/WebsiteChartList.js
@@ -1,10 +1,10 @@
-import WebsiteChart from 'components/metrics/WebsiteChart';
-import styles from './WebsiteList.module.css';
-import useDashboard from 'store/dashboard';
import { useMemo } from 'react';
import { firstBy } from 'thenby';
+import WebsiteChart from 'components/metrics/WebsiteChart';
+import useDashboard from 'store/dashboard';
+import styles from './WebsiteList.module.css';
-export default function WebsiteList({ websites, showCharts, limit }) {
+export default function WebsiteChartList({ websites, showCharts, limit }) {
const { websiteOrder } = useDashboard();
const ordered = useMemo(
@@ -17,19 +17,19 @@ export default function WebsiteList({ websites, showCharts, limit }) {
return (
<div>
- {ordered.map(({ id, name, domain }, index) =>
- index < limit ? (
+ {ordered.map(({ id, name, domain }, index) => {
+ return index < limit ? (
<div key={id} className={styles.website}>
<WebsiteChart
websiteId={id}
title={name}
domain={domain}
showChart={showCharts}
- showLink
+ showDetailsButton={true}
/>
</div>
- ) : null,
- )}
+ ) : null;
+ })}
</div>
);
}
diff --git a/pages/api/auth/login.ts b/pages/api/auth/login.ts
index 8494d388e..d81017da0 100644
--- a/pages/api/auth/login.ts
+++ b/pages/api/auth/login.ts
@@ -38,11 +38,11 @@ export default async (
if (user && checkPassword(password, user.password)) {
if (redis.enabled) {
- const key = `auth:${getRandomChars(32)}`;
+ const authKey = `auth:${getRandomChars(32)}`;
- await redis.set(key, user);
+ await redis.set(authKey, user);
- const token = createSecureToken({ key }, secret());
+ const token = createSecureToken({ authKey }, secret());
return ok(res, { token, user });
}
diff --git a/pages/api/teams/index.ts b/pages/api/teams/index.ts
index 145278986..283f27ca6 100644
--- a/pages/api/teams/index.ts
+++ b/pages/api/teams/index.ts
@@ -4,7 +4,7 @@ import { canCreateTeam } from 'lib/auth';
import { uuid } from 'lib/crypto';
import { useAuth } from 'lib/middleware';
import { NextApiResponse } from 'next';
-import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createTeam, getUserTeams } from 'queries';
export interface TeamsRequestBody {
@@ -34,13 +34,14 @@ export default async (
const { name } = req.body;
- const created = await createTeam({
+ const team = await createTeam({
id: uuid(),
name,
userId,
+ accessCode: getRandomChars(16),
});
- return ok(res, created);
+ return ok(res, team);
}
return methodNotAllowed(res);
diff --git a/pages/api/teams/join.ts b/pages/api/teams/join.ts
new file mode 100644
index 000000000..99fa2a5c2
--- /dev/null
+++ b/pages/api/teams/join.ts
@@ -0,0 +1,34 @@
+import { Team } from '@prisma/client';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { useAuth } from 'lib/middleware';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, notFound } from 'next-basics';
+import { createTeamUser, getTeam } from 'queries';
+import { ROLES } from 'lib/constants';
+
+export interface TeamsRequestBody {
+ accessCode: string;
+}
+
+export default async (
+ req: NextApiRequestQueryBody<any, TeamsRequestBody>,
+ res: NextApiResponse<Team[] | Team>,
+) => {
+ await useAuth(req, res);
+
+ if (req.method === 'POST') {
+ const { accessCode } = req.body;
+
+ const team = await getTeam({ accessCode });
+
+ if (!team) {
+ return notFound(res, 'message.team-not-found');
+ }
+
+ await createTeamUser(req.auth.user.id, team.id, ROLES.teamMember);
+
+ return ok(res, team);
+ }
+
+ return methodNotAllowed(res);
+};
diff --git a/queries/admin/user.ts b/queries/admin/user.ts
index 10b8c92e3..94109251e 100644
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -47,18 +47,22 @@ export async function getUsers(): Promise<User[]> {
}
export async function getUserTeams(userId: string): Promise<Team[]> {
- return prisma.client.teamUser
- .findMany({
- where: {
- userId,
+ return prisma.client.team.findMany({
+ where: {
+ teamUsers: {
+ some: {
+ userId,
+ },
},
- include: {
- team: true,
+ },
+ include: {
+ teamUsers: {
+ include: {
+ user: true,
+ },
},
- })
- .then(data => {
- return data.map(a => a.team);
- });
+ },
+ });
}
export async function getUserWebsites(userId: string): Promise<Website[]> {