Merge pull request #52 from anaswaratrajan/markChoices

Refactor serverAPI interface

src/api/server.ts

@@ -13,30 +13,19 @@ class ServerAPI {
 
     this.URL = process.env.NEXT_PUBLIC_SERVER_URL;
     this.domain = process.env.NEXT_PUBLIC_ORIGIN_DOMAIN;
+    this.headers = {
+      "Content-Type": "application/json"
+    }
   }
 
   httpMethod = async (
     endpoint: string,
-    reqMethod: string,
-    token = "",
-    payload = ""
+    requestOptions: RequestInit,
   ): Promise<HttpResponse> => {
-    this.headers = {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${token}`,
-    };
-    const requestOptions: RequestInit = {
-      mode: "cors",
-      credentials: "include",
-      method: reqMethod,
-      headers: this.headers,
-    };
-    if (reqMethod !== "GET") {
-      requestOptions.body = payload;
-    }
     const res = await fetch(endpoint, requestOptions);
     const { status } = res;
     const responseData = await res.json();
+    console.log(res)
     return {
       data: responseData,
       statusCode: status,
@@ -47,7 +36,11 @@ class ServerAPI {
     pollid: string | string[] | null | undefined
   ): Promise<HttpResponse> => {
     const endpoint = `${this.URL}/poll/${pollid}`;
-    return this.httpMethod(endpoint, "GET");
+    const requestOptions: RequestInit = {
+      method: "GET",
+      headers: this.headers,
+    };
+    return this.httpMethod(endpoint, requestOptions);
   };
 
   getPolls = (pollArgs: {
@@ -56,27 +49,47 @@ class ServerAPI {
   }): Promise<HttpResponse> => {
     const { userID, token } = pollArgs;
     const endpoint = `${this.URL}/user/${userID}`;
-    return this.httpMethod(endpoint, "GET", token);
+    this.headers = {
+      Authorization: `Bearer ${token}`,
+    };
+    const requestOptions: RequestInit = {
+      credentials: "include",
+      method: "GET",
+      headers: this.headers,
+    };
+    return this.httpMethod(endpoint, requestOptions);
   };
 
   createPoll = (pollArgs: {
     poll: RocketMeetPoll;
     token: string;
   }): Promise<HttpResponse> => {
     const { poll, token } = pollArgs;
-    const payload = JSON.stringify(poll);
     const endpoint = `${this.URL}/user/poll`;
-    return this.httpMethod(endpoint, "POST", token, payload);
+    this.headers = {
+      Authorization: `Bearer ${token}`,
+    };
+    const requestOptions: RequestInit = {
+      credentials: "include",
+      method: "POST",
+      headers: this.headers,
+      body: JSON.stringify(poll),
+    };
+    return this.httpMethod(endpoint, requestOptions);
   };
 
   markChoices = (voteArgs: {
     newVote: Vote;
     pollid: string;
   }): Promise<HttpResponse> => {
     const { newVote, pollid } = voteArgs;
-    const payload = JSON.stringify(newVote);
     const endpoint = `${this.URL}/poll/${pollid}`;
-    return this.httpMethod(endpoint, "PUT", payload);
+    const requestOptions: RequestInit = {
+      method: "PUT",
+      headers: this.headers,
+      body: JSON.stringify(newVote)
+    };
+    return this.httpMethod(endpoint, requestOptions);
   };
 
   markFinalChoice = (voteArgs: {
@@ -85,9 +98,18 @@ class ServerAPI {
     token: string;
   }): Promise<HttpResponse> => {
     const { finalChoice, pollid, token } = voteArgs;
-    const payload = JSON.stringify(finalChoice);
     const endpoint = `${this.URL}/user/poll/${pollid}`;
-    return this.httpMethod(endpoint, "PUT", token, payload);
+    this.headers = {
+      Authorization: `Bearer ${token}`,
+    };
+    const requestOptions: RequestInit = {
+      credentials: "include",
+      method: "PUT",
+      headers: this.headers,
+      body: JSON.stringify(finalChoice)
+    };
+    console.log(requestOptions)
+    return this.httpMethod(endpoint, requestOptions);
   };
 }
 

src/utils/privateAuth.tsx

@@ -30,7 +30,7 @@ const privateAuthWrapper = (Component: NextPage) => {
         if (user) {
           user.getIdToken(true)
             .then((token) => {
-              // console.log(token)
+              console.log(token)
               dispatch(
                 login({ displayName: user.displayName, username: user.email, token })
               );