Update and fix angularjs

indigo-iam · Aug 19, 2024 · 93d0bb8 · 93d0bb8
1 parent 89d0fae
commit 93d0bb8
Show file tree

Hide file tree

Showing 14 changed files with 282 additions and 244 deletions.
diff --git a/iam-login-service/pom.xml b/iam-login-service/pom.xml
@@ -106,7 +106,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.webjars</groupId>
+      <groupId>org.webjars.npm</groupId>
       <artifactId>angular-ui-router</artifactId>
     </dependency>
 
@@ -116,27 +116,42 @@
     </dependency>
 
     <dependency>
-      <groupId>org.webjars</groupId>
+      <groupId>org.webjars.npm</groupId>
+      <artifactId>angular-cookies</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.webjars.npm</groupId>
+      <artifactId>angular-resource</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.webjars.npm</groupId>
+      <artifactId>angular-animate</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.webjars.npm</groupId>
       <artifactId>angular-sanitize</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.webjars</groupId>
+      <groupId>org.webjars.npm</groupId>
       <artifactId>jquery</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.webjars</groupId>
+      <groupId>org.webjars.npm</groupId>
       <artifactId>jquery-ui</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.webjars</groupId>
+      <groupId>org.webjars.npm</groupId>
       <artifactId>bootstrap</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.webjars</groupId>
+      <groupId>org.webjars.npm</groupId>
       <artifactId>font-awesome</artifactId>
     </dependency>
 

diff --git a/iam-login-service/src/main/webapp/WEB-INF/tags/iam/page.tag b/iam-login-service/src/main/webapp/WEB-INF/tags/iam/page.tag
@@ -25,7 +25,7 @@
 
 <link
   rel="stylesheet"
-  href="/webjars/bootstrap/css/bootstrap.min.css"></link>
+  href="/webjars/bootstrap/dist/css/bootstrap.min.css"></link>
 
 <link
   rel="stylesheet"

diff --git a/iam-login-service/src/main/webapp/WEB-INF/tags/iamHeader.tag b/iam-login-service/src/main/webapp/WEB-INF/tags/iamHeader.tag
@@ -13,7 +13,7 @@
 
 <link
   rel="stylesheet"
-  href="/webjars/bootstrap/css/bootstrap.min.css"></link>
+  href="/webjars/bootstrap/dist/css/bootstrap.min.css"></link>
 
 <link
   rel="stylesheet"

diff --git a/iam-login-service/src/main/webapp/WEB-INF/views/iam/cern/register.jsp b/iam-login-service/src/main/webapp/WEB-INF/views/iam/cern/register.jsp
@@ -22,8 +22,8 @@
 <t:page title="Register">
   <jsp:attribute name="footer">
     <script type="text/javascript" src="/webjars/angularjs/angular.min.js"></script>
-    <script type="text/javascript" src="/webjars/angularjs/angular-animate.js"></script>
-    <script type="text/javascript" src="/webjars/angularjs/angular-cookies.js"></script>
+    <script type="text/javascript" src="/webjars/angular-animate/angular-animate.min.js"></script>
+    <script type="text/javascript" src="/webjars/angular-cookies/angular-cookies.min.js"></script>
     <script type="text/javascript" src="/webjars/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
     <script type="text/javascript" src="${resourcesPrefix}/iam/apps/cern-registration/registration.app.js"></script>
     <script type="text/javascript" src="${resourcesPrefix}/iam/apps/cern-registration/registration.controller.js"></script>

diff --git a/iam-login-service/src/main/webapp/WEB-INF/views/iam/dashboard.jsp b/iam-login-service/src/main/webapp/WEB-INF/views/iam/dashboard.jsp
@@ -51,13 +51,12 @@
     <!-- /.content-wrapper -->
   </div>
   <!-- Libraries -->
-  <script type="text/javascript" src="<c:url value='/webjars/jquery/jquery.min.js'/>"></script>
+  <script type="text/javascript" src="<c:url value='/webjars/jquery/dist/jquery.min.js'/>"></script>
   <script type="text/javascript" src="<c:url value='/webjars/angularjs/angular.min.js'/>"></script>
