openam-jp · tsujiguchitky · Apr 6, 2020 · Apr 7, 2020 · Apr 8, 2020 · Apr 9, 2020
diff --git a/openam-external-libs/pom.xml b/openam-external-libs/pom.xml
@@ -525,12 +525,13 @@
                             <goal>install-file</goal>
                         </goals>
                         <configuration>
-                            <file>${basedir}/src/main/resources/bootstrap-tabdrop-1.0.js</file>
+                            <file>${basedir}/src/main/resources/bootstrap-tabdrop-1.0-openam-jp.js</file>
                             <groupId>jp.openam.commons.ui.libs</groupId>
                             <artifactId>bootstrap-tabdrop</artifactId>
                             <version>1.0</version>
                             <packaging>js</packaging>
                             <generatePom>true</generatePom>
+                            <classifier>openam-jp</classifier>
                         </configuration>
                     </execution>
                     <execution>

diff --git a/...c/main/resources/bootstrap-tabdrop-1.0.js → ...ources/bootstrap-tabdrop-1.0-openam-jp.js b/...c/main/resources/bootstrap-tabdrop-1.0.js → ...ources/bootstrap-tabdrop-1.0-openam-jp.js
@@ -36,7 +36,7 @@
 			register: function(fn) {
 				registered.push(fn);
 				if (inited === false) {
-					$(window).bind('resize', resize);
+					$(window).on('resize', resize);
 					inited = true;
 				}
 			},
@@ -114,4 +114,4 @@
 
 	$.fn.tabdrop.Constructor = TabDrop;
 
-}( window.jQuery );
+}( window.jQuery );
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 2020 Open Source Solution Technology Corporation
 -->
 <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-2.3.6-min.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 2020 Open Source Solution Technology Corporation
 -->
 <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-2.3.6-min.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,7 +23,7 @@
   ~ "Portions Copyrighted [year] [name of copyright owner]"
   ~
   ~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
-  ~ Portions Copyrighted 2019 Open Source Solution Technology Corp.
+  ~ Portions Copyrighted 2019-2020 Open Source Solution Technology Corp.
   -->
 <html lang="en">
     <head>
@@ -61,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-2.3.6-min.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 Copyrighted 2020 Open Source Solution Technology Corporation
   -->
 <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-2.3.6-min.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,7 +23,7 @@
   ~ "Portions Copyrighted [year] [name of copyright owner]"
   ~
   ~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
-  ~ Portions Copyrighted 2019 Open Source Solution Technology Corp.
+  ~ Portions Copyrighted 2019-2020 Open Source Solution Technology Corp.
   -->
 <html lang="en">
     <head>
@@ -60,6 +60,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-2.3.6-min.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,7 +23,7 @@
   ~ "Portions Copyrighted [year] [name of copyright owner]"
   ~
   ~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
-  ~ Portions Copyrighted 2019 Open Source Solution Technology Corp.
+  ~ Portions Copyrighted 2019-2020 Open Source Solution Technology Corp.
   -->
 <html lang="en">
     <head>
@@ -60,6 +60,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-2.3.6-min.js"></script>
     </body>
 </html>
diff --git a/openam-ui/openam-ui-ria/npm-shrinkwrap.json b/openam-ui/openam-ui-ria/npm-shrinkwrap.json
diff --git a/openam-ui/openam-ui-ria/package.json b/openam-ui/openam-ui-ria/package.json
@@ -48,7 +48,7 @@
     "lodash": "3.10.1",
     "mocha": "2.5.3",
     "phantomjs-prebuilt": "2.1.7",
-    "requirejs": "2.2.0",
+    "requirejs": "2.3.6",
     "rimraf": "2.5.2",
     "sinon": "1.17.4",
     "sinon-chai": "2.8.0"

diff --git a/openam-ui/openam-ui-ria/pom.xml b/openam-ui/openam-ui-ria/pom.xml
@@ -100,6 +100,7 @@
             <groupId>jp.openam.commons.ui.libs</groupId>
             <artifactId>bootstrap-tabdrop</artifactId>
             <version>1.0</version>
