syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From giacom...@apache.org
Subject syncope git commit: [SYNCOPE-719] Aligning libraries version names in the index.html; Fixing client error during session management
Date Mon, 08 Feb 2016 10:15:30 GMT
Repository: syncope
Updated Branches:
  refs/heads/master 3f67d791e -> 38a9f51ea


[SYNCOPE-719] Aligning libraries version names in the index.html; Fixing client error during
session management


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/38a9f51e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/38a9f51e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/38a9f51e

Branch: refs/heads/master
Commit: 38a9f51ea4f15c1a0c9ed2b1ae96009691950417
Parents: 3f67d79
Author: giacomolm <giacomolm@hotmail.it>
Authored: Mon Feb 8 11:14:21 2016 +0100
Committer: giacomolm <giacomolm@hotmail.it>
Committed: Mon Feb 8 11:14:36 2016 +0100

----------------------------------------------------------------------
 .../client/enduser/SyncopeEnduserSession.java       |  7 ++++---
 .../resources/META-INF/resources/app/index.html     | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/38a9f51e/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
index e61f1f6..b1cf987 100644
--- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
+++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
@@ -63,9 +63,9 @@ public class SyncopeEnduserSession extends WebSession {
     private UserTO selfTO;
 
     private final Map<Class<?>, Object> services = Collections.synchronizedMap(new
HashMap<Class<?>, Object>());
-    
+
     private final CookieUtils cookieUtils;
-    
+
     private boolean xsrfTokenGenerated = false;
 
     public static SyncopeEnduserSession get() {
@@ -120,7 +120,8 @@ public class SyncopeEnduserSession extends WebSession {
         if (services.containsKey(serviceClass)) {
             service = (T) services.get(serviceClass);
         } else {
-            service = client == null ? anonymousClient.getService(serviceClass) : client.getService(serviceClass);
+            service = (client == null || !isAuthenticated()) ? anonymousClient.getService(serviceClass)
: client.
+                    getService(serviceClass);
             services.put(serviceClass, service);
         }
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/38a9f51e/client/enduser/src/main/resources/META-INF/resources/app/index.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/index.html b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 0ead967..d9da780 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -53,20 +53,20 @@ under the License.
     <script type="text/javascript" src="../webjars/jquery/${jquery.version}/jquery.js"></script>
     <script src="../webjars/angular/${angular.version}/angular.js"></script>
     <script src="../webjars/angular-ui-router/${angular-ui-router.version}/angular-ui-router.js"></script>
-    <script src="../webjars/angular-animate/${angular-animate.version}/angular-animate.js"></script>
-    <script src="../webjars/angular-resource/${angular-resource.version}/angular-resource.js"></script>
-    <script src="../webjars/angular-cookies/${angular-cookies.version}/angular-cookies.js"></script>
-    <script src="../webjars/angular-sanitize/${angular-sanitize.version}/angular-sanitize.js"></script>
+    <script src="../webjars/angular-animate/${angular.version}/angular-animate.js"></script>
+    <script src="../webjars/angular-resource/${angular.version}/angular-resource.js"></script>
+    <script src="../webjars/angular-cookies/${angular.version}/angular-cookies.js"></script>
+    <script src="../webjars/angular-sanitize/${angular.version}/angular-sanitize.js"></script>
     <script src="../webjars/angular-ui-bootstrap/${angular-ui-bootstrap.version}/ui-bootstrap-tpls.js"></script>
     <script src="../webjars/angular-ui-select/${angular-ui-select.version}/select.js"></script>
     <script src="../webjars/kendo-ui-core/${kendo-ui-core.version}/js/kendo.ui.core.min.js"></script>
     <script src="../webjars/kendo-ui-core/${kendo-ui-core.version}/js/kendo.notification.min.js"></script>
     <script src="../webjars/kendo-ui-core/${kendo-ui-core.version}/js/kendo.angular.js"></script>
     <script src="../webjars/angular-treasure-overlay-spinner/${angular-treasure-overlay-spinner.version}/dist/treasure-overlay-spinner.min.js"></script>
-    <script src="../webjars/ng-password-strength/${ng-password-strength}/dist/scripts/ng-password-strength.min.js"></script>
+    <script src="../webjars/ng-password-strength/${ng-password-strength.version}/dist/scripts/ng-password-strength.min.js"></script>
     <script type="text/javascript" src="../webjars/bootstrap-select/${bootstrap-select.version}/js/bootstrap-select.min.js"></script>
-    <script src="../webjars/FileSaver.js/${FileSaver.version}/FileSaver.js" type="text/javascript"></script>
-    <script src="../webjars/lodash/${lodash}/lodash.min.js"></script>
+    <script src="../webjars/FileSaver.js/${fileSaver.version}/FileSaver.js" type="text/javascript"></script>
+    <script src="../webjars/lodash/${lodash.version}/lodash.min.js"></script>
     <!--main angular application-->
     <script src="js/app.js"></script>
     <!--services-->
@@ -120,7 +120,7 @@ under the License.
     <link href="../webjars//kendo-ui-core/${kendo-ui-core.version}/styles/web/kendo.common.core.min.css"
rel="stylesheet" type="text/css"/>
     <link href="../webjars//kendo-ui-core/${kendo-ui-core.version}/styles/web/kendo.default.min.css"
rel="stylesheet" type="text/css"/>
     <link href="../webjars/angular-treasure-overlay-spinner/${angular-treasure-overlay-spinner.version}/dist/treasure-overlay-spinner.min.css"
rel="stylesheet" type="text/css"/>
-    <link href="../webjars/ng-password-strength/${ng-password-strength}/dist/styles/main.css"
rel="stylesheet" type="text/css">
+    <link href="../webjars/ng-password-strength/${ng-password-strength.version}/dist/styles/main.css"
rel="stylesheet" type="text/css">
     <link href="../webjars/select2/${select2.version}/select2.css" rel="stylesheet" />
     <link href="css/app.css" rel="stylesheet" type="text/css" />
     <link href="css/login.css" rel="stylesheet" type="text/css" />


Mime
View raw message