#657 implement code url

build.gradle

@@ -131,7 +131,7 @@ dependencies {
     compile "org.springframework.security:spring-security-web:$springSecurityConfigVersion"
     compile "org.springframework.security:spring-security-config:$springSecurityConfigVersion"
     compile 'org.springframework.session:spring-session:1.3.5.RELEASE'
-    compile "ch.digitalfondue.npjt-extra:npjt-extra:2.0.0"
+    compile "ch.digitalfondue.npjt-extra:npjt-extra:2.0.1"
     compile "com.samskivert:jmustache:1.14"
     compile "com.github.sps.mustache:mustache-spring-view:1.4"
     compile "javax.mail:mail:1.5.0-b01"

gradle.properties

@@ -14,4 +14,4 @@ junitVersion=5.1.0
 systemProp.jdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2"
 
 # https://jitpack.io/#alfio-event/alf.io-public-frontend -> go to commit tab, set the version
-alfioPublicFrontendVersion=c397155127
+alfioPublicFrontendVersion=328724c45d

src/main/java/alfio/controller/FileController.java

@@ -54,7 +54,9 @@ public void showFile(@PathVariable("digest") String digest, HttpServletRequest r
                 response.setContentLength(metadata.getContentSize());
                 response.setHeader("ETag", digest);
                 response.setHeader("Cache-Control", MAX_AGE_6_MONTH);
-                manager.outputFile(digest, response.getOutputStream());
+                try (var os = response.getOutputStream()) {
+                    manager.outputFile(digest, os);
+                }
             }
         } else {
             response.sendError(HttpServletResponse.SC_NOT_FOUND);

src/main/java/alfio/controller/IndexController.java

@@ -31,14 +31,17 @@
 import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.Principal;
+import java.util.Map;
 
 import static alfio.model.system.ConfigurationKeys.ENABLE_CAPTCHA_FOR_LOGIN;
 
@@ -102,6 +105,14 @@ public void replyToIndex(HttpServletResponse response) throws IOException {
         }
     }
 
+    @RequestMapping("/event/{eventShortName}/code/{code}")
+    public String redirectCode(@PathVariable("eventShortName") String eventName,
+                             @PathVariable("code") String code) {
+        return "redirect:" + UriComponentsBuilder.fromPath("/api/v2/public/event/{eventShortName}/code/{code}")
+            .build(Map.of("eventShortName", eventName, "code", code))
+            .toString();
+    }
+
 
     // login related
     @RequestMapping(value="/authentication", method = RequestMethod.GET)

src/main/java/alfio/controller/api/admin/EventApiController.java

@@ -16,7 +16,6 @@
  */
 package alfio.controller.api.admin;
 
-import alfio.controller.api.support.DescriptionsLoader;
 import alfio.controller.api.support.EventListItem;
 import alfio.controller.api.support.PageAndContent;
 import alfio.controller.api.support.TicketHelper;
@@ -34,6 +33,7 @@
 import alfio.model.user.Role;
 import alfio.model.user.User;
 import alfio.repository.DynamicFieldTemplateRepository;
+import alfio.repository.EventDescriptionRepository;
 import alfio.repository.SponsorScanRepository;
 import alfio.repository.TicketFieldRepository;
 import alfio.util.*;
@@ -93,7 +93,7 @@ public class EventApiController {
     private final I18nManager i18nManager;
     private final TicketReservationManager ticketReservationManager;
     private final TicketFieldRepository ticketFieldRepository;
-    private final DescriptionsLoader descriptionsLoader;
+    private final EventDescriptionRepository eventDescriptionRepository;
     private final TicketHelper ticketHelper;
     private final DynamicFieldTemplateRepository dynamicFieldTemplateRepository;
     private final UserManager userManager;
@@ -138,7 +138,7 @@ public List<EventListItem> getAllEventsForExternal(Principal principal, HttpServ
         return eventManager.getActiveEvents().stream()
             .filter(e -> userOrganizations.contains(e.getOrganizationId()))
             .sorted(Comparator.comparing(e -> e.getBegin().withZoneSameInstant(ZoneId.systemDefault())))
-            .map(s -> new EventListItem(s, request.getContextPath(), descriptionsLoader.eventDescriptions().load(s)))
+            .map(s -> new EventListItem(s, request.getContextPath(), eventDescriptionRepository.findByEventId(s.getId())))
             .collect(toList());
     }
 

src/main/java/alfio/controller/api/pass/PassKitApiController.java

@@ -52,9 +52,9 @@ public void getLatestVersion(@PathVariable("eventName") String eventName,
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
         } else {
             Pair<EventAndOrganizationId, Ticket> pair = validationResult.get();
-            try {
+            try (var os = response.getOutputStream()) {
                 response.setContentType("application/vnd.apple.pkpass");
-                passKitManager.writePass(pair.getRight(), pair.getLeft(), response.getOutputStream());
+                passKitManager.writePass(pair.getRight(), pair.getLeft(), os);
             } catch (Exception e) {
                 log.warn("Error during pass generation", e);
                 response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);