OpenIdentityPlatform · vharseko · Jul 11, 2025 · Jun 30, 2025 · Jul 2, 2025 · Jul 2, 2025
diff --git a/legal/THIRDPARTYREADME.txt b/legal/THIRDPARTYREADME.txt
@@ -854,8 +854,8 @@ Copyright: Copyright (c)2014 Jan Mühlemann (jamuhl).
 Version: jquery-1.11.1-min.js
 Copyright: Copyright (c) 2005, 2014 jQuery Foundation, Inc.
 
-Version: jquery-2.1.1-min.js
-Copyright: Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
+Version: jquery-3.7.1-min.js
+Copyright: Copyright 2005, 2023 jQuery Foundation, Inc. and other contributors
 
 Version: bootstrap-clockpicker-0.0.7-min.js
 Copyright: Copyright 2014 Wang Shenwei.

diff --git a/openam-server-only/src/license/THIRD-PARTY.properties b/openam-server-only/src/license/THIRD-PARTY.properties
@@ -56,7 +56,7 @@ org.forgerock.commons.ui.libs--font-awesome--4.5.0=MIT
 org.forgerock.commons.ui.libs--form2js--2.0-769718a=MIT
 org.forgerock.commons.ui.libs--handlebars--4.0.5=MIT
 org.forgerock.commons.ui.libs--i18next--1.7.3=MIT
-org.forgerock.commons.ui.libs--jquery--2.1.1=MIT
+org.forgerock.commons.ui.libs--jquery--3.7.1=MIT
 org.forgerock.commons.ui.libs--jquery-nestingSortable--0.9.12=BSD
 org.forgerock.commons.ui.libs--jquery.placeholder--2.0.8=MIT
 org.forgerock.commons.ui.libs--js2form--2.0-769718a=MIT

diff --git a/openam-server-only/src/main/webapp/js/jquery.js b/openam-server-only/src/main/webapp/js/jquery.js
diff --git a/openam-ui/openam-ui-ria/Gruntfile.js b/openam-ui/openam-ui-ria/Gruntfile.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 /* global module, require, process */

diff --git a/openam-ui/openam-ui-ria/package.json b/openam-ui/openam-ui-ria/package.json
@@ -8,7 +8,7 @@
     "prejsdoc": "npm run clean:jsdoc -s",
     "jsdoc": "jsdoc --configure config/jsdoc/configuration.json",
     "start": "grunt",
-    "build:production": "cross-env NODE_ENV=production grunt prod",
+    "build:production": "cross-env NODE_ENV=production grunt prod --verbose",
     "test": "grunt karma:dev",
     "predeps": "npm run clean:deps -s",
     "deps": "ncu -u && mvn clean install",

