admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix link json again (#12)

Browse Source 
Use id token instead of access token
This commit is contained in:
John Wu
2021-02-03 08:35:06 -08:00
committed by GitHub
parent 42870e10c2
commit 98bcab5b81
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/App/App.test.js
View File

@@ -5,7 +5,7 @@ import { render, screen, cleanup, waitForElementToBeRemoved, waitFor } from "@te
import { setToken } from "../Contexts/UserContext"; import { setToken } from "../Contexts/UserContext";
import App from "."; import App from ".";
const TEST_TOKEN = { accessToken: { jwtToken: "TEST" }}; const TEST_TOKEN = { idToken: { jwtToken: "TEST" }};
const LOADING_STATUS = "Loading..."; const LOADING_STATUS = "Loading...";
const renderRoute = async (route) => { const renderRoute = async (route) => {

2
src/components/Contexts/FileUploadContext.jsx
View File

@@ -39,7 +39,7 @@ export const FileUploadProvider = ({ children }) => {
const { data } = await uploadFile(file, accessToken, setProgress, cancelUpload); const { data } = await uploadFile(file, accessToken, setProgress, cancelUpload);
if (data.message) throw new Error(`${data.error}. ${data.message}`); 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); setLinkURL(url);
setStatus(`Uploaded ${filename}`); setStatus(`Uploaded ${filename}`);
setCancelUpload(null); setCancelUpload(null);

4
src/components/Contexts/UserContext.jsx
View File

@@ -12,7 +12,7 @@ export const UserProvider = ({ children }) => {
if (!localStorage) return; if (!localStorage) return;
const token = JSON.parse(localStorage.getItem("token")); const token = JSON.parse(localStorage.getItem("token"));
if (!token) return; if (!token) return;
const { accessToken: { jwtToken }} = token; const { idToken: { jwtToken }} = token;
const verifyToken = async (accessToken) => { const verifyToken = async (accessToken) => {
const result = await auth.verify(accessToken); const result = await auth.verify(accessToken);
if (result.authenticated) { if (result.authenticated) {
@@ -100,7 +100,7 @@ export const UserProvider = ({ children }) => {
const signedIn = (token) => { const signedIn = (token) => {
setToken(token); setToken(token);
if (!localStorage || !token || !token.accessToken) return; if (!localStorage || !token || !token.idToken) return;
localStorage.setItem("token", JSON.stringify(token)); localStorage.setItem("token", JSON.stringify(token));
} }

2
src/components/Contexts/UserContext.test.jsx
View File

@@ -4,7 +4,7 @@ import {render, cleanup, screen, fireEvent, waitFor} from "@testing-library/reac
import { UserProvider, useUserContext } from "../Contexts/UserContext"; import { UserProvider, useUserContext } from "../Contexts/UserContext";
import auth from "../../services/auth"; import auth from "../../services/auth";
const TEST_TOKEN = { accessToken: { jwtToken: "TEST" }}; const TEST_TOKEN = { idToken: { jwtToken: "TEST" }};
describe("UseContext", () => { describe("UseContext", () => {

2
src/components/FileUploadForm/FileUploadForm.test.js
View File

@@ -9,7 +9,7 @@ import { setToken } from "../Contexts/UserContext";
describe("File Upload Form", () => { describe("File Upload Form", () => {
it("Should render", () => { it("Should render", () => {
setToken({ accessToken: { jwtToken: "TEST" } }); setToken({ idToken: { jwtToken: "TEST" } });
const { container } = render(<BrowserRouter><FileUploadForm /></BrowserRouter>); const { container } = render(<BrowserRouter><FileUploadForm /></BrowserRouter>);
expect(container).toMatchSnapshot(); expect(container).toMatchSnapshot();
cleanup(); cleanup();

2
src/components/FileUploadForm/index.jsx
View File

@@ -8,7 +8,7 @@ import useStyles from "../Styles";
const FileUploadZone = ({ classes, token }) => { const FileUploadZone = ({ classes, token }) => {
const { upload } = useFileUploadContext(); const { upload } = useFileUploadContext();
const { token: { accessToken: { jwtToken : authToken } } } = useUserContext(); const { token: { idToken: { jwtToken : authToken } } } = useUserContext();
return ( return (
<form className={classes.form} noValidate> <form className={classes.form} noValidate>

2
src/services/__mocks__/uploadFile.js
View File

@@ -1,6 +1,6 @@
import delay from "../../utils/delay"; import delay from "../../utils/delay";
let uploadFileResponse = { data: { link: { link: "CLOUDFRONT_URL" } } }; let uploadFileResponse = { data: { link: "CLOUDFRONT_URL" } };
let uploadFileDelay = false; let uploadFileDelay = false;
let issuedCancelToken = null; let issuedCancelToken = null;