Fixes #659

Author: oharsta

dashboard-gui/pom.xml

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

dashboard-gui/src/javascripts/shapes/app.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types'
 
 export const AppShape = PropTypes.shape({
   name: PropTypes.string.isRequired,
-  supportMail: PropTypes.string,
   supportUrl: PropTypes.string,
   appUrl: PropTypes.string,
   websiteUrl: PropTypes.string,

dashboard-server/pom.xml

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

dashboard-server/src/main/java/dashboard/control/ServicesController.java

@@ -149,7 +149,6 @@ public List<String[]> download(@RequestBody Map<String, Object> body,
                             stripBreakingWhitespace(service.getDescription()),
                             service.getAppUrl(),
                             service.getWikiUrl(),
-                            service.getSupportMail(),
                             String.valueOf(service.isConnected()),
                             licenseStatus != null ? licenseStatus.name() : LicenseStatus.UNKNOWN.name(),
                             String.valueOf(service.isExampleSingleTenant()),
@@ -184,7 +183,6 @@ public ResponseEntity<RestResponse<Service>> get(@RequestHeader(HTTP_X_IDP_ENTIT
                 .valueOf(entityType), locale);
         CoinUser currentUser = SpringSecurity.getCurrentUser();
         return serviceByEntityId
-                .map(service -> service.sanitize(currentUser))
                 .map(service -> ResponseEntity.ok(createRestResponse(service)))
                 .orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND));
     }

dashboard-server/src/main/java/dashboard/control/UsersController.java

@@ -285,7 +285,6 @@ public ResponseEntity<RestResponse<Map<String, List<?>>>> idps() {
     public RestResponse<List<Service>> serviceProviders(Locale locale) throws IOException {
         CoinUser currentUser = SpringSecurity.getCurrentUser();
         List<Service> usersServices = getServiceProvidersForCurrentUser(locale).stream()
-                .map(service -> service.sanitize(currentUser))
                 .toList();
 
         return createRestResponse(usersServices);

dashboard-server/src/main/java/dashboard/domain/Service.java

@@ -49,7 +49,6 @@ public class Service implements Comparable<Service>, Serializable {
     private String supportUrl;
     private String eulaUrl;
     private String wikiUrl;
-    private String supportMail;
     private String enduserDescription;
     private String institutionDescription;
     private String institutionId;
@@ -238,14 +237,6 @@ public void setScreenshotUrls(List<String> screenshotUrls) {
         this.screenshotUrls = screenshotUrls;
     }
 
-    public String getSupportMail() {
-        return supportMail;
-    }
-
-    public void setSupportMail(String supportMail) {
-        this.supportMail = supportMail;
-    }
-
     public String getEnduserDescription() {
         return enduserDescription;
     }
@@ -334,11 +325,6 @@ public void setWikiUrl(String wikiUrl) {
         this.wikiUrl = wikiUrl;
     }
 
-
-    public void setPublishInEdugainDate(String publishInEdugainDate) {
-        this.publishInEdugainDate = publishInEdugainDate;
-    }
-
     public LicenseStatus getLicenseStatus() {
         return licenseStatus;
     }
@@ -619,10 +605,4 @@ public void setOrganisation(String organisation) {
         this.organisation = organisation;
     }
 
-    public Service sanitize(CoinUser currentUser) {
-        if (currentUser.isGuest() || currentUser.isDashboardViewer()) {
-            this.setSupportMail(null);
-        }
-        return this;
-    }
 }

dashboard-server/src/main/java/dashboard/service/impl/ServicesImpl.java

@@ -124,7 +124,6 @@ private void plainProperties(ServiceProvider sp, Service service) {
         service.setEulaUrl(sp.getEulaURL());
         service.setDetailLogoUrl(sp.getLogoUrl());
         service.setLogoUrl(sp.getLogoUrl());
-        service.setSupportMail(mailOfContactPerson(sp.getContactPerson(ContactPersonType.support)));
         Map<String, String> homeUrls = sp.getHomeUrls();
         service.setWebsiteUrl(CollectionUtils.isEmpty(homeUrls) ? null : homeUrls.values().iterator().next());
         service.setArp(sp.getArp());
@@ -139,7 +138,6 @@ private void plainProperties(ServiceProvider sp, Service service) {
         service.setEntityCategories1(sp.getEntityCategories1());
         service.setEntityCategories2(sp.getEntityCategories2());
         service.setEntityCategories3(sp.getEntityCategories3());
-        service.setPublishInEdugainDate(sp.getPublishInEdugainDate());
         service.setStrongAuthentication(sp.isStrongAuthenticationEnabled());
         service.setMinimalLoaLevel(sp.getMinimalLoaLevel());
         service.setNames(sp.getNames());

pom.xml

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