Merge branch 'nickmelis-issues/269' into develop

Author: LEDfan

src/main/java/eu/openanalytics/shinyproxy/controllers/IndexController.java

@@ -40,6 +40,23 @@
 @Controller
 public class IndexController extends BaseController {
 
+    /**
+     * Allows users on a ShinyProxy deployment <b>with only one app defined</b> to be redirected straight
+     * to the only existing app, without going through the Index page.
+     */
+    private static final String PROXY_LANDING_PAGE_SINGLE_APP_OPTION = "SingleApp";
+
+    /**
+     * Allows users on any ShinyProxy deployment to be redirected straight to the first available app,
+     * without going through the Index page.
+     */
+    private static final String PROXY_LANDING_PAGE_FIRST_APP_OPTION = "FirstApp";
+
+    /**
+     * Redirects users on a ShinyProxy deployment to the index page.
+     */
+    private static final String PROXY_LANDING_PAGE_INDEX_OPTION = "/";
+
     @Inject
     private ShinyProxySpecProvider shinyProxySpecProvider;
 
@@ -58,11 +75,25 @@ public void init() {
 
     @RequestMapping("/")
     private Object index(ModelMap map, HttpServletRequest request) {
-        if (!landingPage.equals("/")) return new RedirectView(landingPage);
+        if (!landingPage.equals(PROXY_LANDING_PAGE_INDEX_OPTION)
+            && !landingPage.equals(PROXY_LANDING_PAGE_SINGLE_APP_OPTION)
+            && !landingPage.equals(PROXY_LANDING_PAGE_FIRST_APP_OPTION)) {
+            return new RedirectView(landingPage, true);
+        }
+
+        List<ProxySpec> apps = proxyService.getUserSpecs();
+
+        // If set to `FirstApp`, redirect to the first app available to the logged-in user
+        if (!apps.isEmpty() && landingPage.equals(PROXY_LANDING_PAGE_FIRST_APP_OPTION)) {
+            return new RedirectView("/app/" + apps.get(0).getId(), true);
+        }
+        // If set to `SingleApp` and only one app is available to the logged-in user, redirect to it
+        if (apps.size() == 1 && landingPage.equals(PROXY_LANDING_PAGE_SINGLE_APP_OPTION)) {
+            return new RedirectView("/app/" + apps.get(0).getId(), true);
+        }
 
         prepareMap(map, request);
 
-        List<ProxySpec> apps = proxyService.getUserSpecs();
         map.put("apps", apps);
 
         // app logos