chore: import keycloak-js

uselagoon · Dec 27, 2024 · c0da0da · c0da0da
1 parent 2e0c5e8
commit c0da0da
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # upstream
 CI_BUILD_TAG ?= lagoon-ui
 CORE_REPO=https://github.com/uselagoon/lagoon.git
-CORE_TREEISH=main
+CORE_TREEISH=keycloak-26
 CYPRESS_BASE=cypress/base:20.13.1
 
 LAGOON_CORE_IMAGE_REPO=testlagoon
@@ -15,6 +15,15 @@ yarn-start-ui:
     && yarn build \
     && yarn start \
 
+.PHONY: start
+start:
+	export GRAPHQL_API=http://localhost:3000/graphql \
+	&& export KEYCLOAK_API=http://localhost:8088/auth \
+	&& export NODE_ENV=production \
+	&& export NODE_PORT=3003 \
+	&& export LAGOON_UI_TOURS_ENABLED=disabled \
+	&& docker compose -p $(CI_BUILD_TAG) --compatibility up --build -d ui
+
 # run-cypress:
 .PHONY: start-ui
 start-ui: development-api
@@ -59,4 +68,18 @@ development-api-down:
 .PHONY: down
 down:
 	$(MAKE) development-api-down
-	docker compose -p $(CI_BUILD_TAG) --compatibility down -v --remove-orphans
+	docker compose -p $(CI_BUILD_TAG) --compatibility down -v --remove-orphans
+
+.PHONY: local-dev-yarn
+local-dev-yarn:
+	$(MAKE) local-dev-yarn-stop
+	docker run --name local-dev-yarn -d -v ${PWD}:/app uselagoon/node-20-builder
+	docker exec local-dev-yarn bash -c "yarn install --frozen-lockfile"
+	docker exec local-dev-yarn bash -c "yarn build"
+	docker exec -it local-dev-yarn bash
+	$(MAKE) local-dev-yarn-stop
+
+.PHONY: local-dev-yarn-stop
+local-dev-yarn-stop:
+	docker stop local-dev-yarn || true
+	docker rm local-dev-yarn || true
diff --git a/package.json b/package.json
@@ -56,6 +56,7 @@
     "graphql": "^16.8.1",
     "graphql-tag": "^2.10.0",
     "isomorphic-unfetch": "^4.0.2",
+    "keycloak-js": "^26.0.7",
     "moment": "^2.22.2",
     "moment-duration-format": "^2.2.2",
     "next": "^14.2.2",

diff --git a/src/lib/withKeycloak.js b/src/lib/withKeycloak.js
@@ -2,6 +2,7 @@ import React from 'react';
 
 import getConfig from 'next/config';
 
+import Keycloak from 'keycloak-js';
 import { queryStringToObject } from 'lib/util';
 
 const { serverRuntimeConfig, publicRuntimeConfig } = getConfig();

diff --git a/src/pages/_document.js b/src/pages/_document.js
@@ -50,7 +50,6 @@ class MyDocument extends Document {
     return (
       <Html>
         <Head>
-          <Script src={`${publicRuntimeConfig.KEYCLOAK_API}/js/keycloak.js`} strategy="beforeInteractive" />
           <Plugins hook="head" />
         </Head>
         <body>

diff --git a/yarn.lock b/yarn.lock
@@ -10279,6 +10279,11 @@ jsprim@^2.0.2:
     object.assign "^4.1.4"
     object.values "^1.1.6"
 
+keycloak-js@^26.0.7:
+  version "26.0.7"
+  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-26.0.7.tgz#2025256f7c519df654240648052ea06344e2377e"
+  integrity sha512-vKCk1ISMiouYRLjMzi5fKp58RnYxKEBS29BoDgVfYwVW94IXchj9jLqBvIet31VD1v79l3WaWT+WMX7fH8O4wA==
+
 keyv@^4.5.3:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,6 @@ class MyDocument extends Document { @@
         return (
           <Html>
             <Head>
-              <Script src={`${publicRuntimeConfig.KEYCLOAK_API}/js/keycloak.js`} strategy="beforeInteractive" />
               <Plugins hook="head" />
             </Head>
             <body>
@@ Expand Down @@