Merge branch 'main' into develop

src/components/PaymobPayment.tsx

@@ -20,6 +20,7 @@ interface Props {
 
 export default function PaymobPayment({user, price, setIsPaymentLoading, currency, duration, duration_unit, onSuccess}: Props) {
 	const [isLoading, setIsLoading] = useState(false);
+	console.log(user.id);
 
 	const router = useRouter();
 

src/pages/(status)/PaymentDue.tsx

@@ -19,11 +19,10 @@ import moment from "moment";
 interface Props {
 	user: User;
 	hasExpired?: boolean;
-	clientID: string;
 	reload: () => void;
 }
 
-export default function PaymentDue({user, hasExpired = false, clientID, reload}: Props) {
+export default function PaymentDue({user, hasExpired = false, reload}: Props) {
 	const [isLoading, setIsLoading] = useState(false);
 	const [appliedDiscount, setAppliedDiscount] = useState(0);
 
@@ -137,7 +136,6 @@ export default function PaymentDue({user, hasExpired = false, clientID, reload}:
 													</div>
 												)}
 												<PaymobPayment
-													key={clientID}
 													user={user}
 													setIsPaymentLoading={setIsLoading}
 													onSuccess={() => {
@@ -177,7 +175,6 @@ export default function PaymentDue({user, hasExpired = false, clientID, reload}:
 											{user.corporateInformation.payment.value} {user.corporateInformation.payment.currency}
 										</span>
 										<PaymobPayment
-											key={clientID}
 											user={user}
 											setIsPaymentLoading={setIsLoading}
 											currency={user.corporateInformation.payment.currency}

src/pages/api/paymob/index.ts

@@ -41,7 +41,12 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 
 	const response = await axios.post<IntentionResult>(
 		"https://oman.paymob.com/v1/intention/",
-		{...intention, payment_methods: [parseInt(process.env.PAYMOB_INTEGRATION_ID || "0")], items: []},
+		{
+			...intention,
+			payment_methods: [parseInt(process.env.PAYMOB_INTEGRATION_ID || "0")],
+			items: [],
+			extras: {...intention.extras, userID: req.session.user!.id},
+		} as PaymentIntention,
 		{headers: {Authorization: `Token ${process.env.PAYMOB_SECRET_KEY}`}},
 	);
 	const intentionResult = response.data;

src/pages/api/paymob/webhook.ts

@@ -22,8 +22,9 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 	const transactionResult = req.body as TransactionResult;
 	const authToken = await authenticatePaymob();
 
+	console.log("WEBHOOK: ", transactionResult);
 	if (!checkTransaction(authToken, transactionResult.transaction.order.id)) return res.status(404).json({ok: false});
-	if (!transactionResult.transaction.success) return res.status(200).json({ok: false});
+	if (!transactionResult.transaction.success) return res.status(400).json({ok: false});
 
 	const {userID, duration, duration_unit} = transactionResult.intention.extras.creation_extras as {
 		userID: string;
@@ -42,9 +43,9 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 
 	const initialDate = moment(subscriptionExpirationDate).isAfter(moment()) ? moment(subscriptionExpirationDate) : moment();
 
-	const updatedSubscriptionExpirationDate = moment(initialDate).add(duration, duration_unit).toISOString();
+	const updatedSubscriptionExpirationDate = moment(initialDate).add(duration, duration_unit).endOf("day").subtract(2, "hours").toISOString();
 
-	await setDoc(userSnapshot.ref, {subscriptionExpirationDate: updatedSubscriptionExpirationDate}, {merge: true});
+	await setDoc(userSnapshot.ref, {subscriptionExpirationDate: updatedSubscriptionExpirationDate, status: "active"}, {merge: true});
 	await setDoc(doc(db, "paypalpayments", v4()), {
 		createdAt: new Date().toISOString(),
 		currency: transactionResult.transaction.currency,
@@ -64,10 +65,16 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 		const participants = (await Promise.all(
 			groups.flatMap((x) => x.participants).map(async (x) => ({...(await getDoc(doc(db, "users", x))).data(), id: x})),
 		)) as User[];
-		const sameExpiryDateParticipants = participants.filter((x) => x.subscriptionExpirationDate === subscriptionExpirationDate);
+		const sameExpiryDateParticipants = participants.filter(
+			(x) => x.subscriptionExpirationDate === subscriptionExpirationDate && x.status !== "disabled",
+		);
 
 		for (const participant of sameExpiryDateParticipants) {
-			await setDoc(doc(db, "users", participant.id), {subscriptionExpirationDate: updatedSubscriptionExpirationDate}, {merge: true});
+			await setDoc(
+				doc(db, "users", participant.id),
+				{subscriptionExpirationDate: updatedSubscriptionExpirationDate, status: "active"},
+				{merge: true},
+			);
 		}
 	}
 

src/pages/index.tsx

@@ -49,7 +49,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			redirect: {
 				destination: "/login",
 				permanent: false,
-			}
+			},
 		};
 	}
 
@@ -112,15 +112,7 @@ export default function Home(props: Props) {
 						</div>
 					</Layout>
 				)}
-				{(user.status === "paymentDue" || checkIfUserExpired()) && (
-					<PaymentDue
-						key={envVariables["NEXT_PUBLIC_PAYPAL_CLIENT_ID"]}
-						hasExpired
-						user={user}
-						reload={router.reload}
-						clientID={envVariables["NEXT_PUBLIC_PAYPAL_CLIENT_ID"] || ""}
-					/>
-				)}
+				{(user.status === "paymentDue" || checkIfUserExpired()) && <PaymentDue hasExpired user={user} reload={router.reload} />}
 			</>
 		);
 	}

src/pages/payment.tsx

@@ -21,7 +21,7 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 			redirect: {
 				destination: "/login",
 				permanent: false,
-			}
+			},
 		};
 	}
 
@@ -30,11 +30,7 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 	};
 }, sessionOptions);
 
-export default function Home({
-  envVariables,
-}: {
-  envVariables: { [key: string]: string };
-}) {
+export default function Home({envVariables}: {envVariables: {[key: string]: string}}) {
 	const {user} = useUser({redirectTo: "/login"});
 	const router = useRouter();
 
@@ -49,14 +45,7 @@ export default function Home({
 				<meta name="viewport" content="width=device-width, initial-scale=1" />
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
-      {user && (
-        <PaymentDue
-          key={envVariables["NEXT_PUBLIC_PAYPAL_CLIENT_ID"]}
-          clientID={envVariables["NEXT_PUBLIC_PAYPAL_CLIENT_ID"] || ""}
-          user={user}
-          reload={router.reload}
-        />
-      )}
+			{user && <PaymentDue user={user} reload={router.reload} />}
 		</>
 	);
 }