-  <script type="text/javascript" src="<c:url value='/webjars/angularjs/angular-animate.js'/>"></script>
-  <script type="text/javascript" src="<c:url value='/webjars/angularjs/angular-resource.min.js'/>"></script>
-  <script type="text/javascript" src="<c:url value='/webjars/angularjs/angular-cookies.min.js'/>"></script>
-  <script type="text/javascript" src="<c:url value='/webjars/angular-ui-router/angular-ui-router.min.js'/>"></script>
+  <script type="text/javascript" src="<c:url value='/webjars/angular-ui-router/release/angular-ui-router.min.js'/>"></script>
   <script type="text/javascript" src="<c:url value='/webjars/angular-ui-select/select.min.js'/>"></script>
+  <script type="text/javascript" src="<c:url value='/webjars/angular-cookies/angular-cookies.min.js'/>"></script>
+  <script type="text/javascript" src="<c:url value='/webjars/angular-resource/angular-resource.min.js'/>"></script>
   <script type="text/javascript" src="<c:url value='/webjars/angular-sanitize/angular-sanitize.min.js'/>"></script>
   <script type="text/javascript" src="<c:url value='/webjars/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js'/>"></script>
 

diff --git a/iam-login-service/src/main/webapp/WEB-INF/views/iam/login.jsp b/iam-login-service/src/main/webapp/WEB-INF/views/iam/login.jsp
@@ -20,24 +20,16 @@
 <%@ taglib prefix="t" tagdir="/WEB-INF/tags/iam"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <t:page title="Log in">
-  <jsp:attribute name="footer">
+    <jsp:attribute name="footer">
         <script type="text/javascript" src="/webjars/angularjs/angular.min.js"></script>
-        <script type="text/javascript" src="/webjars/angularjs/angular-animate.js"></script>
+        <script type="text/javascript" src="/webjars/angular-animate/angular-animate.min.js"></script>
         <script type="text/javascript" src="/webjars/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
         <script type="text/javascript" src="${resourcesPrefix}/iam/js/passwordreset.app.js"></script>
         <script type="text/javascript" src="${resourcesPrefix}/iam/js/service/passwordreset.service.js"></script>
         <script type="text/javascript" src="${resourcesPrefix}/iam/js/controller/passwordreset.controller.js"></script>
         <script type="text/javascript">
-									angular
-											.element(document)
-											.ready(
-													function() {
-														angular
-																.bootstrap(
-																		document,
-																		[ 'passwordResetApp' ]);
-													});
-								</script>
+            angular.element(document).ready(function () { angular.bootstrap(document, ['passwordResetApp']); });
+        </script>
     </jsp:attribute>
   <jsp:body>
         <div id="login-error">
@@ -54,8 +46,8 @@
             <c:if test="${ param.error != null }">
                 <div class="alert alert-danger">
                     <strong>
-            <spring:message code="login.error" />
-          </strong>
+                        <spring:message code="login.error" />
+                    </strong>
                     <div>${SPRING_SECURITY_LAST_EXCEPTION.message}</div>
                 </div>
             </c:if>
@@ -69,7 +61,7 @@
 
         <div style="text-align: center">
             <h3>Welcome to <strong>${iamOrganisationName}</strong>
-      </h3>
+            </h3>
         </div>
 
         <c:if
@@ -221,21 +213,21 @@
         </c:if>
 
         <c:if test="${not empty IAM_X509_CRED && !IAM_X509_CRED.failedVerification()}">
-          <div id="x509-authn-info">
-            You have been successfully authenticated as<br>
-        <strong>${IAM_X509_CRED.subject}</strong>
-            <c:if test="${!IAM_X509_CAN_LOGIN}">
-              <p>
-              This certificate is not linked to any account in this organization
-              </p>
-            </c:if>
+            <div id="x509-authn-info">
+                You have been successfully authenticated as<br>
+                <strong>${IAM_X509_CRED.subject}</strong>
+                <c:if test="${!IAM_X509_CAN_LOGIN}">
+                    <p>
+                    This certificate is not linked to any account in this organization
+                    </p>
+                </c:if>
           </div>
         </c:if>
 
         <c:if test="${loginPageConfiguration.includeCustomContent}">
-          <div id="login-custom-content">
-            <c:import url="${loginPageConfiguration.customContentUrl}" />
-          </div>
+            <div id="login-custom-content">
+                <c:import url="${loginPageConfiguration.customContentUrl}" />
+            </div>
         </c:if>
-    </jsp:body>
+  </jsp:body>
 </t:page>
diff --git a/iam-login-service/src/main/webapp/WEB-INF/views/iam/register.jsp b/iam-login-service/src/main/webapp/WEB-INF/views/iam/register.jsp
@@ -16,28 +16,28 @@
 
 --%>
 <%@ taglib prefix="authz" uri="http://www.springframework.org/security/tags"%>