diff --git a/openam-ui/openam-ui-ria/src/main/js/config/ThemeConfiguration.js b/openam-ui/openam-ui-ria/src/main/js/config/ThemeConfiguration.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 define({

diff --git a/openam-ui/openam-ui-ria/src/main/js/main-authorize.js b/openam-ui/openam-ui-ria/src/main/js/main-authorize.js
@@ -20,6 +20,8 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Portions Copyrighted 2025 3A Systems LLC.
  */
 
 require.config({
@@ -34,7 +36,7 @@ require.config({
     paths: {
         "handlebars": "libs/handlebars-4.7.7",
         "i18next": "libs/i18next-1.7.3-min",
-        "jquery": "libs/jquery-2.1.1-min",
+        "jquery": "libs/jquery-3.7.1-min",
         "lodash": "libs/lodash-3.10.1-min",
         "redux": "libs/redux-3.5.2-min",
         "text": "libs/text-2.0.15"

diff --git a/openam-ui/openam-ui-ria/src/main/js/main-device.js b/openam-ui/openam-ui-ria/src/main/js/main-device.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 require.config({
@@ -26,7 +27,7 @@ require.config({
     paths: {
         "handlebars": "libs/handlebars-4.7.7",
         "i18next": "libs/i18next-1.7.3-min",
-        "jquery": "libs/jquery-2.1.1-min",
+        "jquery": "libs/jquery-3.7.1-min",
         "lodash": "libs/lodash-3.10.1-min",
         "redux": "libs/redux-3.5.2-min",
         "text": "libs/text-2.0.15"

diff --git a/openam-ui/openam-ui-ria/src/main/js/main.js b/openam-ui/openam-ui-ria/src/main/js/main.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 require.config({
@@ -55,7 +56,7 @@ require.config({
         "form2js"          : "libs/form2js-2.0-769718a",
         "handlebars"       : "libs/handlebars-4.7.7",
         "i18next"          : "libs/i18next-1.7.3-min",
-        "jquery"           : "libs/jquery-2.1.1-min",
+        "jquery"           : "libs/jquery-3.7.1-min",
         "js2form"          : "libs/js2form-2.0-769718a",
         "jsonEditor"       : "libs/jsoneditor-0.7.23-custom",
         "lodash"           : "libs/lodash-3.10.1-min",

diff --git a/...ock/openam/ui/admin/views/realms/authorization/policies/conditions/EditEnvironmentView.js b/...ock/openam/ui/admin/views/realms/authorization/policies/conditions/EditEnvironmentView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 define([
@@ -61,7 +62,7 @@ define([
 
             this.data.conditions = _.sortBy(this.data.conditions, "i18nKey");
 
-            UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
+            return UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
                 self.$el.append(tpl);
                 self.setElement(`#environment_${itemID}`);
 

diff --git a/...rgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditSubjectView.js b/...rgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditSubjectView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 
@@ -49,7 +50,7 @@ define([
 
             this.data.subjects = _.sortBy(this.data.subjects, "i18nKey");
 
-            UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
+            return UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
                 self.$el.append(tpl);
 
                 self.setElement(`#subject_${itemID}`);

diff --git a/.../openam/ui/admin/views/realms/authorization/policies/conditions/ManageEnvironmentsView.js b/.../openam/ui/admin/views/realms/authorization/policies/conditions/ManageEnvironmentsView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 
@@ -94,14 +95,13 @@ define([
                 if (self.data.operators.length === 0) {
                     this.buttons.addOperator.hide();
                 }
-
-                this.buildList();
-                this.initSorting();
-                this.identifyDroppableLogical();
-
-                if (callback) {
-                    callback();
-                }
+                this.buildList().done(function () {
+                    self.initSorting();
+                    self.identifyDroppableLogical();
+                    if (callback) {
+                        callback();
+                    }
+                });
             });
         }
     });

diff --git a/...rgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView.js b/...rgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 
@@ -93,35 +94,45 @@ define([
                 if (_.isArray(data) === false) {
                     data = [data];
                 }
-
-                _.each(data, function (item) {
-                    if (item && _.contains(operators, item.type)) {
-
-                        newRule = new OperatorRulesView();
-                        newRule.render(self.data, container, self.idPrefix + self.idCount, (self.idCount === 0));
-                        newRule.setValue(item.type);
-                        self.idCount++;
-
-                    } else if (!_.isEmpty(item)) {
-                        if (item.type === Constants.LEGACY) {
-                            newRule = new LegacyListItemView();
-                            newRule.render(item, container, self.idCount);
-                        } else {
-                            newRule = self.getNewRule();
-                            properties = self.getProperties();
-                            newRule.render(properties, container, self.idCount, item);
-                            newRule.createListItem(properties, newRule.$el);
+                return data.reduce(function (promise, item) {
+                    return promise.then(function () {
+                        var pr = $.Deferred().resolve();
+                        if (item && _.contains(operators, item.type)) {
+                            newRule = new OperatorRulesView();
+                            pr = newRule.render(self.data,
+                                container, self.idPrefix + self.idCount, (self.idCount === 0))
+                                .then(function () {
+                                    newRule.setValue(item.type);
+                                }).then(function () {
+                                    self.idCount++;
+                                });
+
+                        } else if (!_.isEmpty(item)) {
+                            if (item.type === Constants.LEGACY) {
+                                newRule = new LegacyListItemView();
+                                pr = newRule.render(item, container, self.idCount);
+                            } else {
+                                newRule = self.getNewRule();
+                                properties = self.getProperties();
+                                pr = newRule.render(properties, container, self.idCount, item)
+                                    .then(function () {
+                                        newRule.createListItem(properties, newRule.$el);
+                                    });
+
+                            }
+                            pr = pr.then(function () {
+                                self.idCount++;
+                            });
                         }
-
-                        self.idCount++;
-                    }
-
-                    if (item && item[self.properties]) {
-                        buildListItem(item[self.properties], newRule.dropbox, item);
-                    } else if (item && item[self.property]) {
-                        buildListItem(item[self.property], newRule.dropbox, item);
-                    }
-                });
+                        return pr.then(function () {
+                            if (item && item[self.properties]) {
+                                return buildListItem(item[self.properties], newRule.dropbox, item);
+                            } else if (item && item[self.property]) {
+                                return buildListItem(item[self.property], newRule.dropbox, item);
+                            }
+                        });
+                    });
+                }, $.Deferred().resolve());
             }
 
             /*
@@ -137,8 +148,8 @@ define([
                 this.localEntity[this.properties] = [properties];
             }
 
-            buildListItem(this.localEntity, this.$el.find("ol#dropOffArea"), null);
-            this.delegateEvents();
+            return buildListItem(this.localEntity, this.$el.find("ol#dropOffArea"), null)
+                .then(this.delegateEvents);
         },
 
         initSorting () {
@@ -259,21 +270,22 @@ define([
                 editRuleView = self.getNewRule(),
                 properties = self.getProperties(),
                 disabledConditions;
-            editRuleView.render(properties, item.parent(), self.idCount, item.data().itemData);
+            return editRuleView.render(properties, item.parent(), self.idCount, item.data().itemData).then(function () {
+                item.before(editRuleView.$el);
+            }).then(function () {
+                self.idCount++;
 
-            self.idCount++;
+                editRuleView.$el.addClass("editing");
 
-            editRuleView.$el.addClass("editing");
-            item.before(editRuleView.$el);
+                self.setInactive(self.buttons.addCondition, true);
+                self.setInactive(self.buttons.addOperator, true);
 
-            this.setInactive(this.buttons.addCondition, true);
-            this.setInactive(this.buttons.addOperator, true);
+                disabledConditions = self.$el.find(".rule, .operator").not(".editing");
+                disabledConditions.addClass("editing-disabled");
+                disabledConditions.find("> select").prop("disabled", true);
 
-            disabledConditions = this.$el.find(".rule, .operator").not(".editing");
-            disabledConditions.addClass("editing-disabled");
-            disabledConditions.find("> select").prop("disabled", true);
-
-            editRuleView.$el.find("select.type-selection:first").focus();
+                editRuleView.$el.find("select.type-selection:first").focus();
+            });
         },
 
         editStop (item) {

diff --git a/...rock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageSubjectsView.js b/...rock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageSubjectsView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 
@@ -96,13 +97,13 @@ define([
                     this.buttons.addOperator.hide();
                 }
 
-                this.buildList();
-                this.initSorting();
-                this.identifyDroppableLogical();
-
-                if (callback) {
-                    callback();
-                }
+                this.buildList().done(function () {
+                    self.initSorting();
+                    self.identifyDroppableLogical();
+                    if (callback) {
+                        callback();
+                    }
+                });
             });
         }
     });

diff --git a/...erock/openam/ui/admin/views/realms/authorization/policies/conditions/OperatorRulesView.js b/...erock/openam/ui/admin/views/realms/authorization/policies/conditions/OperatorRulesView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 
@@ -49,7 +50,7 @@ define([
 
             this.setElement(element);
 
-            UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
+            return UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
                 self.$el.append(tpl);
 
                 self.setElement(`#operator${itemID}`);

diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Constants.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Constants.js
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2025 3A Systems LLC.
  */
 
 define([

diff --git a/openam-ui/openam-ui-ria/src/main/resources/partials/headers/_Title.html b/openam-ui/openam-ui-ria/src/main/resources/partials/headers/_Title.html
@@ -1,7 +1,7 @@
 <header class="page-header page-header-no-border clearfix">
 
     <div class="shallow-page-header-button-group pull-right">
-        <div data-tab-search />
+        <div data-tab-search></div>
         {{#each headerActions}}
             {{partial actionPartial this}}
         {{/each}}

diff --git a/openam-ui/openam-ui-ria/src/main/resources/partials/headers/_TitleWithSubAndIcon.html b/openam-ui/openam-ui-ria/src/main/resources/partials/headers/_TitleWithSubAndIcon.html
@@ -6,7 +6,7 @@
 
 
     <div class="deep-page-header-button-group button-group pull-right">
-        <div data-tab-search />
+        <div data-tab-search></div>
         {{#each headerActions}}
             {{partial actionPartial this}}
         {{/each}}

diff --git a/openam-ui/openam-ui-ria/src/main/resources/partials/login/_PollingWait.html b/openam-ui/openam-ui-ria/src/main/resources/partials/login/_PollingWait.html
@@ -1 +1 @@
-<div />
+<div></div>
diff --git a/...-ui/openam-ui-ria/src/main/resources/templates/admin/views/common/IframeViewTemplate.html b/...-ui/openam-ui-ria/src/main/resources/templates/admin/views/common/IframeViewTemplate.html
@@ -1,3 +1,3 @@
 <!-- Copyright 2016 ForgeRock AS.
 	License terms: https://forgerock.org/cddlv1-0/ -->
-<iframe src="{{iframeSrc}}" class="{{iframeClass}}"/>
+<iframe src="{{iframeSrc}}" class="{{iframeClass}}"></iframe>