add empty UrlBasedViewResolver to resolve "redirect:" URLs

cbellone · cbellone · commit ab0e4961cff2 · 2019-08-17T20:54:23.000+02:00
diff --git a/src/main/java/alfio/config/MvcConfiguration.java b/src/main/java/alfio/config/MvcConfiguration.java
@@ -38,8 +38,11 @@
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.*;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.servlet.view.AbstractUrlBasedView;
+import org.springframework.web.servlet.view.UrlBasedViewResolver;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -149,4 +152,11 @@ public ObjectMapper objectMapper() {
     public CommonsMultipartResolver multipartResolver() {
         return new CommonsMultipartResolver();
     }
+
+    @Bean
+    public ViewResolver viewResolver() {
+        var resolver = new UrlBasedViewResolver();
+        resolver.setViewClass(AbstractUrlBasedView.class);
+        return resolver;
+    }
 }
diff --git a/src/main/java/alfio/manager/payment/StripeConnectManager.java b/src/main/java/alfio/manager/payment/StripeConnectManager.java
@@ -66,7 +66,7 @@ public StripeConnectURL getConnectURL(int organizationId) {
         var options = configurationManager.getFor(Set.of(STRIPE_SECRET_KEY, STRIPE_CONNECT_CLIENT_ID, STRIPE_CONNECT_CALLBACK, BASE_URL), ConfigurationLevel.organization(organizationId));
         String secret = options.get(STRIPE_SECRET_KEY).getRequiredValue();
         String clientId = options.get(STRIPE_CONNECT_CLIENT_ID).getRequiredValue();
-        String callbackURL = options.get(STRIPE_CONNECT_CALLBACK).getValueOrDefault(options.get(BASE_URL).getRequiredValue()) + CONNECT_REDIRECT_PATH;
+        String callbackURL = options.get(STRIPE_CONNECT_CALLBACK).getValueOrDefault(options.get(BASE_URL).getRequiredValue() + CONNECT_REDIRECT_PATH);
         String state = extensionManager.generateStripeConnectStateParam(organizationId).orElse(UUID.randomUUID().toString());
         String code = UUID.randomUUID().toString();
         OAuthConfig config = new OAuthConfig(clientId, secret, callbackURL, "read_write", null, state, "code", null, null, null);
diff --git a/src/main/resources/public/error/400.html b/src/main/resources/public/error/400.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="initial-scale=1, minimum-scale=1, width=device-width">
+        <title>Error 400</title>
+        <style>
+            body {background-color: #e5e5e5;font-family:sans-serif}
+            @media (min-width: 1200px) {.container {width: 960px;}}
+            @media (min-width: 576px) {.container {max-width: 100%;}}
+            @media (min-width: 1200px) {.container {max-width: 1140px;}}
+            @media (min-width: 992px) {.container {max-width: 960px;}}
+            @media (min-width: 768px) {.container {max-width: 720px;}}
+            @media (min-width: 576px) {.container {max-width: 540px;}}
+            .container {
+                width: 100%;
+                padding: 15px;
+                margin-right: auto;
+                margin-left: auto;
+                background-color: white;
+            }
+            *, ::after, ::before {
+                box-sizing: border-box;
+            }
+            .img-responsive {
+                display: block;
+                max-width: 100%;
+                height: auto;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="container">
+            <img class="img-responsive" src="/resources/images/error-picard-riker.jpg">
+            <div>
+                <h1>D'oh!</h1>
+                <h2>Error 400</h2>
+                <p>An unexpected error has occurred. Please report the issue to the organizers.</p>
+            </div>
+        </div>
+    </body>
+</html>