-    <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-        <%@ taglib prefix="t" tagdir="/WEB-INF/tags/iam"%>
-            <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="t" tagdir="/WEB-INF/tags/iam"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
-                <t:page title="Register">
-                    <jsp:attribute name="footer">
-                        <script type="text/javascript" src="/webjars/angularjs/angular.min.js"></script>
-                        <script type="text/javascript" src="/webjars/angularjs/angular-animate.js"></script>
-                        <script type="text/javascript" src="/webjars/angularjs/angular-cookies.js"></script>
-                        <script type="text/javascript" src="/webjars/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
-                        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/registration.app.js"></script>
-                        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/registration.controller.js"></script>
-                        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/registration.directive.js"></script>
-                        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/registration.service.js"></script>
-                        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/authn-info.service.js"></script>
-                        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/aup.service.js"></script>
-                        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/privacy-policy.service.js"></script>
-                    </jsp:attribute>
-                    <jsp:body>
-                        <div ng-app="registrationApp">
-                            <div ng-include src="'${resourcesPrefix}/iam/apps/registration/registration.html'">
-                            </div>
-                        </div>
-                    </jsp:body>
-                </t:page>
+<t:page title="Register">
+    <jsp:attribute name="footer">
+        <script type="text/javascript" src="/webjars/angularjs/angular.min.js"></script>
+        <script type="text/javascript" src="/webjars/angular-animate/angular-animate.min.js"></script>
+        <script type="text/javascript" src="/webjars/angular-cookies/angular-cookies.min.js'"></script>
+        <script type="text/javascript" src="/webjars/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
+        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/registration.app.js"></script>
+        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/registration.controller.js"></script>
+        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/registration.directive.js"></script>
+        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/registration.service.js"></script>
+        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/authn-info.service.js"></script>
+        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/aup.service.js"></script>
+        <script type="text/javascript" src="${resourcesPrefix}/iam/apps/registration/privacy-policy.service.js"></script>
+    </jsp:attribute>
+    <jsp:body>
+        <div ng-app="registrationApp">
+            <div ng-include src="'${resourcesPrefix}/iam/apps/registration/registration.html'">
+            </div>
+        </div>
+    </jsp:body>
+</t:page>
diff --git a/iam-login-service/src/main/webapp/WEB-INF/views/iam/resetPassword.jsp b/iam-login-service/src/main/webapp/WEB-INF/views/iam/resetPassword.jsp
@@ -20,8 +20,8 @@
 <t:page title="Reset password">
   <jsp:attribute name="footer">
     <script type="text/javascript" src="/webjars/angularjs/angular.min.js"></script>
-    <script type="text/javascript" src="/webjars/angularjs/angular-animate.js"></script>
-    <script type="text/javascript" src="/webjars/angularjs/angular-cookies.js"></script>
+    <script type="text/javascript" src="/webjars/angular-animate/angular-animate.min.js"></script>
+    <script type="text/javascript" src="/webjars/angular-cookies/angular-cookies.min.js"></script>
     <script type="text/javascript" src="/webjars/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
     <script type="text/javascript" src="${resourcesPrefix}/iam/js/passwordreset.app.js"></script>
     <script type="text/javascript" src="${resourcesPrefix}/iam/js/service/passwordreset.service.js"></script>

diff --git a/iam-login-service/src/main/webapp/WEB-INF/views/iam/samlDiscovery.jsp b/iam-login-service/src/main/webapp/WEB-INF/views/iam/samlDiscovery.jsp
@@ -24,8 +24,8 @@
 <t:page title="Log in">
   <jsp:attribute name="footer">
     <script type="text/javascript" src="/webjars/angularjs/angular.min.js"></script>
-    <script type="text/javascript" src="/webjars/angularjs/angular-animate.js"></script>
-    <script type="text/javascript" src="/webjars/angularjs/angular-cookies.js"></script>
+    <script type="text/javascript" src="/webjars/angular-animate/angular-animate.min.js"></script>
+    <script type="text/javascript" src="/webjars/angular-cookies/angular-cookies.min.js"></script>
     <script type="text/javascript" src="/webjars/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
     <script type="text/javascript" src="${resourcesPrefix}/iam/apps/saml-discovery/discovery.app.js"></script>
     <script type="text/javascript" src="${resourcesPrefix}/iam/apps/saml-discovery/discovery.component.js"></script>