From 98bcab5b811b4a903f60e48e023d740459351af6 Mon Sep 17 00:00:00 2001
From: John Wu <76966357+jwu-fisker@users.noreply.github.com>
Date: Wed, 3 Feb 2021 08:35:06 -0800
Subject: [PATCH] Fix link json again (#12)

Use id token instead of access token
---
 src/components/App/App.test.js                       | 2 +-
 src/components/Contexts/FileUploadContext.jsx        | 2 +-
 src/components/Contexts/UserContext.jsx              | 4 ++--
 src/components/Contexts/UserContext.test.jsx         | 2 +-
 src/components/FileUploadForm/FileUploadForm.test.js | 2 +-
 src/components/FileUploadForm/index.jsx              | 2 +-
 src/services/__mocks__/uploadFile.js                 | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js
index d741738..628b509 100644
--- a/src/components/App/App.test.js
+++ b/src/components/App/App.test.js
@@ -5,7 +5,7 @@ import { render, screen, cleanup, waitForElementToBeRemoved, waitFor } from "@te
 import { setToken } from "../Contexts/UserContext";
 import App from ".";
 
-const TEST_TOKEN = { accessToken: { jwtToken: "TEST" }};
+const TEST_TOKEN = { idToken: { jwtToken: "TEST" }};
 const LOADING_STATUS = "Loading...";
 
 const renderRoute = async (route) => {
diff --git a/src/components/Contexts/FileUploadContext.jsx b/src/components/Contexts/FileUploadContext.jsx
index f75e0af..74739bc 100644
--- a/src/components/Contexts/FileUploadContext.jsx
+++ b/src/components/Contexts/FileUploadContext.jsx
@@ -39,7 +39,7 @@ export const FileUploadProvider = ({ children }) => {
       
       const { data } = await uploadFile(file, accessToken, setProgress, cancelUpload);
       if (data.message) throw new Error(`${data.error}. ${data.message}`);
-      const url = ((data && data.link && data.link.link) ? data.link.link : "No URL available");
+      const url = ((data && data.link) ? data.link : "No URL available");
       setLinkURL(url);
       setStatus(`Uploaded ${filename}`);
       setCancelUpload(null);
diff --git a/src/components/Contexts/UserContext.jsx b/src/components/Contexts/UserContext.jsx
index af42fa3..36ece1b 100644
--- a/src/components/Contexts/UserContext.jsx
+++ b/src/components/Contexts/UserContext.jsx
@@ -12,7 +12,7 @@ export const UserProvider = ({ children }) => {
     if (!localStorage) return;
     const token = JSON.parse(localStorage.getItem("token"));
     if (!token) return;
-    const { accessToken: { jwtToken }} = token;
+    const { idToken: { jwtToken }} = token;
     const verifyToken = async (accessToken) => {
       const result = await auth.verify(accessToken);
       if (result.authenticated) {
@@ -100,7 +100,7 @@ export const UserProvider = ({ children }) => {
 
   const signedIn = (token) => {
     setToken(token);
-    if (!localStorage || !token || !token.accessToken) return;
+    if (!localStorage || !token || !token.idToken) return;
     localStorage.setItem("token", JSON.stringify(token));
   }
 
diff --git a/src/components/Contexts/UserContext.test.jsx b/src/components/Contexts/UserContext.test.jsx
index c46bf60..ef1a547 100644
--- a/src/components/Contexts/UserContext.test.jsx
+++ b/src/components/Contexts/UserContext.test.jsx
@@ -4,7 +4,7 @@ import {render, cleanup, screen, fireEvent, waitFor} from "@testing-library/reac
 import { UserProvider, useUserContext }  from "../Contexts/UserContext";
 import auth from "../../services/auth";
 
-const TEST_TOKEN = { accessToken: { jwtToken: "TEST" }};
+const TEST_TOKEN = { idToken: { jwtToken: "TEST" }};
 
 describe("UseContext", () => {
   
diff --git a/src/components/FileUploadForm/FileUploadForm.test.js b/src/components/FileUploadForm/FileUploadForm.test.js
index 6804a61..498a34c 100644
--- a/src/components/FileUploadForm/FileUploadForm.test.js
+++ b/src/components/FileUploadForm/FileUploadForm.test.js
@@ -9,7 +9,7 @@ import { setToken } from "../Contexts/UserContext";
 describe("File Upload Form", () => {
 
   it("Should render", () => {
-    setToken({ accessToken: { jwtToken: "TEST" } });
+    setToken({ idToken: { jwtToken: "TEST" } });
     const { container } = render(<BrowserRouter><FileUploadForm /></BrowserRouter>);
     expect(container).toMatchSnapshot();
     cleanup();
diff --git a/src/components/FileUploadForm/index.jsx b/src/components/FileUploadForm/index.jsx
index d577c41..0e7eabb 100644
--- a/src/components/FileUploadForm/index.jsx
+++ b/src/components/FileUploadForm/index.jsx
@@ -8,7 +8,7 @@ import useStyles from "../Styles";
 
 const FileUploadZone = ({ classes, token }) => {
   const { upload } = useFileUploadContext();
-  const { token: { accessToken: { jwtToken : authToken } } } = useUserContext();
+  const { token: { idToken: { jwtToken : authToken } } } = useUserContext();
 
   return (
     <form className={classes.form} noValidate>
diff --git a/src/services/__mocks__/uploadFile.js b/src/services/__mocks__/uploadFile.js
index f501c51..4443a17 100644
--- a/src/services/__mocks__/uploadFile.js
+++ b/src/services/__mocks__/uploadFile.js
@@ -1,6 +1,6 @@
 import delay from "../../utils/delay";
 
-let uploadFileResponse = { data: { link: { link: "CLOUDFRONT_URL" } } };
+let uploadFileResponse = { data: { link: "CLOUDFRONT_URL" } };
 let uploadFileDelay = false;
 let issuedCancelToken = null;