Merge branch 'main' of https://github.com/UoaWDCC/auis-portal

UoaWDCC · Dec 12, 2024 · 94edd58 · 94edd58
2 parents 77a1aae + 1407b96
commit 94edd58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/api/index.ts b/api/index.ts
@@ -58,8 +58,8 @@ app.use(
       "Access-Control-Allow-Origin",
       "Access-Control-Allow-Headers",
       "Content-type",
+      "Authorization",
       "Origin",
-      "Access-Control-Allow-Origin",
       "Accept",
       "Options",
       "X-Requested-With",

diff --git a/web/src/api/apiRequests.ts b/web/src/api/apiRequests.ts
@@ -31,6 +31,18 @@ export const updateUserInfo = async (data: object): Promise<AxiosResponse> => {
   return response;
 };
 
+export const updateUserTicketInfo = async (
+  data: object
+): Promise<AxiosResponse> => {
+  const response = await axios.post("/api/user/user-ticket-info", data, {
+    headers: {
+      "Content-Type": "application/json",
+    },
+  });
+
+  return response;
+};
+
 // User membership expiry
 export const fetchUserMembershipExpiry =
   async (): Promise<MembershipExpiryDate> => {

diff --git a/web/src/components/forms/CheckoutInformation.tsx b/web/src/components/forms/CheckoutInformation.tsx
@@ -1,4 +1,3 @@
-import axios from "axios";
 import { QuestionAnswer, TicketAndQuestion } from "../../types/types";
 import { useEffect, useState } from "react";
 import { useQuery } from "@apollo/client";
@@ -7,6 +6,7 @@ import { Mapper } from "@utils/Mapper";
 import LoadingSpinner from "@components/navigation/LoadingSpinner";
 import { useNavigate } from "react-router";
 import CheckoutInformationForm from "./CheckoutInformationForm";
+import { updateUserTicketInfo } from "../../api/apiRequests";
 
 interface CheckoutInformationProps {
   ticketId: number;
@@ -68,11 +68,7 @@ export default function CheckoutInformation({
   // Submit ticket information to backend
   const onSubmit = async (data: any) => {
     try {
-      const response = await axios.post("/api/user/user-ticket-info", data, {
-        headers: {
-          "Content-Type": "application/json",
-        },
-      });
+      const response = await updateUserTicketInfo(data);
       if (response.status === 200) {
         // Form Submission Successful
         setSubmitLoading(false);