fix(auth-0): return to use react prefix/ fix import inLoginForm

amplication · Sep 11, 2024 · 2178fb1 · 2178fb1
1 parent 0815fe4
commit 2178fb1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/auth-auth0/package.json b/plugins/auth-auth0/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplication/plugin-auth-auth0",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Auth0 plugin for Amplication",
   "main": "dist/index.js",
   "scripts": {

diff --git a/plugins/auth-auth0/src/events/createAdminDotEnv.ts b/plugins/auth-auth0/src/events/createAdminDotEnv.ts
@@ -52,12 +52,12 @@ export const beforeCreateAdminDotEnv = async (
 
   const envVariables = {
     // Auth0
-    VITE_REACT_APP_AUTH0_DOMAIN: domain,
-    VITE_REACT_APP_AUTH0_CLIENT_ID: clientID,
-    VITE_REACT_APP_AUTH0_AUDIENCE: audience,
-    VITE_REACT_APP_AUTH0_REDIRECT_URI: "http://localhost:3001/auth-callback",
-    VITE_REACT_APP_AUTH0_LOGOUT_REDIRECT_URI: "http://localhost:3001/login",
-    VITE_REACT_APP_AUTH0_SCOPE: "openid profile email",
+    REACT_APP_AUTH0_DOMAIN: domain,
+    REACT_APP_AUTH0_CLIENT_ID: clientID,
+    REACT_APP_AUTH0_AUDIENCE: audience,
+    REACT_APP_AUTH0_REDIRECT_URI: "http://localhost:3001/auth-callback",
+    REACT_APP_AUTH0_LOGOUT_REDIRECT_URI: "http://localhost:3001/login",
+    REACT_APP_AUTH0_SCOPE: "openid profile email",
   };
 
   eventParams.envVariables = eventParams.envVariables.concat(

diff --git a/plugins/auth-auth0/src/static/client/LoginForm.tsx b/plugins/auth-auth0/src/static/client/LoginForm.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { useLogin, useNotify } from "react-admin";
-import { Button } from "@mui/material";
+import { Button } from "@material-ui/core";
 
 const LoginForm = ({ theme }: any) => {
   const login = useLogin();

diff --git a/plugins/auth-auth0/src/static/client/auth-provider/ra-auth-auth0.ts b/plugins/auth-auth0/src/static/client/auth-provider/ra-auth-auth0.ts
@@ -4,11 +4,11 @@ import { AuthProvider, UserIdentity } from "react-admin";
 export const PreviousLocationStorageKey = "@react-admin/nextPathname";
 
 export const client = new Auth0Client({
-  domain: process.env.VITE_REACT_APP_AUTH0_DOMAIN || "",
-  clientId: process.env.VITE_REACT_APP_AUTH0_CLIENT_ID || "",
+  domain: process.env.REACT_APP_AUTH0_DOMAIN || "",
+  clientId: process.env.REACT_APP_AUTH0_CLIENT_ID || "",
   cacheLocation: "localstorage",
   authorizationParams: {
-    audience: process.env.VITE_REACT_APP_AUTH0_AUDIENCE,
+    audience: process.env.REACT_APP_AUTH0_AUDIENCE,
     scope: "openid profile email",
   },
   useRefreshTokens: true,
@@ -18,7 +18,7 @@ export const auth0AuthProvider: AuthProvider = {
   login: async () => {
     await client.loginWithPopup({
       authorizationParams: {
-        redirect_uri: process.env.VITE_REACT_APP_AUTH0_REDIRECT_URI,
+        redirect_uri: process.env.REACT_APP_AUTH0_REDIRECT_URI,
       },
     });
 
@@ -28,7 +28,7 @@ export const auth0AuthProvider: AuthProvider = {
   logout: async () => {
     await client.logout({
       logoutParams: {
-        returnTo: process.env.VITE_REACT_APP_AUTH0_LOGOUT_REDIRECT_URI,
+        returnTo: process.env.REACT_APP_AUTH0_LOGOUT_REDIRECT_URI,
       },
     });
 

diff --git a/plugins/auth-auth0/src/tests/createAdminDotEnv.spec.ts b/plugins/auth-auth0/src/tests/createAdminDotEnv.spec.ts
@@ -26,17 +26,16 @@ describe("Testing beforeCreateAdminDotEnv hook", () => {
     eventParams = await beforeCreateAdminDotEnv(context, eventParams);
 
     const expectedEnvVariables = [
-      { VITE_REACT_APP_AUTH0_DOMAIN: "AUTH0_DOMAIN" },
-      { VITE_REACT_APP_AUTH0_CLIENT_ID: "AUTH0_CLIENT_ID" },
-      { VITE_REACT_APP_AUTH0_AUDIENCE: "AUTH0_AUDIENCE" },
+      { REACT_APP_AUTH0_DOMAIN: "AUTH0_DOMAIN" },
+      { REACT_APP_AUTH0_CLIENT_ID: "AUTH0_CLIENT_ID" },
+      { REACT_APP_AUTH0_AUDIENCE: "AUTH0_AUDIENCE" },
       {
-        VITE_REACT_APP_AUTH0_REDIRECT_URI:
-          "http://localhost:3001/auth-callback",
+        REACT_APP_AUTH0_REDIRECT_URI: "http://localhost:3001/auth-callback",
       },
       {
-        VITE_REACT_APP_AUTH0_LOGOUT_REDIRECT_URI: "http://localhost:3001/login",
+        REACT_APP_AUTH0_LOGOUT_REDIRECT_URI: "http://localhost:3001/login",
       },
-      { VITE_REACT_APP_AUTH0_SCOPE: "openid profile email" },
+      { REACT_APP_AUTH0_SCOPE: "openid profile email" },
     ];
 
     expect(eventParams.envVariables).toEqual(expectedEnvVariables);
@@ -52,17 +51,16 @@ describe("Testing beforeCreateAdminDotEnv hook", () => {
     eventParams = await beforeCreateAdminDotEnv(context, eventParams);
 
     const expectedEnvVariables = [
-      { VITE_REACT_APP_AUTH0_DOMAIN: "CUSTOM_AUTH0_DOMAIN" },
-      { VITE_REACT_APP_AUTH0_CLIENT_ID: "CUSTOM_AUTH0_CLIENT_ID" },
-      { VITE_REACT_APP_AUTH0_AUDIENCE: "CUSTOM_AUTH0_AUDIENCE" },
+      { REACT_APP_AUTH0_DOMAIN: "CUSTOM_AUTH0_DOMAIN" },
+      { REACT_APP_AUTH0_CLIENT_ID: "CUSTOM_AUTH0_CLIENT_ID" },
+      { REACT_APP_AUTH0_AUDIENCE: "CUSTOM_AUTH0_AUDIENCE" },
       {
-        VITE_REACT_APP_AUTH0_REDIRECT_URI:
-          "http://localhost:3001/auth-callback",
+        REACT_APP_AUTH0_REDIRECT_URI: "http://localhost:3001/auth-callback",
       },
       {
-        VITE_REACT_APP_AUTH0_LOGOUT_REDIRECT_URI: "http://localhost:3001/login",
+        REACT_APP_AUTH0_LOGOUT_REDIRECT_URI: "http://localhost:3001/login",
       },
-      { VITE_REACT_APP_AUTH0_SCOPE: "openid profile email" },
+      { REACT_APP_AUTH0_SCOPE: "openid profile email" },
     ];
 
     expect(eventParams.envVariables).toEqual(expectedEnvVariables);