Merge branch 'develop'
This commit is contained in:
@@ -55,7 +55,14 @@ export default function PayPalPayment({
|
||||
trackingId,
|
||||
})
|
||||
.then((response) => response.data)
|
||||
.then((data) => data.id);
|
||||
.then((data) => {
|
||||
setIsLoading(false);
|
||||
return data.id;
|
||||
})
|
||||
.catch((err) => {
|
||||
setIsLoading(false);
|
||||
return err;
|
||||
});
|
||||
};
|
||||
|
||||
const onApprove = async (data: OnApproveData, actions: OnApproveActions) => {
|
||||
@@ -63,11 +70,14 @@ export default function PayPalPayment({
|
||||
throw new Error("trackingId is not set");
|
||||
}
|
||||
|
||||
const request = await axios.post<{ ok: boolean; reason?: string }>(
|
||||
"/api/paypal/approve",
|
||||
{ id: data.orderID, duration, duration_unit, trackingId }
|
||||
);
|
||||
|
||||
axios
|
||||
.post<{ ok: boolean; reason?: string }>("/api/paypal/approve", {
|
||||
id: data.orderID,
|
||||
duration,
|
||||
duration_unit,
|
||||
trackingId,
|
||||
})
|
||||
.then((request) => {
|
||||
if (request.status !== 200) {
|
||||
toast.error("Something went wrong, please try again later");
|
||||
return;
|
||||
@@ -75,6 +85,11 @@ export default function PayPalPayment({
|
||||
|
||||
toast.success("Your account has been credited more time!");
|
||||
return onSuccess(duration, duration_unit);
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err);
|
||||
toast.error("Something went wrong, please try again later");
|
||||
});
|
||||
};
|
||||
|
||||
const onError = async (data: Record<string, unknown>) => {
|
||||
@@ -96,7 +111,6 @@ export default function PayPalPayment({
|
||||
currency,
|
||||
intent: "capture",
|
||||
commit: true,
|
||||
vault: true,
|
||||
}}
|
||||
>
|
||||
<PayPalButtons
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
</p>
|
||||
<br />
|
||||
<p>Don't forget to do it before its end date!</p>
|
||||
<p>Click <b><a href="https://platform.encoach.com">here</a></b> to open the EnCoach Platform!</p>
|
||||
<p>Click <b><a href="https://{{environment}}.encoach.com">here</a></b> to open the EnCoach Platform!</p>
|
||||
<br />
|
||||
<p>Thanks,</p>
|
||||
<p>Your EnCoach team</p>
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
<img src="/logo_title.png" class="w-48 h-48 self-center" />
|
||||
<div>
|
||||
<span>Hello future {{type}} of <b>EnCoach</b>,</span><br />
|
||||
<span>You have been invited to register at <a href="https://platform.encoach.com/register?code={{code}}">EnCoach</a>
|
||||
<span>You have been invited to register at <a
|
||||
href="https://{{environment}}.encoach.com/register?code={{code}}">EnCoach</a>
|
||||
to
|
||||
become a
|
||||
{{type}}!</span><br />
|
||||
@@ -19,7 +20,7 @@
|
||||
</div>
|
||||
<br />
|
||||
<br />
|
||||
<a href="https://platform.encoach.com/register?code={{code}}"></a>
|
||||
<a href="https://{{environment}}.encoach.com/register?code={{code}}"></a>
|
||||
<span class="self-center p-4 px-12 text-lg text-[#]" style="background-color: #D5D9F0; color: #353338">
|
||||
<b>{{code}}</b>
|
||||
</span>
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
<p>Hello {{name}},</p>
|
||||
<br />
|
||||
<p>Follow this link to verify your email address.</p>
|
||||
<a href="https://platform.encoach.com/action?mode=signIn&continueUrl={{email}}&oobCode={{code}}">Verify account</a>
|
||||
<a href="https://{{environment}}.encoach.com/action?mode=signIn&continueUrl={{email}}&oobCode={{code}}">Verify
|
||||
account</a>
|
||||
<br />
|
||||
<br />
|
||||
<p>If you didn’t ask to verify this address, you can ignore this email.</p>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"name": "Tiago Ribeiro",
|
||||
"email": "tiago.ribeiro@ecrop.dev",
|
||||
"code": "123"
|
||||
"code": "123",
|
||||
"environment": "platform"
|
||||
}
|
||||
@@ -15,6 +15,8 @@ import InviteCard from "@/components/Medium/InviteCard";
|
||||
import {useRouter} from "next/router";
|
||||
import {PayPalScriptProvider} from "@paypal/react-paypal-js";
|
||||
import { usePaypalTracking } from "@/hooks/usePaypalTracking";
|
||||
import {ToastContainer} from "react-toastify";
|
||||
|
||||
|
||||
interface Props {
|
||||
user: User;
|
||||
@@ -47,6 +49,7 @@ export default function PaymentDue({user, hasExpired = false, clientID, reload}:
|
||||
|
||||
return (
|
||||
<>
|
||||
<ToastContainer />
|
||||
{isLoading && (
|
||||
<div className="absolute left-0 top-0 z-[999] h-screen w-screen overflow-hidden bg-black/60">
|
||||
<div className="absolute left-1/2 top-1/2 flex h-fit w-fit -translate-x-1/2 -translate-y-1/2 animate-pulse flex-col items-center gap-8 text-white">
|
||||
@@ -97,7 +100,6 @@ export default function PaymentDue({user, hasExpired = false, clientID, reload}:
|
||||
currency: "USD",
|
||||
intent: "capture",
|
||||
commit: true,
|
||||
vault: true,
|
||||
}}>
|
||||
{packages.map((p) => (
|
||||
<div key={p.id} className={clsx("flex flex-col items-start gap-6 rounded-xl bg-white p-4")}>
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
/* eslint-disable @next/next/no-img-element */
|
||||
import { toast, ToastContainer } from "react-toastify";
|
||||
import {toast, ToastContainer} from "react-toastify";
|
||||
import axios from "axios";
|
||||
import { FormEvent, useEffect, useState } from "react";
|
||||
import {FormEvent, useEffect, useState} from "react";
|
||||
import Head from "next/head";
|
||||
import useUser from "@/hooks/useUser";
|
||||
import { Divider } from "primereact/divider";
|
||||
import {Divider} from "primereact/divider";
|
||||
import Button from "@/components/Low/Button";
|
||||
import { BsArrowRepeat } from "react-icons/bs";
|
||||
import {BsArrowRepeat} from "react-icons/bs";
|
||||
import Link from "next/link";
|
||||
import Input from "@/components/Low/Input";
|
||||
import { useRouter } from "next/router";
|
||||
import {useRouter} from "next/router";
|
||||
|
||||
export function getServerSideProps({
|
||||
query,
|
||||
@@ -35,20 +35,12 @@ export function getServerSideProps({
|
||||
props: {
|
||||
code: query.oobCode,
|
||||
mode: query.mode,
|
||||
...(query.continueUrl ? { continueUrl: query.continueUrl } : {}),
|
||||
...(query.continueUrl ? {continueUrl: query.continueUrl} : {}),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export default function Reset({
|
||||
code,
|
||||
mode,
|
||||
continueUrl,
|
||||
}: {
|
||||
code: string;
|
||||
mode: string;
|
||||
continueUrl?: string;
|
||||
}) {
|
||||
export default function Reset({code, mode, continueUrl}: {code: string; mode: string; continueUrl?: string}) {
|
||||
const [password, setPassword] = useState("");
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
|
||||
@@ -62,8 +54,8 @@ export default function Reset({
|
||||
useEffect(() => {
|
||||
if (mode === "signIn") {
|
||||
axios
|
||||
.post<{ ok: boolean }>("/api/reset/verify", {
|
||||
email: continueUrl?.replace("https://platform.encoach.com/", ""),
|
||||
.post<{ok: boolean}>("/api/reset/verify", {
|
||||
email: continueUrl?.replace("https://platform.encoach.com/", "").replace("https://staging.encoach.com/", ""),
|
||||
})
|
||||
.then((response) => {
|
||||
if (response.data.ok) {
|
||||
@@ -76,20 +68,14 @@ export default function Reset({
|
||||
return;
|
||||
}
|
||||
|
||||
toast.error(
|
||||
"Something went wrong! Please make sure to click the link in your e-mail again and input the correct e-mail!",
|
||||
{
|
||||
toast.error("Something went wrong! Please make sure to click the link in your e-mail again and input the correct e-mail!", {
|
||||
toastId: "verify-error",
|
||||
},
|
||||
);
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
toast.error(
|
||||
"Something went wrong! Please make sure to click the link in your e-mail again and input the correct e-mail!",
|
||||
{
|
||||
toast.error("Something went wrong! Please make sure to click the link in your e-mail again and input the correct e-mail!", {
|
||||
toastId: "verify-error",
|
||||
},
|
||||
);
|
||||
});
|
||||
setIsLoading(false);
|
||||
});
|
||||
}
|
||||
@@ -100,7 +86,7 @@ export default function Reset({
|
||||
|
||||
setIsLoading(true);
|
||||
axios
|
||||
.post<{ ok: boolean }>("/api/reset/confirm", { code, password })
|
||||
.post<{ok: boolean}>("/api/reset/confirm", {code, password})
|
||||
.then((response) => {
|
||||
if (response.data.ok) {
|
||||
toast.success("Your password has been reset!", {
|
||||
@@ -112,16 +98,10 @@ export default function Reset({
|
||||
return;
|
||||
}
|
||||
|
||||
toast.error(
|
||||
"Something went wrong! Please make sure to click the link in your e-mail again!",
|
||||
{ toastId: "reset-error" },
|
||||
);
|
||||
toast.error("Something went wrong! Please make sure to click the link in your e-mail again!", {toastId: "reset-error"});
|
||||
})
|
||||
.catch(() => {
|
||||
toast.error(
|
||||
"Something went wrong! Please make sure to click the link in your e-mail again!",
|
||||
{ toastId: "reset-error" },
|
||||
);
|
||||
toast.error("Something went wrong! Please make sure to click the link in your e-mail again!", {toastId: "reset-error"});
|
||||
})
|
||||
.finally(() => setIsLoading(false));
|
||||
};
|
||||
@@ -138,51 +118,24 @@ export default function Reset({
|
||||
<ToastContainer />
|
||||
<section className="relative hidden h-full w-fit min-w-fit lg:flex">
|
||||
<div className="bg-mti-rose-light absolute z-10 h-full w-full bg-opacity-50" />
|
||||
<img
|
||||
src="/people-talking-tablet.png"
|
||||
alt="People smiling looking at a tablet"
|
||||
className="aspect-auto h-full"
|
||||
/>
|
||||
<img src="/people-talking-tablet.png" alt="People smiling looking at a tablet" className="aspect-auto h-full" />
|
||||
</section>
|
||||
{mode === "resetPassword" && (
|
||||
<section className="flex h-full w-full flex-col items-center justify-center gap-2">
|
||||
<div className="relative flex flex-col items-center gap-2">
|
||||
<img
|
||||
src="/logo_title.png"
|
||||
alt="EnCoach's Logo"
|
||||
className="absolute -top-36 w-36 lg:-top-64 lg:w-64"
|
||||
/>
|
||||
<h1 className="text-2xl font-bold lg:text-4xl">
|
||||
Reset your password
|
||||
</h1>
|
||||
<p className="text-mti-gray-cool self-start text-sm font-normal lg:text-base">
|
||||
to your registered Email Address
|
||||
</p>
|
||||
<img src="/logo_title.png" alt="EnCoach's Logo" className="absolute -top-36 w-36 lg:-top-64 lg:w-64" />
|
||||
<h1 className="text-2xl font-bold lg:text-4xl">Reset your password</h1>
|
||||
<p className="text-mti-gray-cool self-start text-sm font-normal lg:text-base">to your registered Email Address</p>
|
||||
</div>
|
||||
<Divider className="max-w-xs lg:max-w-md" />
|
||||
<form
|
||||
className="-lg:px-8 flex w-full flex-col items-center gap-6 lg:w-1/2"
|
||||
onSubmit={login}
|
||||
>
|
||||
<Input
|
||||
type="password"
|
||||
name="password"
|
||||
onChange={(e) => setPassword(e)}
|
||||
placeholder="Password"
|
||||
/>
|
||||
<form className="-lg:px-8 flex w-full flex-col items-center gap-6 lg:w-1/2" onSubmit={login}>
|
||||
<Input type="password" name="password" onChange={(e) => setPassword(e)} placeholder="Password" />
|
||||
|
||||
<Button
|
||||
className="mt-8 w-full"
|
||||
color="purple"
|
||||
disabled={isLoading}
|
||||
>
|
||||
<Button className="mt-8 w-full" color="purple" disabled={isLoading}>
|
||||
{!isLoading && "Reset"}
|
||||
{isLoading && (
|
||||
<div className="flex items-center justify-center">
|
||||
<BsArrowRepeat
|
||||
className="animate-spin text-white"
|
||||
size={25}
|
||||
/>
|
||||
<BsArrowRepeat className="animate-spin text-white" size={25} />
|
||||
</div>
|
||||
)}
|
||||
</Button>
|
||||
@@ -198,25 +151,15 @@ export default function Reset({
|
||||
{mode === "signIn" && (
|
||||
<section className="flex h-full w-full flex-col items-center justify-center gap-2">
|
||||
<div className="relative flex flex-col items-center gap-2">
|
||||
<img
|
||||
src="/logo_title.png"
|
||||
alt="EnCoach's Logo"
|
||||
className="absolute -top-36 w-36 lg:-top-64 lg:w-64"
|
||||
/>
|
||||
<h1 className="text-2xl font-bold lg:text-4xl">
|
||||
Confirm your account
|
||||
</h1>
|
||||
<p className="text-mti-gray-cool self-start text-sm font-normal lg:text-base">
|
||||
to your registered Email Address
|
||||
</p>
|
||||
<img src="/logo_title.png" alt="EnCoach's Logo" className="absolute -top-36 w-36 lg:-top-64 lg:w-64" />
|
||||
<h1 className="text-2xl font-bold lg:text-4xl">Confirm your account</h1>
|
||||
<p className="text-mti-gray-cool self-start text-sm font-normal lg:text-base">to your registered Email Address</p>
|
||||
</div>
|
||||
<Divider className="max-w-xs lg:max-w-md" />
|
||||
<div className="-lg:px-8 flex w-full flex-col items-center gap-6 lg:w-1/2">
|
||||
<span className="text-center">
|
||||
Your e-mail is currently being verified, please wait a second.{" "}
|
||||
<br /> <br />
|
||||
Once it has been verified, you will be redirected to the home
|
||||
page.
|
||||
Your e-mail is currently being verified, please wait a second. <br /> <br />
|
||||
Once it has been verified, you will be redirected to the home page.
|
||||
</span>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -163,6 +163,7 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
|
||||
modules: examModulesLabel,
|
||||
assigner: teacher.name,
|
||||
},
|
||||
environment: process.env.ENVIRONMENT,
|
||||
},
|
||||
[assignee.email],
|
||||
"EnCoach - New Assignment!",
|
||||
|
||||
@@ -113,6 +113,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
|
||||
corporateName: invitedBy.name,
|
||||
name: req.session.user.name,
|
||||
decision: "accept",
|
||||
environment: process.env.ENVIRONMENT,
|
||||
},
|
||||
[invitedBy.email],
|
||||
`${req.session.user.name} has accepted your invite!`,
|
||||
|
||||
@@ -1,24 +1,14 @@
|
||||
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
|
||||
import type { NextApiRequest, NextApiResponse } from "next";
|
||||
import { app } from "@/firebase";
|
||||
import {
|
||||
getFirestore,
|
||||
getDoc,
|
||||
doc,
|
||||
deleteDoc,
|
||||
setDoc,
|
||||
getDocs,
|
||||
collection,
|
||||
where,
|
||||
query,
|
||||
} from "firebase/firestore";
|
||||
import { withIronSessionApiRoute } from "iron-session/next";
|
||||
import { sessionOptions } from "@/lib/session";
|
||||
import { Ticket } from "@/interfaces/ticket";
|
||||
import { Invite } from "@/interfaces/invite";
|
||||
import { Group, User } from "@/interfaces/user";
|
||||
import { v4 } from "uuid";
|
||||
import { sendEmail } from "@/email";
|
||||
import type {NextApiRequest, NextApiResponse} from "next";
|
||||
import {app} from "@/firebase";
|
||||
import {getFirestore, getDoc, doc, deleteDoc, setDoc, getDocs, collection, where, query} from "firebase/firestore";
|
||||
import {withIronSessionApiRoute} from "iron-session/next";
|
||||
import {sessionOptions} from "@/lib/session";
|
||||
import {Ticket} from "@/interfaces/ticket";
|
||||
import {Invite} from "@/interfaces/invite";
|
||||
import {Group, User} from "@/interfaces/user";
|
||||
import {v4} from "uuid";
|
||||
import {sendEmail} from "@/email";
|
||||
|
||||
const db = getFirestore(app);
|
||||
|
||||
@@ -32,23 +22,22 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
|
||||
async function get(req: NextApiRequest, res: NextApiResponse) {
|
||||
if (!req.session.user) {
|
||||
res.status(401).json({ ok: false });
|
||||
res.status(401).json({ok: false});
|
||||
return;
|
||||
}
|
||||
|
||||
const { id } = req.query as { id: string };
|
||||
const {id} = req.query as {id: string};
|
||||
const snapshot = await getDoc(doc(db, "invites", id));
|
||||
|
||||
if (snapshot.exists()) {
|
||||
const invite = { ...snapshot.data(), id: snapshot.id } as Invite;
|
||||
if (invite.to !== req.session.user.id)
|
||||
return res.status(403).json({ ok: false });
|
||||
const invite = {...snapshot.data(), id: snapshot.id} as Invite;
|
||||
if (invite.to !== req.session.user.id) return res.status(403).json({ok: false});
|
||||
|
||||
await deleteDoc(snapshot.ref);
|
||||
const invitedByRef = await getDoc(doc(db, "users", invite.from));
|
||||
if (!invitedByRef.exists()) return res.status(404).json({ ok: false });
|
||||
if (!invitedByRef.exists()) return res.status(404).json({ok: false});
|
||||
|
||||
const invitedBy = { ...invitedByRef.data(), id: invitedByRef.id } as User;
|
||||
const invitedBy = {...invitedByRef.data(), id: invitedByRef.id} as User;
|
||||
|
||||
try {
|
||||
await sendEmail(
|
||||
@@ -57,6 +46,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
|
||||
corporateName: invitedBy.name,
|
||||
name: req.session.user.name,
|
||||
decision: "decline",
|
||||
environment: process.env.ENVIRONMENT,
|
||||
},
|
||||
[invitedBy.email],
|
||||
`${req.session.user.name} has declined your invite!`,
|
||||
@@ -65,7 +55,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
res.status(200).json({ ok: true });
|
||||
res.status(200).json({ok: true});
|
||||
} else {
|
||||
res.status(404).json(undefined);
|
||||
}
|
||||
|
||||
@@ -1,20 +1,13 @@
|
||||
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
|
||||
import { sendEmail } from "@/email";
|
||||
import { app } from "@/firebase";
|
||||
import { Invite } from "@/interfaces/invite";
|
||||
import { Ticket } from "@/interfaces/ticket";
|
||||
import { User } from "@/interfaces/user";
|
||||
import { sessionOptions } from "@/lib/session";
|
||||
import {
|
||||
collection,
|
||||
doc,
|
||||
getDoc,
|
||||
getDocs,
|
||||
getFirestore,
|
||||
setDoc,
|
||||
} from "firebase/firestore";
|
||||
import { withIronSessionApiRoute } from "iron-session/next";
|
||||
import type { NextApiRequest, NextApiResponse } from "next";
|
||||
import {sendEmail} from "@/email";
|
||||
import {app} from "@/firebase";
|
||||
import {Invite} from "@/interfaces/invite";
|
||||
import {Ticket} from "@/interfaces/ticket";
|
||||
import {User} from "@/interfaces/user";
|
||||
import {sessionOptions} from "@/lib/session";
|
||||
import {collection, doc, getDoc, getDocs, getFirestore, setDoc} from "firebase/firestore";
|
||||
import {withIronSessionApiRoute} from "iron-session/next";
|
||||
import type {NextApiRequest, NextApiResponse} from "next";
|
||||
import ShortUniqueId from "short-unique-id";
|
||||
|
||||
const db = getFirestore(app);
|
||||
@@ -23,7 +16,7 @@ export default withIronSessionApiRoute(handler, sessionOptions);
|
||||
|
||||
async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
if (!req.session.user) {
|
||||
res.status(401).json({ ok: false });
|
||||
res.status(401).json({ok: false});
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -45,18 +38,16 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
|
||||
async function post(req: NextApiRequest, res: NextApiResponse) {
|
||||
const body = req.body as Invite;
|
||||
|
||||
const existingInvites = (await getDocs(collection(db, "invites"))).docs.map(
|
||||
(x) => ({ ...x.data(), id: x.id }),
|
||||
) as Invite[];
|
||||
const existingInvites = (await getDocs(collection(db, "invites"))).docs.map((x) => ({...x.data(), id: x.id})) as Invite[];
|
||||
|
||||
const invitedRef = await getDoc(doc(db, "users", body.to));
|
||||
if (!invitedRef.exists()) return res.status(404).json({ ok: false });
|
||||
if (!invitedRef.exists()) return res.status(404).json({ok: false});
|
||||
|
||||
const invitedByRef = await getDoc(doc(db, "users", body.from));
|
||||
if (!invitedByRef.exists()) return res.status(404).json({ ok: false });
|
||||
if (!invitedByRef.exists()) return res.status(404).json({ok: false});
|
||||
|
||||
const invited = { ...invitedRef.data(), id: invitedRef.id } as User;
|
||||
const invitedBy = { ...invitedByRef.data(), id: invitedByRef.id } as User;
|
||||
const invited = {...invitedRef.data(), id: invitedRef.id} as User;
|
||||
const invitedBy = {...invitedByRef.data(), id: invitedByRef.id} as User;
|
||||
|
||||
try {
|
||||
await sendEmail(
|
||||
@@ -64,10 +55,8 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
||||
{
|
||||
name: invited.name,
|
||||
corporateName:
|
||||
invitedBy.type === "corporate"
|
||||
? invitedBy.corporateInformation?.companyInformation?.name ||
|
||||
invitedBy.name
|
||||
: invitedBy.name,
|
||||
invitedBy.type === "corporate" ? invitedBy.corporateInformation?.companyInformation?.name || invitedBy.name : invitedBy.name,
|
||||
environment: process.env.ENVIRONMENT,
|
||||
},
|
||||
[invited.email],
|
||||
"You have been invited to a group!",
|
||||
@@ -76,13 +65,10 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
if (
|
||||
existingInvites.filter((i) => i.to === body.to && i.from === body.from)
|
||||
.length == 0
|
||||
) {
|
||||
if (existingInvites.filter((i) => i.to === body.to && i.from === body.from).length == 0) {
|
||||
const shortUID = new ShortUniqueId();
|
||||
await setDoc(doc(db, "invites", body.id || shortUID.randomUUID(8)), body);
|
||||
}
|
||||
|
||||
res.status(200).json({ ok: true });
|
||||
res.status(200).json({ok: true});
|
||||
}
|
||||
|
||||
@@ -42,21 +42,20 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
if (!trackingId)
|
||||
return res.status(401).json({ ok: false, reason: "Missing tracking id!" });
|
||||
|
||||
const request = await axios.post(
|
||||
`${process.env.PAYPAL_ACCESS_TOKEN_URL}/v2/checkout/orders/${id}/capture`,
|
||||
{},
|
||||
{
|
||||
const url = `${process.env.PAYPAL_ACCESS_TOKEN_URL}/v2/checkout/orders/${id}/capture`;
|
||||
const headers = {
|
||||
headers: {
|
||||
Authorization: `Bearer ${accessToken}`,
|
||||
"PayPal-Client-Metadata-Id": trackingId,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
};
|
||||
axios
|
||||
.post(url, {}, headers)
|
||||
.then(async (request) => {
|
||||
if (request.data.status === "COMPLETED") {
|
||||
const user = req.session.user;
|
||||
const subscriptionExpirationDate =
|
||||
req.session.user.subscriptionExpirationDate;
|
||||
user!.subscriptionExpirationDate;
|
||||
const today = moment(new Date());
|
||||
const dateToBeAddedTo = !subscriptionExpirationDate
|
||||
? today
|
||||
@@ -64,9 +63,12 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
? moment(subscriptionExpirationDate)
|
||||
: today;
|
||||
|
||||
const updatedExpirationDate = dateToBeAddedTo.add(duration, duration_unit);
|
||||
const updatedExpirationDate = dateToBeAddedTo.add(
|
||||
duration,
|
||||
duration_unit
|
||||
);
|
||||
await setDoc(
|
||||
doc(db, "users", req.session.user.id),
|
||||
doc(db, "users", req.session.user!.id),
|
||||
{
|
||||
subscriptionExpirationDate: updatedExpirationDate.toISOString(),
|
||||
status: "active",
|
||||
@@ -75,32 +77,32 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
);
|
||||
|
||||
try {
|
||||
await setDoc(
|
||||
doc(db, 'paypalpayments', v4()),
|
||||
{
|
||||
await setDoc(doc(db, "paypalpayments", v4()), {
|
||||
orderId: id,
|
||||
userId: req.session.user.id,
|
||||
userId: req.session.user!.id,
|
||||
status: request.data.status,
|
||||
createdAt: new Date().toISOString(),
|
||||
value: request.data.purchase_units[0].payments.captures[0].amount.value,
|
||||
currency: request.data.purchase_units[0].payments.captures[0].amount.currency_code,
|
||||
value:
|
||||
request.data.purchase_units[0].payments.captures[0].amount.value,
|
||||
currency:
|
||||
request.data.purchase_units[0].payments.captures[0].amount
|
||||
.currency_code,
|
||||
subscriptionDuration: duration,
|
||||
subscriptionDurationUnit: duration_unit,
|
||||
subscriptionExpirationDate: updatedExpirationDate.toISOString(),
|
||||
}
|
||||
);
|
||||
} catch(err) {
|
||||
console.error('Failed to insert paypal payment!', err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.error("Failed to insert paypal payment!", err);
|
||||
}
|
||||
|
||||
if (user.type === "corporate") {
|
||||
if (user!.type === "corporate") {
|
||||
const snapshot = await getDocs(collection(db, "groups"));
|
||||
const groups: Group[] = (
|
||||
snapshot.docs.map((doc) => ({
|
||||
id: doc.id,
|
||||
...doc.data(),
|
||||
})) as Group[]
|
||||
).filter((x) => x.admin === user.id);
|
||||
).filter((x) => x.admin === user!.id);
|
||||
|
||||
await Promise.all(
|
||||
groups
|
||||
@@ -123,10 +125,13 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
return res.status(200).json({ ok: true });
|
||||
}
|
||||
|
||||
res
|
||||
.status(404)
|
||||
.json({
|
||||
res.status(404).json({
|
||||
ok: false,
|
||||
reason: "Order ID not found or purchase was not approved!",
|
||||
});
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err.response.status, err.response.data);
|
||||
res.status(err.response.status).json(err.response.data);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,39 +1,60 @@
|
||||
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
|
||||
import type {NextApiRequest, NextApiResponse} from "next";
|
||||
import {app} from "@/firebase";
|
||||
import {getFirestore, collection, getDocs} from "firebase/firestore";
|
||||
import {withIronSessionApiRoute} from "iron-session/next";
|
||||
import {sessionOptions} from "@/lib/session";
|
||||
import type { NextApiRequest, NextApiResponse } from "next";
|
||||
import { app } from "@/firebase";
|
||||
import { getFirestore, collection, getDocs } from "firebase/firestore";
|
||||
import { withIronSessionApiRoute } from "iron-session/next";
|
||||
import { sessionOptions } from "@/lib/session";
|
||||
import axios from "axios";
|
||||
import {v4} from "uuid";
|
||||
import {OrderResponseBody} from "@paypal/paypal-js";
|
||||
import {getAccessToken} from "@/utils/paypal";
|
||||
import { v4 } from "uuid";
|
||||
import { OrderResponseBody } from "@paypal/paypal-js";
|
||||
import { getAccessToken } from "@/utils/paypal";
|
||||
|
||||
const db = getFirestore(app);
|
||||
|
||||
export default withIronSessionApiRoute(handler, sessionOptions);
|
||||
|
||||
async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
if (req.method !== "POST") return res.status(404).json({ok: false, reason: "Method not supported!"});
|
||||
if (!req.session.user) return res.status(401).json({ok: false});
|
||||
if (req.method !== "POST")
|
||||
return res.status(404).json({ ok: false, reason: "Method not supported!" });
|
||||
if (!req.session.user) return res.status(401).json({ ok: false });
|
||||
|
||||
const accessToken = await getAccessToken();
|
||||
if (!accessToken) return res.status(401).json({ok: false, reason: "Authorization failed!"});
|
||||
if (!accessToken)
|
||||
return res.status(401).json({ ok: false, reason: "Authorization failed!" });
|
||||
|
||||
const {currencyCode, price, trackingId} = req.body as {currencyCode: string; price: number, trackingId: string};
|
||||
const { currencyCode, price, trackingId } = req.body as {
|
||||
currencyCode: string;
|
||||
price: number;
|
||||
trackingId: string;
|
||||
};
|
||||
|
||||
if(!trackingId) return res.status(401).json({ok: false, reason: "Missing tracking id!"});
|
||||
if (!trackingId)
|
||||
return res.status(401).json({ ok: false, reason: "Missing tracking id!" });
|
||||
|
||||
const request = await axios.post<OrderResponseBody>(
|
||||
`${process.env.PAYPAL_ACCESS_TOKEN_URL}/v2/checkout/orders`,
|
||||
{
|
||||
purchase_units: [
|
||||
{
|
||||
amount: {
|
||||
const url = `${process.env.PAYPAL_ACCESS_TOKEN_URL}/v2/checkout/orders`;
|
||||
const amount = {
|
||||
currency_code: currencyCode,
|
||||
value: price.toString(),
|
||||
};
|
||||
|
||||
const data = {
|
||||
purchase_units: [
|
||||
{
|
||||
invoice_id: `INV-${v4()}`,
|
||||
amount: {
|
||||
...amount,
|
||||
breakdown: {
|
||||
item_total: amount,
|
||||
},
|
||||
reference_id: v4(),
|
||||
},
|
||||
items: [
|
||||
{
|
||||
name: "Encoach Subscription",
|
||||
quantity: "1",
|
||||
category: "DIGITAL_GOODS",
|
||||
unit_amount: amount,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
payment_source: {
|
||||
@@ -45,18 +66,34 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
landing_page: "LOGIN",
|
||||
shipping_preference: "NO_SHIPPING",
|
||||
user_action: "PAY_NOW",
|
||||
brand_name: "Encoach",
|
||||
},
|
||||
},
|
||||
},
|
||||
intent: "CAPTURE",
|
||||
},
|
||||
{
|
||||
};
|
||||
|
||||
const headers = {
|
||||
headers: {
|
||||
Authorization: `Bearer ${accessToken}`,
|
||||
'PayPal-Client-Metadata-Id': trackingId,
|
||||
},
|
||||
"PayPal-Client-Metadata-Id": trackingId,
|
||||
},
|
||||
};
|
||||
console.log(
|
||||
JSON.stringify({
|
||||
url,
|
||||
data,
|
||||
headers,
|
||||
})
|
||||
);
|
||||
|
||||
axios
|
||||
.post<OrderResponseBody>(url, data, headers)
|
||||
.then((request) => {
|
||||
res.status(request.status).json(request.data);
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err.response.status, err.response.data);
|
||||
res.status(err.response.status).json(err.response.data);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -25,29 +25,35 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
|
||||
const trackingId = `${req.session.user.id}-${Date.now()}`;
|
||||
|
||||
try {
|
||||
const request = await axios.put(
|
||||
`${process.env.PAYPAL_ACCESS_TOKEN_URL}/v1/risk/transaction-contexts/${process.env.PAYPAL_MERCHANT_ID}/${trackingId}`,
|
||||
{
|
||||
const url = `${process.env.PAYPAL_ACCESS_TOKEN_URL}/v1/risk/transaction-contexts/${process.env.PAYPAL_MERCHANT_ID}/${trackingId}`;
|
||||
const data = {
|
||||
additional_data: [
|
||||
{
|
||||
key: "user_id",
|
||||
value: req.session.user.id,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
};
|
||||
|
||||
const headers = {
|
||||
headers: {
|
||||
Authorization: `Bearer ${accessToken}`,
|
||||
},
|
||||
}
|
||||
);
|
||||
};
|
||||
console.log(JSON.stringify({
|
||||
url,
|
||||
data,
|
||||
headers,
|
||||
}));
|
||||
try {
|
||||
const request = await axios.put(url, data, headers);
|
||||
|
||||
return res.status(request.status).json({
|
||||
ok: true,
|
||||
trackingId,
|
||||
});
|
||||
} catch (err) {
|
||||
console.error(url, err);
|
||||
return res
|
||||
.status(500)
|
||||
.json({ ok: false, reason: "Failed to create tracking ID" });
|
||||
|
||||
@@ -19,6 +19,7 @@ async function sendVerification(req: NextApiRequest, res: NextApiResponse) {
|
||||
name: req.session.user.name,
|
||||
code: short.randomUUID(6),
|
||||
email: req.session.user.email,
|
||||
environment: process.env.ENVIRONMENT,
|
||||
},
|
||||
[req.session.user.email],
|
||||
"EnCoach Verification",
|
||||
|
||||
@@ -1,18 +1,12 @@
|
||||
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
|
||||
import type { NextApiRequest, NextApiResponse } from "next";
|
||||
import { app } from "@/firebase";
|
||||
import {
|
||||
getFirestore,
|
||||
getDoc,
|
||||
doc,
|
||||
deleteDoc,
|
||||
setDoc,
|
||||
} from "firebase/firestore";
|
||||
import { withIronSessionApiRoute } from "iron-session/next";
|
||||
import { sessionOptions } from "@/lib/session";
|
||||
import { Ticket, TicketTypeLabel, TicketStatusLabel } from "@/interfaces/ticket";
|
||||
import type {NextApiRequest, NextApiResponse} from "next";
|
||||
import {app} from "@/firebase";
|
||||
import {getFirestore, getDoc, doc, deleteDoc, setDoc} from "firebase/firestore";
|
||||
import {withIronSessionApiRoute} from "iron-session/next";
|
||||
import {sessionOptions} from "@/lib/session";
|
||||
import {Ticket, TicketTypeLabel, TicketStatusLabel} from "@/interfaces/ticket";
|
||||
import moment from "moment";
|
||||
import { sendEmail } from "@/email";
|
||||
import {sendEmail} from "@/email";
|
||||
|
||||
const db = getFirestore(app);
|
||||
|
||||
@@ -28,16 +22,16 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
|
||||
async function get(req: NextApiRequest, res: NextApiResponse) {
|
||||
if (!req.session.user) {
|
||||
res.status(401).json({ ok: false });
|
||||
res.status(401).json({ok: false});
|
||||
return;
|
||||
}
|
||||
|
||||
const { id } = req.query as { id: string };
|
||||
const {id} = req.query as {id: string};
|
||||
|
||||
const snapshot = await getDoc(doc(db, "tickets", id));
|
||||
|
||||
if (snapshot.exists()) {
|
||||
res.status(200).json({ ...snapshot.data(), id: snapshot.id });
|
||||
res.status(200).json({...snapshot.data(), id: snapshot.id});
|
||||
} else {
|
||||
res.status(404).json(undefined);
|
||||
}
|
||||
@@ -45,11 +39,11 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
|
||||
|
||||
async function del(req: NextApiRequest, res: NextApiResponse) {
|
||||
if (!req.session.user) {
|
||||
res.status(401).json({ ok: false });
|
||||
res.status(401).json({ok: false});
|
||||
return;
|
||||
}
|
||||
|
||||
const { id } = req.query as { id: string };
|
||||
const {id} = req.query as {id: string};
|
||||
|
||||
const snapshot = await getDoc(doc(db, "tickets", id));
|
||||
const data = snapshot.data() as Ticket;
|
||||
@@ -57,20 +51,20 @@ async function del(req: NextApiRequest, res: NextApiResponse) {
|
||||
const user = req.session.user;
|
||||
if (user.type === "admin" || user.type === "developer") {
|
||||
await deleteDoc(snapshot.ref);
|
||||
res.status(200).json({ ok: true });
|
||||
res.status(200).json({ok: true});
|
||||
return;
|
||||
}
|
||||
|
||||
res.status(403).json({ ok: false });
|
||||
res.status(403).json({ok: false});
|
||||
}
|
||||
|
||||
async function patch(req: NextApiRequest, res: NextApiResponse) {
|
||||
if (!req.session.user) {
|
||||
res.status(401).json({ ok: false });
|
||||
res.status(401).json({ok: false});
|
||||
return;
|
||||
}
|
||||
|
||||
const { id } = req.query as { id: string };
|
||||
const {id} = req.query as {id: string};
|
||||
const body = req.body as Ticket;
|
||||
|
||||
const snapshot = await getDoc(doc(db, "tickets", id));
|
||||
@@ -78,10 +72,10 @@ async function patch(req: NextApiRequest, res: NextApiResponse) {
|
||||
const user = req.session.user;
|
||||
if (user.type === "admin" || user.type === "developer") {
|
||||
const data = snapshot.data() as Ticket;
|
||||
await setDoc(snapshot.ref, body, { merge: true });
|
||||
await setDoc(snapshot.ref, body, {merge: true});
|
||||
try {
|
||||
// send email if the status actually changed to completed
|
||||
if(data.status !== req.body.status && req.body.status === 'completed') {
|
||||
if (data.status !== req.body.status && req.body.status === "completed") {
|
||||
await sendEmail(
|
||||
"ticketStatusCompleted",
|
||||
{
|
||||
@@ -92,18 +86,19 @@ async function patch(req: NextApiRequest, res: NextApiResponse) {
|
||||
type: TicketTypeLabel[body.type],
|
||||
reportedFrom: body.reportedFrom,
|
||||
description: body.description,
|
||||
environment: process.env.ENVIRONMENT,
|
||||
},
|
||||
[data.reporter.email],
|
||||
`Ticket ${id}: ${data.subject}`,
|
||||
);
|
||||
}
|
||||
} catch(err) {
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
// doesnt matter if the email fails
|
||||
}
|
||||
res.status(200).json({ ok: true });
|
||||
res.status(200).json({ok: true});
|
||||
return;
|
||||
}
|
||||
|
||||
res.status(403).json({ ok: false });
|
||||
res.status(403).json({ok: false});
|
||||
}
|
||||
|
||||
@@ -1,22 +1,14 @@
|
||||
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
|
||||
import { sendEmail } from "@/email";
|
||||
import { app } from "@/firebase";
|
||||
import { Ticket, TicketTypeLabel, TicketWithCorporate } from "@/interfaces/ticket";
|
||||
import { sessionOptions } from "@/lib/session";
|
||||
import {
|
||||
collection,
|
||||
doc,
|
||||
getDocs,
|
||||
getFirestore,
|
||||
setDoc,
|
||||
where,
|
||||
query,
|
||||
} from "firebase/firestore";
|
||||
import { withIronSessionApiRoute } from "iron-session/next";
|
||||
import {sendEmail} from "@/email";
|
||||
import {app} from "@/firebase";
|
||||
import {Ticket, TicketTypeLabel, TicketWithCorporate} from "@/interfaces/ticket";
|
||||
import {sessionOptions} from "@/lib/session";
|
||||
import {collection, doc, getDocs, getFirestore, setDoc, where, query} from "firebase/firestore";
|
||||
import {withIronSessionApiRoute} from "iron-session/next";
|
||||
import moment from "moment";
|
||||
import type { NextApiRequest, NextApiResponse } from "next";
|
||||
import type {NextApiRequest, NextApiResponse} from "next";
|
||||
import ShortUniqueId from "short-unique-id";
|
||||
import { Group, CorporateUser } from "@/interfaces/user";
|
||||
import {Group, CorporateUser} from "@/interfaces/user";
|
||||
|
||||
const db = getFirestore(app);
|
||||
|
||||
@@ -35,7 +27,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||
return;
|
||||
}
|
||||
if (!req.session.user) {
|
||||
res.status(401).json({ ok: false });
|
||||
res.status(401).json({ok: false});
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -68,7 +60,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
|
||||
const group = groups.find((g) => g.participants.includes(d.reporter.id));
|
||||
const admin = admins.find((a) => a.id === group?.admin) as CorporateUser;
|
||||
|
||||
if(admin) {
|
||||
if (admin) {
|
||||
return {
|
||||
...d,
|
||||
corporate: admin.corporateInformation?.companyInformation?.name,
|
||||
@@ -87,7 +79,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
||||
const shortUID = new ShortUniqueId();
|
||||
const id = body.id || shortUID.randomUUID(8);
|
||||
await setDoc(doc(db, "tickets", id), body);
|
||||
res.status(200).json({ ok: true });
|
||||
res.status(200).json({ok: true});
|
||||
|
||||
try {
|
||||
await sendEmail(
|
||||
@@ -100,9 +92,10 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
||||
type: TicketTypeLabel[body.type],
|
||||
reportedFrom: body.reportedFrom,
|
||||
description: body.description,
|
||||
environment: process.env.ENVIRONMENT,
|
||||
},
|
||||
[body.reporter.email],
|
||||
`Ticket ${id}: ${body.subject}`
|
||||
`Ticket ${id}: ${body.subject}`,
|
||||
);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
|
||||
Reference in New Issue
Block a user