Added super user endpoint to fix null landing pages

Author: oharsta

client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.12</version>
+        <version>1.1.13</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>invite-client</artifactId>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openconext</groupId>
     <artifactId>invite</artifactId>
-    <version>1.1.12</version>
+    <version>1.1.13</version>
     <packaging>pom</packaging>
     <name>invite</name>
     <description>SURFconext Invite</description>

provisioning-mock/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.12</version>
+        <version>1.1.13</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>provisioning-mock</artifactId>

server/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.12</version>
+        <version>1.1.13</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>invite-server</artifactId>

server/src/main/java/invite/api/SystemController.java

@@ -4,10 +4,14 @@
 import invite.cron.ResourceCleaner;
 import invite.cron.RoleExpirationNotifier;
 import invite.exception.NotAllowedException;
+import invite.manage.EntityType;
 import invite.manage.Manage;
+import invite.model.Application;
+import invite.model.ApplicationUsage;
 import invite.model.Role;
 import invite.model.User;
 import invite.model.UserRole;
+import invite.repository.ApplicationUsageRepository;
 import invite.repository.RoleRepository;
 import invite.repository.UserRoleRepository;
 import invite.security.UserPermissions;
@@ -20,6 +24,8 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.Serializable;
@@ -46,21 +52,24 @@ public class SystemController {
     private final Manage manage;
     private final PerformanceSeed performanceSeed;
     private final Config config;
+    private final ApplicationUsageRepository applicationUsageRepository;
 
     public SystemController(ResourceCleaner resourceCleaner,
                             RoleExpirationNotifier roleExpirationNotifier,
                             RoleRepository roleRepository,
                             UserRoleRepository userRoleRepository,
                             Manage manage,
                             PerformanceSeed performanceSeed,
-                            Config config) {
+                            Config config,
+                            ApplicationUsageRepository applicationUsageRepository) {
         this.resourceCleaner = resourceCleaner;
         this.roleExpirationNotifier = roleExpirationNotifier;
         this.roleRepository = roleRepository;
         this.userRoleRepository = userRoleRepository;
         this.manage = manage;
         this.performanceSeed = performanceSeed;
         this.config = config;
+        this.applicationUsageRepository = applicationUsageRepository;
     }
 
     @GetMapping("/cron/cleanup")
@@ -111,4 +120,27 @@ public ResponseEntity<Map<String, Object>> performanceSeed(@Parameter(hidden = t
         return ResponseEntity.ok(performanceSeed.go(numberOfRole, numberOfUsers));
     }
 
+    @GetMapping("/landing-page-fix")
+    public ResponseEntity<Map<String, Integer>> landingPageFix(@Parameter(hidden = true) User user) {
+        LOG.debug(String.format("landing-page-fix for user %s", user.getEduPersonPrincipalName()));
+        UserPermissions.assertSuperUser(user);
+
+        List<ApplicationUsage> applicationUsages = applicationUsageRepository.findByLandingPageIsNull();
+        applicationUsages.stream()
+                .forEach(applicationUsage -> {
+                    Application application = applicationUsage.getApplication();
+                    Map<String, Object> provider = manage.providerById(application.getManageType(), application.getManageId());
+                    if (!CollectionUtils.isEmpty(provider)) {
+                        String url = (String) provider.get("url");
+                        if (StringUtils.hasText(url)) {
+                            applicationUsage.setLandingPage(url);
+                            LOG.debug(String.format("Saving applicationUsage with url %s", url));
+                            applicationUsageRepository.save(applicationUsage);
+                        }
+                    }
+                });
+
+        return Results.okResult();
+    }
+
 }

server/src/main/java/invite/repository/ApplicationUsageRepository.java

@@ -5,6 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
@@ -13,4 +14,6 @@ public interface ApplicationUsageRepository extends JpaRepository<ApplicationUsa
     Optional<ApplicationUsage> findByRoleIdAndApplicationManageIdAndApplicationManageTypeOrderByApplicationId(
             Long roleId, String manageId, EntityType manageType);
 
+    List<ApplicationUsage> findByLandingPageIsNull();
+
 }

welcome/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>1.1.12</version>
+        <version>1.1.13</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>invite-welcome</artifactId>