Url Fix (#125)

* update resource provider to pull in the realm id not the realm display name (sorry for all the autoformats) * avoid injecting empty style or undefined * always display an org name * format based on google formatting
p2-inc · Jan 10, 2024 · c084947 · c084947
1 parent 4bb536b
commit c084947
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -88,15 +88,15 @@ First, setup:
 yarn
 ```
 
-Then, start a Keycloak, create a public OIDC client with `http://localhost:3000` Root URL, and update the `public/keycloak.json` file with the client config.
+Then, start a Keycloak server (use hosted [Phase Two](https://phasetwo.io/dashboard/) for easy testing), create a public OIDC client with `http://localhost:3000` Root URL, and update the `public/keycloak.json` file with the client config.
 
 Finally, run the development server:
 
 ```bash
 yarn start
 ```
 
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+You mill most likely need to use the fully qualified portal url [http://localhost:3000/auth/realms/master/portal](http://localhost:3000/auth/realms/master/portal).
 
 ### Build the extension
 

diff --git a/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java b/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java
@@ -256,13 +256,15 @@ public Response portal() {
                   Optional.ofNullable(realm.getAttribute("_providerConfig.assets.favicon.url"))
                       .orElse(
                           String.format(
-                              "%s/realms/%s/portal/favicon.ico", authUrlAttribute, realmName)))
+                              "%s/realms/%s/portal/favicon.ico",
+                              authUrlAttribute, realm.getName())))
               .setAttribute(
                   "appiconUrl",
                   Optional.ofNullable(realm.getAttribute("_providerConfig.assets.appicon.url"))
                       .orElse(
                           String.format(
-                              "%s/realms/%s/portal/logo192.png", authUrlAttribute, realmName)))
+                              "%s/realms/%s/portal/logo192.png",
+                              authUrlAttribute, realm.getName())))
               .setAttribute("displayName", realmName)
               .setAttribute("realmName", realm.getName());
       FreeMarkerLoginFormsProvider fm = (FreeMarkerLoginFormsProvider) form;

diff --git a/src/components/utils/injectStyles.tsx b/src/components/utils/injectStyles.tsx
@@ -31,14 +31,17 @@ const InjectStyles = () => {
     const customStyles = `
       ${primaryColor}
       ${secondaryColor}
-      ${styles.customCSS}
+      ${styles.customCSS || ""}
     `
       .replace(/\r?\n/g, " ")
       .replace(/\s+/g, " ")
       .trim();
 
     styleElement.innerHTML = customStyles;
-    document.body.appendChild(styleElement);
+
+    if (customStyles) {
+      document.body.appendChild(styleElement);
+    }
 
     return () => {
       document.body.removeChild(styleElement);

diff --git a/src/pages/organizations/settings/index.tsx b/src/pages/organizations/settings/index.tsx
@@ -40,7 +40,9 @@ export default function OrganizationSettings() {
             items={[
               { title: t("organizations"), link: `/organizations` },
               {
-                title: `${org?.displayName || t("organization")}`.trim(),
+                title: `${
+                  org?.displayName || org?.name || t("organization")
+                }`.trim(),
                 link: `/organizations/${orgId}/details`,
               },
             ]}