Release 13.0.10

Author: oharsta

dashboard-gui/pom.xml

@@ -2,7 +2,7 @@
    <parent>
        <groupId>org.openconext</groupId>
        <artifactId>dashboard</artifactId>
-       <version>13.0.9</version>
+       <version>13.0.10</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
     <modelVersion>4.0.0</modelVersion>

dashboard-gui/src/javascripts/api/index.js

@@ -285,17 +285,17 @@ export function sendChangeRequest(data) {
 }
 
 export function loginTimeFrame(from, to, scale, spEntityId) {
-  const sp = !isEmpty(spEntityId) ? `&spEntityId=${spEntityId}` : ''
+  const sp = !isEmpty(spEntityId) ? `&spEntityId=${encodeURIComponent(spEntityId)}` : ''
   return fetchJson(`/stats/loginTimeFrame?from=${from}&to=${to}&scale=${scale}&${sp}`)
 }
 
 export function loginAggregated(period, spEntityId) {
-  const sp = !isEmpty(spEntityId) ? `&spEntityId=${spEntityId}` : ''
+  const sp = !isEmpty(spEntityId) ? `&spEntityId=${encodeURIComponent(spEntityId)}` : ''
   return fetchJson(`/stats/loginAggregated?period=${period}${sp}`)
 }
 
 export function uniqueLoginCount(from, to, spEntityId) {
-  return fetchJson(`/stats/uniqueLoginCount?from=${from}&to=${to}&spEntityId=${spEntityId}`)
+  return fetchJson(`/stats/uniqueLoginCount?from=${from}&to=${to}&spEntityId=${encodeURIComponent(spEntityId)}`)
 }
 
 export function exportApps(idp, ids) {

dashboard-server/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>dashboard</artifactId>
-        <version>13.0.9</version>
+        <version>13.0.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

dashboard-server/src/main/java/dashboard/stats/StatsImpl.java

@@ -2,11 +2,12 @@
 
 import com.google.common.collect.ImmutableList;
 import dashboard.control.Constants;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.client.RestTemplate;
 
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Optional;
 
@@ -16,10 +17,9 @@
 @SuppressWarnings("unchecked")
 public class StatsImpl implements Stats, Constants {
 
-    private RestTemplate restTemplate;
-    private String baseUrl;
+    private final RestTemplate restTemplate;
+    private final String baseUrl;
 
-    @Autowired
     public StatsImpl(@Value("${statsUser}") String user,
                      @Value("${statsPassword}") String password,
                      @Value("${statsBaseUrl}") String baseUrl) {
@@ -37,25 +37,32 @@ public StatsImpl(@Value("${statsUser}") String user,
     }
 
     public List<Object> loginTimeFrame(long from, long to, String scale, Optional<String> spEntityIdOptional) {
+        String idp = currentIdPEncoded();
         StringBuilder url = new StringBuilder(String.format(
                 "%s/public/login_time_frame?from=%s&to=%s&include_unique=true&scale=%s&epoch=ms&idp_id=%s",
-                baseUrl, from, to, scale, currentUserIdp()));
+                baseUrl, from, to, scale, idp));
         spEntityIdOptional.ifPresent(spEntityId -> url.append(String.format("&sp_id=%s", spEntityId)));
         return restTemplate.getForEntity(url.toString(), List.class).getBody();
     }
 
+    private String currentIdPEncoded() {
+        return URLEncoder.encode(currentUserIdp(), Charset.defaultCharset());
+    }
+
     public List<Object> loginAggregated(String period, Optional<String> spEntityIdOptional) {
+        String idp = currentIdPEncoded();
         StringBuilder url = new StringBuilder(String.format(
                 "%s/public/login_aggregated?period=%s&include_unique=true&idp_id=%s&group_by=sp_id",
-                baseUrl, period, currentUserIdp()));
+                baseUrl, period, idp));
         spEntityIdOptional.ifPresent(spEntityId -> url.append(String.format("&sp_id=%s", spEntityId)));
         return restTemplate.getForEntity(url.toString(), List.class).getBody();
     }
 
     public List<Object> uniqueLoginCount(long from, long to, String spEntityId) {
+        String idp = currentIdPEncoded();
         String url = String.format(
                 "%s/public/unique_login_count?from=%s&to=%s&include_unique=true&epoch=ms&idp_id=%s&sp_id=%s",
-                baseUrl, from, to, currentUserIdp(), spEntityId);
+                baseUrl, from, to, idp, spEntityId);
         return restTemplate.getForEntity(url, List.class).getBody();
     }
 

pom.xml

@@ -31,7 +31,7 @@
 
     <groupId>org.openconext</groupId>
     <artifactId>dashboard</artifactId>
-    <version>13.0.9</version>
+    <version>13.0.10</version>
     <name>dashboard</name>
     <description>OpenConext-Dashboard</description>
     <inceptionYear>2012</inceptionYear>