Merge pull request #4323 from nationalarchives/TDRD-319-upgrade-keycl…

…oak-js-v26 Tdrd 319 upgrade keycloak js v26
nationalarchives · Dec 9, 2024 · 673f669 · 673f669
2 parents bf31b60 + 3056c19
commit 673f669
Show file tree

Hide file tree

Showing 21 changed files with 509 additions and 1,521 deletions.
diff --git a/app/configuration/ApplicationConfig.scala b/app/configuration/ApplicationConfig.scala
@@ -12,7 +12,10 @@ class ApplicationConfig @Inject() (configuration: Configuration) {
     get("consignmentapi.url"),
     get("environment"),
     get("region"),
-    get("upload.url")
+    get("upload.url"),
+    get("auth.url"),
+    get("auth.clientId"),
+    get("auth.realm")
   )
 
   val numberOfItemsOnViewTransferPage: Int = configuration.get[Int]("viewTransfers.numberOfItemsPerPage")

diff --git a/app/views/partials/frontEndInputs.scala.html b/app/views/partials/frontEndInputs.scala.html
@@ -5,3 +5,6 @@
 <input type="hidden" class="stage" value="@frontEndInfo.stage">
 <input type="hidden" class="region" value="@frontEndInfo.region">
 <input type="hidden" class="upload-url" value="@frontEndInfo.uploadUrl">
+<input type="hidden" class="auth-url" value="@frontEndInfo.authUrl">
+<input type="hidden" class="client-id" value="@frontEndInfo.clientId">
+<input type="hidden" class="realm" value="@frontEndInfo.realm">
diff --git a/app/viewsapi/FrontEndInfo.scala b/app/viewsapi/FrontEndInfo.scala
@@ -4,5 +4,8 @@ case class FrontEndInfo(
     apiUrl: String,
     stage: String,
     region: String,
-    uploadUrl: String
+    uploadUrl: String,
+    authUrl: String,
+    clientId: String,
+    realm: String
 )
diff --git a/conf/application.base.conf b/conf/application.base.conf
@@ -7,6 +7,8 @@ pekko.actor.warn-about-java-serializer-usage = "off"
 auth.secret = ${AUTH_SECRET}
 read.auth.secret = ${READ_AUTH_SECRET}
 auth.url=${AUTH_URL}
+auth.clientId="tdr-fe"
+auth.realm="tdr"
 
 consignmentapi.url = ${consignmentapi.domain}"/graphql"
 

diff --git a/npm/babel.config.js b/npm/babel.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+    env: {
+        test: {
+            plugins: ["@babel/plugin-transform-modules-commonjs"]
+        }
+    }
+}
diff --git a/npm/jest.config.js b/npm/jest.config.js
@@ -12,5 +12,9 @@ module.exports = {
     API_URL: true,
     STAGE: "stage",
     REGION: "region"
+  },
+  transformIgnorePatterns: ["<rootDir>/node_modules/(?!keycloak-js)/"],
+  transform: {
+    "^.+\\.[j]sx?$": "babel-jest"
   }
 }