Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade wrensec-ui to version 23 in UI modules. #167

Merged
merged 13 commits into from
Mar 4, 2024
Merged

Upgrade wrensec-ui to version 23 in UI modules. #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dad6657
Upgrade wrensec-ui to version 23.
krausvo1 Feb 5, 2024
155b540
Prevent wrensec-ui locales files from overriding our own locales files.
krausvo1 Feb 24, 2024
4a4a29b
Upgrade lodash to version 4. Drop underscore alias for lodash and use…
krausvo1 Feb 19, 2024
1f5ff12
Fix promise-dependent tests failing after jQuery upgrade.
krausvo1 Feb 19, 2024
7ee31c6
Fix tabs href after jQuery upgrade.
krausvo1 Feb 22, 2024
50f5976
Update AnonymousProcessView usage based on upstream changes.
krausvo1 Feb 19, 2024
be7506b
Fix self-enclosing HTML tags causing incorrect HTML after wrensec-ui …
krausvo1 Feb 22, 2024
67e22ee
Fix search tab autocomplete's options styling after selectize library…
krausvo1 Feb 22, 2024
3707991
Upgrade code mirror to version 6. Move the editor to a separate modul…
krausvo1 Feb 22, 2024
ba863b8
Fix script upload button not being displayed when it should be.
krausvo1 Feb 22, 2024
a640433
Drop unused @verison and @openam-version less variables.
krausvo1 Feb 22, 2024
2b3237b
Update copyright headers.
krausvo1 Feb 22, 2024
ac5d7ee
Make sure i18nManager has been initialized before compiling templates.
krausvo1 Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion openam-oauth2/src/main/resources/templates/CodeThanks.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
3 changes: 2 additions & 1 deletion openam-oauth2/src/main/resources/templates/CodeVerificationForm.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
3 changes: 2 additions & 1 deletion openam-oauth2/src/main/resources/templates/page/authorize.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
3 changes: 2 additions & 1 deletion openam-oauth2/src/main/resources/templates/page/error.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
3 changes: 2 additions & 1 deletion openam-oauth2/src/main/resources/templates/popup/authorize.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
3 changes: 2 additions & 1 deletion openam-oauth2/src/main/resources/templates/touch/authorize.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
58 changes: 0 additions & 58 deletions openam-ui/openam-ui-api/Gruntfile.js
View file
Open in desktop

This file was deleted.

48 changes: 48 additions & 0 deletions openam-ui/openam-ui-api/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"));
Loading
Loading