Merge branch 'dev' into feat/um-285-report-schema

components/pages/settings/teams/TeamLeaveForm.js

@@ -5,7 +5,7 @@ import useMessages from 'hooks/useMessages';
 export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
   const { del, useMutation } = useApi();
-  const { mutate, error, isLoading } = useMutation(() => del(`/team/${teamId}/users/${userId}`));
+  const { mutate, error, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
 
   const handleSubmit = async () => {
     mutate(
@@ -22,7 +22,7 @@ export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
   return (
     <Form onSubmit={handleSubmit} error={error}>
       <p>
-        <FormattedMessage {...messages.confirmLeave} values={{ name: <b>{teamName}</b> }} />
+        <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} />
       </p>
       <FormButtons flex>
         <SubmitButton variant="danger" disabled={isLoading}>

components/pages/settings/teams/TeamMemberRemoveButton.js

@@ -5,7 +5,7 @@ import { Icon, Icons, LoadingButton, Text } from 'react-basics';
 export function TeamMemberRemoveButton({ teamId, userId, disabled, onSave }) {
   const { formatMessage, labels } = useMessages();
   const { del, useMutation } = useApi();
-  const { mutate, isLoading } = useMutation(() => del(`/team/${teamId}/users/${userId}`));
+  const { mutate, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
 
   const handleRemoveTeamMember = () => {
     mutate(

lib/cache.ts

@@ -49,6 +49,11 @@ async function deleteSession(id) {
   return deleteObject(`session:${id}`);
 }
 
+async function fetchUserBlock(userId: string) {
+  const key = `user:block:${userId}`;
+  return redis.get(key);
+}
+
 export default {
   fetchWebsite,
   storeWebsite,
@@ -59,5 +64,6 @@ export default {
   fetchSession,
   storeSession,
   deleteSession,
+  fetchUserBlock,
   enabled: redis.enabled,
 };

lib/middleware.ts

@@ -1,4 +1,10 @@
-import { createMiddleware, unauthorized, badRequest, parseSecureToken } from 'next-basics';
+import {
+  createMiddleware,
+  unauthorized,
+  badRequest,
+  parseSecureToken,
+  tooManyRequest,
+} from 'next-basics';
 import debug from 'debug';
 import cors from 'cors';
 import { validate } from 'uuid';
@@ -30,6 +36,9 @@ export const useSession = createMiddleware(async (req, res, next) => {
 
     (req as any).session = session;
   } catch (e: any) {
+    if (e.message === 'Usage Limit.') {
+      return tooManyRequest(res, e.message);
+    }
     return badRequest(res, e.message);
   }
 

lib/session.ts

@@ -6,6 +6,7 @@ import { CollectRequestBody, NextApiRequestCollect } from 'pages/api/send';
 import { createSession } from 'queries';
 import { validate } from 'uuid';
 import { loadSession, loadWebsite } from './query';
+import cache from './cache';
 
 export async function findSession(req: NextApiRequestCollect) {
   const { payload } = getJsonBody<CollectRequestBody>(req);
@@ -21,6 +22,8 @@ export async function findSession(req: NextApiRequestCollect) {
     const result = await parseToken(cacheToken, secret());
 
     if (result) {
+      await checkUserBlock(result?.ownerId);
+
       return result;
     }
   }
@@ -39,6 +42,8 @@ export async function findSession(req: NextApiRequestCollect) {
     throw new Error(`Website not found: ${websiteId}.`);
   }
 
+  await checkUserBlock(website.userId);
+
   const { userAgent, browser, os, ip, country, subdivision1, subdivision2, city, device } =
     await getClientInfo(req, payload);
   const sessionId = uuid(websiteId, hostname, ip, userAgent);
@@ -88,5 +93,11 @@ export async function findSession(req: NextApiRequestCollect) {
     }
   }
 
-  return session;
+  return { ...session, ownerId: website.userId };
+}
+
+async function checkUserBlock(userId: string) {
+  if (process.env.ENABLE_BLOCKER && (await cache.fetchUserBlock(userId))) {
+    throw new Error('Usage Limit.');
+  }
 }

pages/api/auth/login.ts

@@ -50,7 +50,7 @@ export default async (
 
       return ok(res, {
         token,
-        user: { id: user.id, username: user.username, createdAt: user.createdAt },
+        user: { id: user.id, username: user.username, role: user.role, createdAt: user.createdAt },
       });
     }
 

pages/api/send.ts

@@ -28,6 +28,7 @@ export interface NextApiRequestCollect extends NextApiRequest {
   session: {
     id: string;
     websiteId: string;
+    ownerId: string;
     hostname: string;
     browser: string;
     os: string;