Merge pull request #404 from amplication/feat/ra-graphql-upgrade

Feat/ra graphql upgrade
amplication · Sep 16, 2024 · 856a6d6 · 856a6d6
2 parents a9e1d36 + e2a864b
commit 856a6d6
Show file tree

Hide file tree

Showing 25 changed files with 271 additions and 699 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.14",
+  "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
-    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",
+    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",
   };
 
   eventParams.envVariables = eventParams.envVariables.concat(

diff --git a/plugins/auth-auth0/src/static/client/Login.tsx b/plugins/auth-auth0/src/static/client/Login.tsx
diff --git a/plugins/auth-auth0/src/static/client/LoginForm.tsx b/plugins/auth-auth0/src/static/client/LoginForm.tsx
@@ -0,0 +1,27 @@
+import * as React from "react";
+import { useLogin, useNotify } from "react-admin";
+import { Button } from "@mui/material";
+
+const LoginForm = ({ theme }: any) => {
+  const login = useLogin();
+  const notify = useNotify();
+  const submit = (e: React.MouseEvent<HTMLButtonElement>) => {
+    e.preventDefault();
+    notify("Redirecting to Auth0");
+    login({});
+  };
+
+
+  return (
+    <Button
+    type="submit"
+    variant="contained"
+    color="primary"
+    onClick={submit}
+  >
+    Log in
+  </Button>
+  );
+};
+
+export default LoginForm;
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.REACT_APP_AUTH0_DOMAIN || "",
-  clientId: process.env.REACT_APP_AUTH0_CLIENT_ID || "",
+  domain: process.env.VITE_REACT_APP_AUTH0_DOMAIN || "",
+  clientId: process.env.VITE_REACT_APP_AUTH0_CLIENT_ID || "",
   cacheLocation: "localstorage",
   authorizationParams: {
-    audience: process.env.REACT_APP_AUTH0_AUDIENCE,
+    audience: process.env.VITE_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.REACT_APP_AUTH0_REDIRECT_URI,
+        redirect_uri: process.env.VITE_REACT_APP_AUTH0_REDIRECT_URI,
       },
     });
 
