Merge pull request #167 from krausvo1/upgrade-ui

Upgrade wrensec-ui to version 23 in UI modules.
WrenSecurity · Mar 4, 2024 · 86a2e60 · 86a2e60
2 parents 3aa9f53 + ac5d7ee
commit 86a2e60
Show file tree

Hide file tree

Showing 104 changed files with 28,019 additions and 5,101 deletions.
diff --git a/openam-oauth2/src/main/resources/templates/CodeThanks.ftl b/openam-oauth2/src/main/resources/templates/CodeThanks.ftl
@@ -13,6 +13,7 @@
 ~ information: "Portions copyright [year] [name of copyright owner]".
 ~
 ~ Copyright 2015 ForgeRock AS.
+~ Portions copyright 2024 Wren Security.
 -->
 <html lang="en">
 <head>
@@ -34,6 +35,6 @@
       done: true
   };
 </script>
-<script data-main="${baseUrl?html}/XUI/main-device" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
+<script data-main="${baseUrl?html}/XUI/main-device" src="${baseUrl?html}/XUI/libs/requirejs.js"></script>
 </body>
 </html>
diff --git a/openam-oauth2/src/main/resources/templates/CodeVerificationForm.ftl b/openam-oauth2/src/main/resources/templates/CodeVerificationForm.ftl
@@ -13,6 +13,7 @@
 ~ information: "Portions copyright [year] [name of copyright owner]".
 ~
 ~ Copyright 2015 ForgeRock AS.
+~ Portions copyright 2024 Wren Security.
 -->
 <html lang="en">
 <head>
@@ -34,6 +35,6 @@
       baseUrl : "${baseUrl?js_string}/XUI"
   };
 </script>
-<script data-main="${baseUrl?html}/XUI/main-device" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
+<script data-main="${baseUrl?html}/XUI/main-device" src="${baseUrl?html}/XUI/libs/requirejs.js"></script>
 </body>
 </html>
diff --git a/openam-oauth2/src/main/resources/templates/page/authorize.ftl b/openam-oauth2/src/main/resources/templates/page/authorize.ftl
@@ -23,6 +23,7 @@
   ~ "Portions Copyrighted [year] [name of copyright owner]"
   ~
   ~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
+  ~ Portions copyright 2024 Wren Security.
   -->
 <html lang="en">
     <head>
@@ -61,6 +62,6 @@
                 }
             };
         </script>
-        <script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
+        <script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs.js"></script>
     </body>
 </html>
diff --git a/openam-oauth2/src/main/resources/templates/page/error.ftl b/openam-oauth2/src/main/resources/templates/page/error.ftl
@@ -23,6 +23,7 @@
   ~ "Portions Copyrighted [year] [name of copyright owner]"
   ~
   ~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
+  ~ Portions copyright 2024 Wren Security.
   -->
 <html lang="en">
 <head>
@@ -53,6 +54,6 @@
             }
         </#if>
     </script>
-    <script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
+    <script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs.js"></script>
 </body>
 </html>
diff --git a/openam-oauth2/src/main/resources/templates/popup/authorize.ftl b/openam-oauth2/src/main/resources/templates/popup/authorize.ftl
@@ -23,6 +23,7 @@
   ~ "Portions Copyrighted [year] [name of copyright owner]"
   ~
   ~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
+  ~ Portions copyright 2024 Wren Security.
   -->
 <html lang="en">
     <head>
@@ -60,6 +61,6 @@
                 }
             };
         </script>
-        <script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
+        <script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs.js"></script>
     </body>
 </html>
diff --git a/openam-oauth2/src/main/resources/templates/touch/authorize.ftl b/openam-oauth2/src/main/resources/templates/touch/authorize.ftl
@@ -23,6 +23,7 @@
   ~ "Portions Copyrighted [year] [name of copyright owner]"
   ~
   ~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
+  ~ Portions copyright 2024 Wren Security.
   -->
 <html lang="en">
     <head>
@@ -60,6 +61,6 @@
                 }
             };
         </script>
-        <script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs-2.1.14-min.js"></script>
+        <script data-main="${baseUrl?html}/XUI/main-authorize" src="${baseUrl?html}/XUI/libs/requirejs.js"></script>
     </body>
 </html>
diff --git a/openam-ui/openam-ui-api/Gruntfile.js b/openam-ui/openam-ui-api/Gruntfile.js
diff --git a/openam-ui/openam-ui-api/gulpfile.js b/openam-ui/openam-ui-api/gulpfile.js
@@ -0,0 +1,48 @@
+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.1.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.1.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions copyright [year] [name of copyright owner]".
+ *
+ * Copyright 2024 Wren Security.
+ */
+
+const {
+  useLocalResources,
+} = require("@wrensecurity/commons-ui-build");
+const gulp = require("gulp");
+const { dirname } = require("path");
+
+const TARGET_PATH = "target/www";
+const DEPLOY_DIR = `${process.env.OPENAM_HOME}/api`;
+
+gulp.task("build:assets", useLocalResources({ "src/main/resources/**": "" }, { dest: TARGET_PATH }));
+
+gulp.task("build:swagger", () => {
+  const baseDir = dirname(require.resolve("swagger-ui-dist/swagger-ui-bundle.js"));
+  return gulp.src([
+      `${baseDir}/swagger-ui-bundle.{js,js.map}`,
+      `${baseDir}/swagger-ui-standalone-preset.{js,js.map}`,
+      `${baseDir}/*.css`,
+      `${baseDir}/*.{png,gif,jpg,ico,svg,ttf,eot,woff}`,
+  ], { base: baseDir }).pipe(gulp.dest(TARGET_PATH));
+});
+
+gulp.task("build", gulp.parallel(
+  "build:assets",
+  "build:swagger",
+));
+
+gulp.task("deploy", () => gulp.src(`${TARGET_PATH}/**/*`).pipe(gulp.dest(DEPLOY_DIR)));
+
+gulp.task("dev", gulp.series("build", "deploy"));
+gulp.task("prod", gulp.series("build"));
+
+gulp.task("default", gulp.series("dev"));