diff --git a/.env.cec-prd b/.env.cec-prd index b290f2f..956480c 100644 --- a/.env.cec-prd +++ b/.env.cec-prd @@ -1,7 +1,9 @@ +REACT_APP_AUTH_CALLBACK_URL=https://ota-admin.cec-prd.fiskerinc.com REACT_APP_AUTH_SERVICE_URL=https://gw.cec-prd.fiskerinc.com/compute_auth REACT_APP_CERT_SERVICE_URL=https://gw.cec-prd.fiskerinc.com/certificate -REACT_APP_UPLOAD_SERVICE_URL=https://gw.cec-prd.fiskerinc.com/ota_update -REACT_APP_AUTH_CALLBACK_URL=https://ota-admin.cec-prd.fiskerinc.com -REACT_APP_SUPERSET_URL=https://superset.cec-prd.fiskerinc.com REACT_APP_MAGNA_PROVIDER=Magna REACT_APP_MAGNA_GROUP_ID=68273225-9da4-4fa7-aea5-38e16ec471fe +REACT_APP_OTA_SERVICE_URL=https://gw.cec-prd.fiskerinc.com/ota_update +REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll +REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll +REACT_APP_SUPERSET_URL=https://superset.cec-prd.fiskerinc.com diff --git a/.env.dev b/.env.dev index f3731e4..84cee69 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,9 @@ -REACT_APP_CERT_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/certificate -REACT_APP_AUTH_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/compute_auth -REACT_APP_UPLOAD_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://dev-ota-admin.cloud.fiskerinc.com -REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com +REACT_APP_AUTH_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/compute_auth +REACT_APP_CERT_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/certificate REACT_APP_MAGNA_PROVIDER=Fisker-QA REACT_APP_MAGNA_GROUP_ID=efcc3025-e2d8-4212-8227-805c7be39d2c +REACT_APP_OTA_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/ota_update +REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll +REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll +REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com diff --git a/.env.local b/.env.local index 3a54e33..b51db82 100644 --- a/.env.local +++ b/.env.local @@ -1,7 +1,9 @@ +REACT_APP_AUTH_CALLBACK_URL=http://localhost:3000 REACT_APP_AUTH_SERVICE_URL=http://localhost/compute_auth REACT_APP_CERT_SERVICE_URL=http://localhost/certificate -REACT_APP_UPLOAD_SERVICE_URL=http://localhost/ota_update -REACT_APP_AUTH_CALLBACK_URL=http://localhost:3000 -REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com REACT_APP_MAGNA_PROVIDER=Fisker-QA -REACT_APP_MAGNA_GROUP_ID=efcc3025-e2d8-4212-8227-805c7be39d2c \ No newline at end of file +REACT_APP_MAGNA_GROUP_ID=efcc3025-e2d8-4212-8227-805c7be39d2c +REACT_APP_OTA_SERVICE_URL=http://localhost/ota_update +REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll +REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll +REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com diff --git a/.env.prd b/.env.prd index a818e1d..793c11b 100644 --- a/.env.prd +++ b/.env.prd @@ -1,7 +1,9 @@ +REACT_APP_AUTH_CALLBACK_URL=https://ota-admin.cloud.fiskerinc.com REACT_APP_AUTH_SERVICE_URL=https://gw.cloud.fiskerinc.com/compute_auth REACT_APP_CERT_SERVICE_URL=https://gw.cloud.fiskerinc.com/certificate -REACT_APP_UPLOAD_SERVICE_URL=https://gw.cloud.fiskerinc.com/ota_update -REACT_APP_AUTH_CALLBACK_URL=https://ota-admin.cloud.fiskerinc.com -REACT_APP_SUPERSET_URL=https://superset.cloud.fiskerinc.com REACT_APP_MAGNA_PROVIDER=Magna REACT_APP_MAGNA_GROUP_ID=68273225-9da4-4fa7-aea5-38e16ec471fe +REACT_APP_OTA_SERVICE_URL=https://gw.cloud.fiskerinc.com/ota_update +REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll +REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll +REACT_APP_SUPERSET_URL=https://superset.cloud.fiskerinc.com diff --git a/.env.stg b/.env.stg index 97ac1a5..ba137f8 100644 --- a/.env.stg +++ b/.env.stg @@ -1,7 +1,9 @@ +REACT_APP_AUTH_CALLBACK_URL=https://stg-ota-admin.cloud.fiskerinc.com REACT_APP_AUTH_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/compute_auth REACT_APP_CERT_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/certificate -REACT_APP_UPLOAD_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/ota_update -REACT_APP_AUTH_CALLBACK_URL=https://stg-ota-admin.cloud.fiskerinc.com -REACT_APP_SUPERSET_URL=https://stg-superset.cloud.fiskerinc.com REACT_APP_MAGNA_PROVIDER=Magna REACT_APP_MAGNA_GROUP_ID=68273225-9da4-4fa7-aea5-38e16ec471fe +REACT_APP_OTA_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/ota_update +REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll +REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll +REACT_APP_SUPERSET_URL=https://stg-superset.cloud.fiskerinc.com diff --git a/.env.template b/.env.template index 362d6d9..d20768a 100644 --- a/.env.template +++ b/.env.template @@ -1,7 +1,9 @@ -REACT_APP_AUTH_SERVICE_URL=http://localhost/compute_auth -REACT_APP_UPLOAD_SERVICE_URL=http://localhost/ota_update REACT_APP_AUTH_CALLBACK_URL=http://localhost:3000 -REACT_APP_SUPERSET_URL=https://dev-superset.cloud.fiskerinc.com +REACT_APP_AUTH_SERVICE_URL=http://localhost/compute_auth REACT_APP_CERT_SERVICE_URL=http://localhost/certificate REACT_APP_MAGNA_PROVIDER=Magna REACT_APP_MAGNA_GROUP_ID=68273225-9da4-4fa7-aea5-38e16ec471fe +REACT_APP_OTA_SERVICE_URL=http://localhost/ota_update +REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll +REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll +REACT_APP_SUPERSET_URL=https://dev-superset.cloud.fiskerinc.com diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js index 3346d96..0eab94a 100644 --- a/src/components/App/App.test.js +++ b/src/components/App/App.test.js @@ -8,17 +8,14 @@ jest.mock("../../services/vehiclesAPI"); jest.mock("../../services/superset") import { - act, - render, - screen, - cleanup, - waitFor, - waitForElementToBeRemoved, + act, cleanup, render, + screen, waitFor, + waitForElementToBeRemoved } from "@testing-library/react"; -import { setToken } from "../Contexts/UserContext"; -import {TEST_AUTH_OBJECT, TEST_AUTH_OBJECT_FISKER} from "../../utils/testing"; import App from "."; import addSnapshotSerializer from "../../utils/snapshot"; +import { TEST_AUTH_OBJECT_FISKER, TEST_AUTH_OBJECT_MAGNA } from "../../utils/testing"; +import { setToken } from "../Contexts/UserContext"; const LOADING_STATUS = "Loading..."; @@ -113,9 +110,14 @@ describe("App", () => { await check("/tools/sms/send", "span.MuiButton-label", "Sign In"); }); + it("Route /tools/security-dll unauthenticated", async () => { + await check("/tools/security-dll", "span.MuiButton-label", "Sign In"); + }); + it("Route /page-not-found unauthenticated", async () => { await check("/page-not-found", "h1", "Page Not Found"); }); + it("Route / authenticated", async () => { setToken(TEST_AUTH_OBJECT_FISKER); await sleepAndCheck("/", "h6", "Home"); @@ -170,4 +172,9 @@ describe("App", () => { setToken(TEST_AUTH_OBJECT_FISKER); await sleepAndCheck("/tools/sms/send", "h6", "Send SMS"); }); + + it("Route /tools/security-dll authenticated", async () => { + setToken(TEST_AUTH_OBJECT_MAGNA); + await sleepAndCheck("/tools/security-dll", "h6", "Security.dll Download"); + }); }); diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap index c93bf07..813de41 100644 --- a/src/components/App/__snapshots__/App.test.js.snap +++ b/src/components/App/__snapshots__/App.test.js.snap @@ -5233,6 +5233,362 @@ exports[`App Route /tools/certificates/add unauthenticated 1`] = ` `; +exports[`App Route /tools/security-dll authenticated 1`] = ` +
+
+
+
+
+
+
+ Security.dll Download +
+ +
+
+ +
+
+
+ +
+
+
+

+ Generating certificates... +

+
+
+
+
+
+`; + +exports[`App Route /tools/security-dll unauthenticated 1`] = ` +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + Sign In + + + +

+ + Note: Your email address will be used as the user id + +

+
+
+
+
+
+
+`; + exports[`App Route /tools/sms/send authenticated 1`] = `
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-