@@ -28,7 +28,7 @@ export const auth0AuthProvider: AuthProvider = {
   logout: async () => {
     await client.logout({
       logoutParams: {
-        returnTo: process.env.REACT_APP_AUTH0_LOGOUT_REDIRECT_URI,
+        returnTo: process.env.VITE_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,12 +26,17 @@ describe("Testing beforeCreateAdminDotEnv hook", () => {
     eventParams = await beforeCreateAdminDotEnv(context, eventParams);
 
     const expectedEnvVariables = [
-      { REACT_APP_AUTH0_DOMAIN: "AUTH0_DOMAIN" },
-      { REACT_APP_AUTH0_CLIENT_ID: "AUTH0_CLIENT_ID" },
-      { REACT_APP_AUTH0_AUDIENCE: "AUTH0_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" },
+      { VITE_REACT_APP_AUTH0_DOMAIN: "AUTH0_DOMAIN" },
+      { VITE_REACT_APP_AUTH0_CLIENT_ID: "AUTH0_CLIENT_ID" },
+      { VITE_REACT_APP_AUTH0_AUDIENCE: "AUTH0_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" },
     ];
 
     expect(eventParams.envVariables).toEqual(expectedEnvVariables);
@@ -47,12 +52,17 @@ describe("Testing beforeCreateAdminDotEnv hook", () => {
     eventParams = await beforeCreateAdminDotEnv(context, eventParams);
 
     const expectedEnvVariables = [
-      { REACT_APP_AUTH0_DOMAIN: "CUSTOM_AUTH0_DOMAIN" },
-      { REACT_APP_AUTH0_CLIENT_ID: "CUSTOM_AUTH0_CLIENT_ID" },
-      { REACT_APP_AUTH0_AUDIENCE: "CUSTOM_AUTH0_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" },
+      { 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" },
+      {
+        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" },
     ];
 
     expect(eventParams.envVariables).toEqual(expectedEnvVariables);

diff --git a/plugins/auth-keycloak/package.json b/plugins/auth-keycloak/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplication/plugin-auth-keycloak",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Keycloak Authentication plugin for Amplication",
   "main": "dist/index.js",
   "nx": {},

diff --git a/plugins/auth-keycloak/src/events/createAdminDotEnv.ts b/plugins/auth-keycloak/src/events/createAdminDotEnv.ts
@@ -7,21 +7,21 @@ import { getPluginSettings } from "../utils/getPluginSettings";
 
 export const beforeCreateAdminDotEnv = async (
   context: DsgContext,
-  eventParams: CreateAdminDotEnvParams,
+  eventParams: CreateAdminDotEnvParams
 ): Promise<CreateAdminDotEnvParams> => {
   const settings = getPluginSettings(context.pluginInstallations);
 
   const { port, realmID, clientID } = settings;
 
   const envVariables = {
     // Keycloak
-    REACT_APP_KEYCLOAK_URL: `http://localhost:${port}`,
-    REACT_APP_KEYCLOAK_REALM: realmID,
-    REACT_APP_KEYCLOAK_CLIENT_ID: clientID,
+    VITE_REACT_APP_KEYCLOAK_URL: `http://localhost:${port}`,
+    VITE_REACT_APP_KEYCLOAK_REALM: realmID,
+    VITE_REACT_APP_KEYCLOAK_CLIENT_ID: clientID,
   };
 
   eventParams.envVariables = eventParams.envVariables.concat(
-    convertToVarDict(envVariables),
+    convertToVarDict(envVariables)
   );
 
   return eventParams;

diff --git a/plugins/auth-keycloak/src/static/client/auth-provider/ra-auth-keycloak.ts b/plugins/auth-keycloak/src/static/client/auth-provider/ra-auth-keycloak.ts
@@ -3,9 +3,9 @@ import { AuthProvider } from "react-admin";
 import { jwtDecode } from "jwt-decode";
 
 const keycloakConfig: KeycloakConfig = {
-  realm: process.env.REACT_APP_KEYCLOAK_REALM || "master",
-  url: process.env.REACT_APP_KEYCLOAK_URL || "http://localhost:8080/auth",
-  clientId: process.env.REACT_APP_KEYCLOAK_CLIENT_ID || "admin-ui",
+  realm: process.env.VITE_REACT_APP_KEYCLOAK_REALM || "master",
+  url: process.env.VITE_REACT_APP_KEYCLOAK_URL || "http://localhost:8080/auth",
+  clientId: process.env.VITE_REACT_APP_KEYCLOAK_CLIENT_ID || "admin-ui",
 };
 
 export const keycloakClient = new Keycloak(keycloakConfig);

diff --git a/plugins/auth-keycloak/src/tests/createAdminDotEnv.spec.ts b/plugins/auth-keycloak/src/tests/createAdminDotEnv.spec.ts
@@ -26,9 +26,9 @@ describe("Testing beforeCreateAdminDotEnv hook", () => {
     eventParams = await beforeCreateAdminDotEnv(context, eventParams);
 
     const expectedEnvVariables = [
-      { REACT_APP_KEYCLOAK_URL: "http://localhost:8080" },
-      { REACT_APP_KEYCLOAK_REALM: "amplication-sample-realm" },
-      { REACT_APP_KEYCLOAK_CLIENT_ID: "amplication-server" },
+      { VITE_REACT_APP_KEYCLOAK_URL: "http://localhost:8080" },
+      { VITE_REACT_APP_KEYCLOAK_REALM: "amplication-sample-realm" },
+      { VITE_REACT_APP_KEYCLOAK_CLIENT_ID: "amplication-server" },
     ];
 
     expect(eventParams.envVariables).toEqual(expectedEnvVariables);
@@ -43,9 +43,9 @@ describe("Testing beforeCreateAdminDotEnv hook", () => {
     eventParams = await beforeCreateAdminDotEnv(context, eventParams);
 
     const expectedEnvVariables = [
-      { REACT_APP_KEYCLOAK_URL: "http://localhost:3000" },
-      { REACT_APP_KEYCLOAK_REALM: "CUSTOM_KEYCLOAK_REALM_ID" },
-      { REACT_APP_KEYCLOAK_CLIENT_ID: "CUSTOM_KEYCLOAK_CLIENT_ID" },
+      { VITE_REACT_APP_KEYCLOAK_URL: "http://localhost:3000" },
+      { VITE_REACT_APP_KEYCLOAK_REALM: "CUSTOM_KEYCLOAK_REALM_ID" },
+      { VITE_REACT_APP_KEYCLOAK_CLIENT_ID: "CUSTOM_KEYCLOAK_CLIENT_ID" },
     ];
 
     expect(eventParams.envVariables).toEqual(expectedEnvVariables);

diff --git a/plugins/auth-saml/package.json b/plugins/auth-saml/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplication/plugin-auth-saml",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Description of your plugin",
   "main": "dist/index.js",
   "nx": {},