+            <classifier>openam-jp</classifier>
             <type>js</type>
         </dependency>
         <dependency>
@@ -150,20 +151,6 @@
             <type>js</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jp.openam.commons.ui.libs</groupId>
-            <artifactId>qunit</artifactId>
-            <version>1.15.0</version>
-            <type>js</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jp.openam.commons.ui.libs</groupId>
-            <artifactId>qunit</artifactId>
-            <type>css</type>
-            <version>1.15.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>jp.openam.commons.ui.libs</groupId>
             <artifactId>squire</artifactId>
@@ -264,7 +251,7 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/test-classes/libs</outputDirectory>
-                            <includeArtifactIds>sinon,qunit,squire</includeArtifactIds>
+                            <includeArtifactIds>sinon,squire</includeArtifactIds>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>

diff --git a/openam-ui/openam-ui-ria/src/main/js/config/process/AMConfig.js b/openam-ui/openam-ui-ria/src/main/js/config/process/AMConfig.js
@@ -16,7 +16,7 @@
  */
 
 define([
-    "jquery",
+    "jquery-migrate",
     "lodash",
     "org/forgerock/openam/ui/common/util/Constants",
     "org/forgerock/commons/ui/common/main/EventManager",

diff --git a/openam-ui/openam-ui-ria/src/main/js/config/validators/AMValidators.js b/openam-ui/openam-ui-ria/src/main/js/config/validators/AMValidators.js
@@ -15,7 +15,7 @@
  */
 
 define([
-    "jquery"
+    "jquery-migrate"
 ], function ($) {
     var obj = {
         "validPhoneFormat": {

diff --git a/openam-ui/openam-ui-ria/src/main/js/jp/co/osstech/openam/server/util/webauthn.js b/openam-ui/openam-ui-ria/src/main/js/jp/co/osstech/openam/server/util/webauthn.js
@@ -11,11 +11,11 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2019 Open Source Solution Technology Corporation
+ * Copyright 2019-2020 Open Source Solution Technology Corporation
  */
 
 define("jp/co/osstech/openam/server/util/webauthn", [
-    "jquery"
+    "jquery-migrate"
 ], function ($) {
 
     var obj = {};
@@ -44,11 +44,11 @@ define("jp/co/osstech/openam/server/util/webauthn", [
 
                 const jsonbody = JSON.stringify(jdata);
                 $("#PublicKeyCredential").val(jsonbody);
-                $("#idToken3_0").click();
+                $("#idToken3_0").trigger("click");
             })
             .catch((err) => {
                 console.log("ERROR", err);
-                $("#idToken3_1").click();
+                $("#idToken3_1").trigger("click");
             });
     };
 
@@ -73,11 +73,11 @@ define("jp/co/osstech/openam/server/util/webauthn", [
 
                 const jsonbody = JSON.stringify(jdata);
                 $("#PublicKeyCredential").val(jsonbody);
-                $("#idToken3_0").click();
+                $("#idToken3_0").trigger("click");
             })
             .catch((err) => {
                 console.log("ERROR", err);
-                $("#idToken3_1").click();
+                $("#idToken3_1").trigger("click");
             });
     };
 

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 2020 Open Source Solution Technology Corporation
  */
 
 require.config({
@@ -35,10 +37,15 @@ require.config({
         "lodash":       "libs/lodash-3.10.1-min",
         "handlebars":   "libs/handlebars-4.0.5",
         "i18next":      "libs/i18next-1.7.3-min",
-        "jquery":       "libs/jquery-2.1.1-min",
+        "jquery":       "libs/jquery-3.5.1-min",
+        "jquery-migrate": "libs/jquery-migrate-3.3.0",
         "text":         "libs/text-2.0.15"
     },
     shim: {
+        "jquery-migrate": {
+            deps: ["jquery"],
+            exports: "jQuery"
+        },
         "handlebars": {
             exports: "handlebars"
         },
@@ -53,7 +60,7 @@ require.config({
 });
 
 require([
-    "jquery",
+    "jquery-migrate",
     "lodash",
     "handlebars",
     "org/forgerock/openam/ui/user/oauth2/OAuth2ConsentPageHelper",
@@ -145,7 +152,7 @@ require([
                 $("#wrapper").html(baseTemplate(data));
                 $("#footer").html(footerTemplate(data));
                 $("#loginBaseLogo").html(loginHeaderTemplate(data));
-                $("#content").html(formTemplate(data)).find(".panel-heading").bind("click keyup", function (e) {
+                $("#content").html(formTemplate(data)).find(".panel-heading").on("click keyup", function (e) {
                     // keyup is required so that the collapsed panel can be opened with the keyboard alone,
                     // and without relying on a mouse click event.
                     if (e.type === "keyup" && e.keyCode !== KEY_CODE_ENTER && e.keyCode !== KEY_CODE_SPACE) {

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 2020 Open Source Solution Technology Corporation
  */
 
 require.config({
@@ -27,10 +28,15 @@ require.config({
         "lodash":       "libs/lodash-3.10.1-min",
         "handlebars":   "libs/handlebars-4.0.5",
         "i18next":      "libs/i18next-1.7.3-min",
-        "jquery":       "libs/jquery-2.1.1-min",
+        "jquery":       "libs/jquery-3.5.1-min",
+        "jquery-migrate": "libs/jquery-migrate-3.3.0",
         "text":         "libs/text-2.0.15"
     },
     shim: {
+        "jquery-migrate": {
+            deps: ["jquery"],
+            exports: "jQuery"
+        },
         "handlebars": {
             exports: "handlebars"
         },
@@ -45,7 +51,7 @@ require.config({
 });
 
 require([
-    "jquery",
+    "jquery-migrate",
     "handlebars",
     "org/forgerock/commons/ui/common/main/Configuration",
     "org/forgerock/openam/ui/common/util/Constants",

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,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2011-2016 ForgeRock AS.
- * Portions copyright 2019 Open Source Solution Technology Corporation
+ * Portions copyright 2019-2020 Open Source Solution Technology Corporation
  */
 
 require.config({
@@ -47,14 +47,15 @@ require.config({
         "bootstrap"               : "libs/bootstrap-3.4.1-openam-jp",
         "bootstrap-datetimepicker": "libs/bootstrap-datetimepicker-4.14.30-min",
         "bootstrap-dialog"        : "libs/bootstrap-dialog-1.34.4-min",
-        "bootstrap-tabdrop"       : "libs/bootstrap-tabdrop-1.0",
+        "bootstrap-tabdrop"       : "libs/bootstrap-tabdrop-1.0-openam-jp",
 
         "clockPicker" : "libs/bootstrap-clockpicker-0.0.7-0915edd-min",
         "doTimeout"   : "libs/jquery.ba-dotimeout-1.0-min",
         "form2js"     : "libs/form2js-2.0-769718a",
         "handlebars"  : "libs/handlebars-4.0.5",
         "i18next"     : "libs/i18next-1.7.3-min",
-        "jquery"      : "libs/jquery-2.1.1-min",
+        "jquery"      : "libs/jquery-3.5.1-min",
+        "jquery-migrate": "libs/jquery-migrate-3.3.0",
         "js2form"     : "libs/js2form-2.0-769718a",
         "jsonEditor"  : "libs/jsoneditor-0.7.23-custom",
         "lodash"      : "libs/lodash-3.10.1-min",
@@ -70,6 +71,10 @@ require.config({
         "text": "libs/text-2.0.15"
     },
     shim: {
+        "jquery-migrate": {
+            deps: ["jquery"],
+            exports: "jQuery"
+        },
         "autosizeInput": {
             deps: ["jquery"],
             exports: "autosizeInput"
@@ -163,7 +168,7 @@ require([
     "org/forgerock/commons/ui/common/main/EventManager",
 
     // other modules that are necessary to include to startup the app
-    "jquery",
+    "jquery-migrate",
     "lodash",
     "backbone",
     "handlebars",

diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/server/util/QRCodeReader.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/server/util/QRCodeReader.js
@@ -15,7 +15,7 @@
  */
 
 define([
-    "jquery",
+    "jquery-migrate",
     "qrcode"
 ], function ($, QRCodeReader) {