devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made sure to only send the e-mail for previously invited users instead of also creating a new code

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-04-30 14:59:55 +01:00
parent 15dbadcc53
commit cbb61d18fe
2 changed files with 426 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/pages/(admin)/Lists/CodeList.tsx
View File

@@ -4,18 +4,23 @@ import Select from "@/components/Low/Select";
import useCodes from "@/hooks/useCodes"; import useCodes from "@/hooks/useCodes";
import useUser from "@/hooks/useUser"; import useUser from "@/hooks/useUser";
import useUsers from "@/hooks/useUsers"; import useUsers from "@/hooks/useUsers";
import {Code, User} from "@/interfaces/user"; import { Code, User } from "@/interfaces/user";
import {USER_TYPE_LABELS} from "@/resources/user"; import { USER_TYPE_LABELS } from "@/resources/user";
import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table"; import {
createColumnHelper,
flexRender,
getCoreRowModel,
useReactTable,
} from "@tanstack/react-table";
import axios from "axios"; import axios from "axios";
import moment from "moment"; import moment from "moment";
import {useEffect, useState} from "react"; import { useEffect, useState } from "react";
import {BsTrash} from "react-icons/bs"; import { BsTrash } from "react-icons/bs";
import {toast} from "react-toastify"; import { toast } from "react-toastify";
const columnHelper = createColumnHelper<Code>(); const columnHelper = createColumnHelper<Code>();
const CreatorCell = ({id, users}: {id: string; users: User[]}) => { const CreatorCell = ({ id, users }: { id: string; users: User[] }) => {
const [creatorUser, setCreatorUser] = useState<User>(); const [creatorUser, setCreatorUser] = useState<User>();
useEffect(() => { useEffect(() => {
@@ -24,50 +29,73 @@ const CreatorCell = ({id, users}: {id: string; users: User[]}) => {
return ( return (
<> <>
{(creatorUser?.type === "corporate" ? creatorUser?.corporateInformation?.companyInformation?.name : creatorUser?.name || "N/A") || "N/A"}{" "} {(creatorUser?.type === "corporate"
? creatorUser?.corporateInformation?.companyInformation?.name
: creatorUser?.name || "N/A") || "N/A"}{" "}
{creatorUser && `(${USER_TYPE_LABELS[creatorUser.type]})`} {creatorUser && `(${USER_TYPE_LABELS[creatorUser.type]})`}
</> </>
); );
}; };
export default function CodeList({user}: {user: User}) { export default function CodeList({ user }: { user: User }) {
const [selectedCodes, setSelectedCodes] = useState<string[]>([]); const [selectedCodes, setSelectedCodes] = useState<string[]>([]);
const [filteredCorporate, setFilteredCorporate] = useState<User | undefined>(user?.type === "corporate" ? user : undefined); const [filteredCorporate, setFilteredCorporate] = useState<User | undefined>(
const [filterAvailability, setFilterAvailability] = useState<"in-use" | "unused">(); user?.type === "corporate" ? user : undefined,
);
const [filterAvailability, setFilterAvailability] = useState<
"in-use" | "unused"
>();
const [filteredCodes, setFilteredCodes] = useState<Code[]>([]); const [filteredCodes, setFilteredCodes] = useState<Code[]>([]);
const {users} = useUsers(); const { users } = useUsers();
const {codes, reload} = useCodes(user?.type === "corporate" ? user?.id : undefined); const { codes, reload } = useCodes(
user?.type === "corporate" ? user?.id : undefined,
);
useEffect(() => { useEffect(() => {
let result = [...codes]; let result = [...codes];
if (filteredCorporate) result = result.filter((x) => x.creator === filteredCorporate.id); if (filteredCorporate)
if (filterAvailability) result = result.filter((x) => (filterAvailability === "in-use" ? !!x.userId : !x.userId)); result = result.filter((x) => x.creator === filteredCorporate.id);
if (filterAvailability)
result = result.filter((x) =>
filterAvailability === "in-use" ? !!x.userId : !x.userId,
);
setFilteredCodes(result); setFilteredCodes(result);
}, [codes, filteredCorporate, filterAvailability]); }, [codes, filteredCorporate, filterAvailability]);
const toggleCode = (id: string) => { const toggleCode = (id: string) => {
setSelectedCodes((prev) => (prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id])); setSelectedCodes((prev) =>
prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id],
);
}; };
const toggleAllCodes = (checked: boolean) => { const toggleAllCodes = (checked: boolean) => {
if (checked) return setSelectedCodes(filteredCodes.filter((x) => !x.userId).map((x) => x.code)); if (checked)
return setSelectedCodes(
filteredCodes.filter((x) => !x.userId).map((x) => x.code),
);
return setSelectedCodes([]); return setSelectedCodes([]);
}; };
const deleteCodes = async (codes: string[]) => { const deleteCodes = async (codes: string[]) => {
if (!confirm(`Are you sure you want to delete these ${codes.length} code(s)?`)) return; if (
!confirm(`Are you sure you want to delete these ${codes.length} code(s)?`)
)
return;
const params = new URLSearchParams(); const params = new URLSearchParams();
codes.forEach((code) => params.append("code", code)); codes.forEach((code) => params.append("code", code));
axios axios
.delete(`/api/code?${params.toString()}`) .delete(`/api/code?${params.toString()}`)
.then(() => toast.success(`Deleted the codes!`)) .then(() => {
toast.success(`Deleted the codes!`);
setSelectedCodes([]);
})
.catch((reason) => { .catch((reason) => {
if (reason.response.status === 404) { if (reason.response.status === 404) {
toast.error("Code not found!"); toast.error("Code not found!");
@@ -85,7 +113,8 @@ export default function CodeList({user}: {user: User}) {
}; };
const deleteCode = async (code: Code) => { const deleteCode = async (code: Code) => {
if (!confirm(`Are you sure you want to delete this "${code.code}" code?`)) return; if (!confirm(`Are you sure you want to delete this "${code.code}" code?`))
return;
axios axios
.delete(`/api/code/${code.code}`) .delete(`/api/code/${code.code}`)
@@ -113,15 +142,21 @@ export default function CodeList({user}: {user: User}) {
<Checkbox <Checkbox
disabled={filteredCodes.filter((x) => !x.userId).length === 0} disabled={filteredCodes.filter((x) => !x.userId).length === 0}
isChecked={ isChecked={
selectedCodes.length === filteredCodes.filter((x) => !x.userId).length && filteredCodes.filter((x) => !x.userId).length > 0 selectedCodes.length ===
filteredCodes.filter((x) => !x.userId).length &&
filteredCodes.filter((x) => !x.userId).length > 0
} }
onChange={(checked) => toggleAllCodes(checked)}> onChange={(checked) => toggleAllCodes(checked)}
>
{""} {""}
</Checkbox> </Checkbox>
), ),
cell: (info) => cell: (info) =>
!info.row.original.userId ? ( !info.row.original.userId ? (
<Checkbox isChecked={selectedCodes.includes(info.getValue())} onChange={() => toggleCode(info.getValue())}> <Checkbox
isChecked={selectedCodes.includes(info.getValue())}
onChange={() => toggleCode(info.getValue())}
>
{""} {""}
</Checkbox> </Checkbox>
) : null, ) : null,
@@ -132,7 +167,8 @@ export default function CodeList({user}: {user: User}) {
}), }),
columnHelper.accessor("creationDate", { columnHelper.accessor("creationDate", {
header: "Creation Date", header: "Creation Date",
cell: (info) => (info.getValue() ? moment(info.getValue()).format("DD/MM/YYYY") : "N/A"), cell: (info) =>
info.getValue() ? moment(info.getValue()).format("DD/MM/YYYY") : "N/A",
}), }),
columnHelper.accessor("email", { columnHelper.accessor("email", {
header: "Invited E-mail", header: "Invited E-mail",
@@ -158,11 +194,15 @@ export default function CodeList({user}: {user: User}) {
{ {
header: "", header: "",
id: "actions", id: "actions",
cell: ({row}: {row: {original: Code}}) => { cell: ({ row }: { row: { original: Code } }) => {
return ( return (
<div className="flex gap-4"> <div className="flex gap-4">
{!row.original.userId && ( {!row.original.userId && (
<div data-tip="Delete" className="cursor-pointer tooltip" onClick={() => deleteCode(row.original)}> <div
data-tip="Delete"
className="cursor-pointer tooltip"
onClick={() => deleteCode(row.original)}
>
<BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" /> <BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
</div> </div>
)} )}
@@ -192,7 +232,8 @@ export default function CodeList({user}: {user: User}) {
? { ? {
label: `${ label: `${
filteredCorporate.type === "corporate" filteredCorporate.type === "corporate"
? filteredCorporate.corporateInformation?.companyInformation?.name || filteredCorporate.name ? filteredCorporate.corporateInformation
?.companyInformation?.name || filteredCorporate.name
: filteredCorporate.name : filteredCorporate.name
} (${USER_TYPE_LABELS[filteredCorporate.type]})`, } (${USER_TYPE_LABELS[filteredCorporate.type]})`,
value: filteredCorporate.id, value: filteredCorporate.id,
@@ -200,7 +241,9 @@ export default function CodeList({user}: {user: User}) {
: null : null
} }
options={users options={users
.filter((x) => ["admin", "developer", "corporate"].includes(x.type)) .filter((x) =>
["admin", "developer", "corporate"].includes(x.type),
)
.map((x) => ({ .map((x) => ({
label: `${x.type === "corporate" ? x.corporateInformation?.companyInformation?.name || x.name : x.name} (${ label: `${x.type === "corporate" ? x.corporateInformation?.companyInformation?.name || x.name : x.name} (${
USER_TYPE_LABELS[x.type] USER_TYPE_LABELS[x.type]
@@ -208,17 +251,25 @@ export default function CodeList({user}: {user: User}) {
value: x.id, value: x.id,
user: x, user: x,
}))} }))}
onChange={(value) => setFilteredCorporate(value ? users.find((x) => x.id === value?.value) : undefined)} onChange={(value) =>
setFilteredCorporate(
value ? users.find((x) => x.id === value?.value) : undefined,
)
}
/> />
<Select <Select
className="!w-96 !py-1" className="!w-96 !py-1"
placeholder="Availability" placeholder="Availability"
isClearable isClearable
options={[ options={[
{label: "In Use", value: "in-use"}, { label: "In Use", value: "in-use" },
{label: "Unused", value: "unused"}, { label: "Unused", value: "unused" },
]} ]}
onChange={(value) => setFilterAvailability(value ? (value.value as typeof filterAvailability) : undefined)} onChange={(value) =>
setFilterAvailability(
value ? (value.value as typeof filterAvailability) : undefined,
)
}
/> />
</div> </div>
<div className="flex gap-4 items-center"> <div className="flex gap-4 items-center">
@@ -228,7 +279,8 @@ export default function CodeList({user}: {user: User}) {
variant="outline" variant="outline"
color="red" color="red"
className="!py-1 px-10" className="!py-1 px-10"
onClick={() => deleteCodes(selectedCodes)}> onClick={() => deleteCodes(selectedCodes)}
>
Delete Delete
</Button> </Button>
</div> </div>
@@ -239,7 +291,12 @@ export default function CodeList({user}: {user: User}) {
<tr key={headerGroup.id}> <tr key={headerGroup.id}>
{headerGroup.headers.map((header) => ( {headerGroup.headers.map((header) => (
<th className="p-4 text-left" key={header.id}> <th className="p-4 text-left" key={header.id}>
{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())} {header.isPlaceholder
? null
: flexRender(
header.column.columnDef.header,
header.getContext(),
)}
</th> </th>
))} ))}
</tr> </tr>
@@ -247,7 +304,10 @@ export default function CodeList({user}: {user: User}) {
</thead> </thead>
<tbody className="px-2"> <tbody className="px-2">
{table.getRowModel().rows.map((row) => ( {table.getRowModel().rows.map((row) => (
<tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}> <tr
className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
key={row.id}
>
{row.getVisibleCells().map((cell) => ( {row.getVisibleCells().map((cell) => (
<td className="px-4 py-2" key={cell.id}> <td className="px-4 py-2" key={cell.id}>
{flexRender(cell.column.columnDef.cell, cell.getContext())} {flexRender(cell.column.columnDef.cell, cell.getContext())}

85
src/pages/api/code/index.ts
View File

@@ -1,13 +1,23 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type {NextApiRequest, NextApiResponse} from "next"; import type { NextApiRequest, NextApiResponse } from "next";
import {app} from "@/firebase"; import { app } from "@/firebase";
import {getFirestore, setDoc, doc, query, collection, where, getDocs, getDoc, deleteDoc} from "firebase/firestore"; import {
import {withIronSessionApiRoute} from "iron-session/next"; getFirestore,
import {sessionOptions} from "@/lib/session"; setDoc,
import {Type} from "@/interfaces/user"; doc,
import {PERMISSIONS} from "@/constants/userPermissions"; query,
import {uuidv4} from "@firebase/util"; collection,
import {prepareMailer, prepareMailOptions} from "@/email"; where,
getDocs,
getDoc,
deleteDoc,
} from "firebase/firestore";
import { withIronSessionApiRoute } from "iron-session/next";
import { sessionOptions } from "@/lib/session";
import { Code, Type } from "@/interfaces/user";
import { PERMISSIONS } from "@/constants/userPermissions";
import { uuidv4 } from "@firebase/util";
import { prepareMailer, prepareMailOptions } from "@/email";
const db = getFirestore(app); const db = getFirestore(app);
@@ -18,17 +28,22 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
if (req.method === "POST") return post(req, res); if (req.method === "POST") return post(req, res);
if (req.method === "DELETE") return del(req, res); if (req.method === "DELETE") return del(req, res);
return res.status(404).json({ok: false}); return res.status(404).json({ ok: false });
} }
async function get(req: NextApiRequest, res: NextApiResponse) { async function get(req: NextApiRequest, res: NextApiResponse) {
if (!req.session.user) { if (!req.session.user) {
res.status(401).json({ok: false, reason: "You must be logged in to generate a code!"}); res
.status(401)
.json({ ok: false, reason: "You must be logged in to generate a code!" });
return; return;
} }
const {creator} = req.query as {creator?: string}; const { creator } = req.query as { creator?: string };
const q = query(collection(db, "codes"), where("creator", "==", creator || "")); const q = query(
collection(db, "codes"),
where("creator", "==", creator || ""),
);
const snapshot = await getDocs(creator ? q : collection(db, "codes")); const snapshot = await getDocs(creator ? q : collection(db, "codes"));
res.status(200).json(snapshot.docs.map((doc) => doc.data())); res.status(200).json(snapshot.docs.map((doc) => doc.data()));
@@ -36,14 +51,16 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
async function post(req: NextApiRequest, res: NextApiResponse) { async function post(req: NextApiRequest, res: NextApiResponse) {
if (!req.session.user) { if (!req.session.user) {
res.status(401).json({ok: false, reason: "You must be logged in to generate a code!"}); res
.status(401)
.json({ ok: false, reason: "You must be logged in to generate a code!" });
return; return;
} }
const {type, codes, infos, expiryDate} = req.body as { const { type, codes, infos, expiryDate } = req.body as {
type: Type; type: Type;
codes: string[]; codes: string[];
infos?: {email: string; name: string; passport_id?: string}[]; infos?: { email: string; name: string; passport_id?: string }[];
expiryDate: null | Date; expiryDate: null | Date;
}; };
const permission = PERMISSIONS.generateCode[type]; const permission = PERMISSIONS.generateCode[type];
@@ -51,15 +68,23 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
if (!permission.includes(req.session.user.type)) { if (!permission.includes(req.session.user.type)) {
res.status(403).json({ res.status(403).json({
ok: false, ok: false,
reason: "Your account type does not have permissions to generate a code for that type of user!", reason:
"Your account type does not have permissions to generate a code for that type of user!",
}); });
return; return;
} }
const codesGeneratedByUserSnapshot = await getDocs(
query(collection(db, "codes"), where("creator", "==", req.session.user.id)),
);
const userCodes = codesGeneratedByUserSnapshot.docs.map((x) => ({
...x.data(),
}));
if (req.session.user.type === "corporate") { if (req.session.user.type === "corporate") {
const codesGeneratedByUserSnapshot = await getDocs(query(collection(db, "codes"), where("creator", "==", req.session.user.id)));
const totalCodes = codesGeneratedByUserSnapshot.docs.length + codes.length; const totalCodes = codesGeneratedByUserSnapshot.docs.length + codes.length;
const allowedCodes = req.session.user.corporateInformation?.companyInformation.userAmount || 0; const allowedCodes =
req.session.user.corporateInformation?.companyInformation.userAmount || 0;
if (totalCodes > allowedCodes) { if (totalCodes > allowedCodes) {
res.status(403).json({ res.status(403).json({
@@ -74,7 +99,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
const codePromises = codes.map(async (code, index) => { const codePromises = codes.map(async (code, index) => {
const codeRef = doc(db, "codes", code); const codeRef = doc(db, "codes", code);
const codeInformation = { let codeInformation = {
type, type,
code, code,
creator: req.session.user!.id, creator: req.session.user!.id,
@@ -83,13 +108,14 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
}; };
if (infos && infos.length > index) { if (infos && infos.length > index) {
const {email, name, passport_id} = infos[index]; const { email, name, passport_id } = infos[index];
const previousCode = userCodes.find((x) => x.email === email) as Code;
const transport = prepareMailer(); const transport = prepareMailer();
const mailOptions = prepareMailOptions( const mailOptions = prepareMailOptions(
{ {
type, type,
code, code: previousCode ? previousCode.code : code,
environment: process.env.ENVIRONMENT, environment: process.env.ENVIRONMENT,
}, },
[email.toLowerCase().trim()], [email.toLowerCase().trim()],
@@ -99,16 +125,19 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
try { try {
await transport.sendMail(mailOptions); await transport.sendMail(mailOptions);
if (!previousCode) {
await setDoc( await setDoc(
codeRef, codeRef,
{ {
...codeInformation, ...codeInformation,
email: email.trim().toLowerCase(), email: email.trim().toLowerCase(),
name: name.trim(), name: name.trim(),
...(passport_id ? {passport_id: passport_id.trim()} : {}), ...(passport_id ? { passport_id: passport_id.trim() } : {}),
}, },
{merge: true}, { merge: true },
); );
}
return true; return true;
} catch (e) { } catch (e) {
@@ -120,13 +149,15 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
}); });
Promise.all(codePromises).then((results) => { Promise.all(codePromises).then((results) => {
res.status(200).json({ok: true, valid: results.filter((x) => x).length}); res.status(200).json({ ok: true, valid: results.filter((x) => x).length });
}); });
} }
async function del(req: NextApiRequest, res: NextApiResponse) { async function del(req: NextApiRequest, res: NextApiResponse) {
if (!req.session.user) { if (!req.session.user) {
res.status(401).json({ok: false, reason: "You must be logged in to generate a code!"}); res
.status(401)
.json({ ok: false, reason: "You must be logged in to generate a code!" });
return; return;
} }
@@ -139,5 +170,5 @@ async function del(req: NextApiRequest, res: NextApiResponse) {
await deleteDoc(snapshot.ref); await deleteDoc(snapshot.ref);
} }
res.status(200).json({codes}); res.status(200).json({ codes });
} }