From 0d940fc7d73430f32e5026b145cf84fb151a6e05 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 29 Oct 2018 11:20:48 -0300
Subject: [PATCH] [headless] Set up access manager before starting server

This became necesary to due an upstream change we missed when bumping
the dependency:

https://github.com/tipsy/javalin/commit/ab19ff91b7963313479779636c557770d93a5098
---
 .../src/main/java/org/briarproject/briar/headless/Router.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
index c155fcfd9a..a4b32432f7 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
@@ -52,7 +52,6 @@ constructor(
             .event(SERVER_START_FAILED) {serverStopped() }
             .event(SERVER_STOPPED) { serverStopped() }
         if (debug) app.enableDebugLogging()
-        app.start()
 
         app.accessManager { handler, ctx, _ ->
             if (ctx.header(AUTHORIZATION) == "Bearer $authToken") {
@@ -102,6 +101,7 @@ constructor(
                 webSocketController.sessions.remove(session)
             }
         }
+        app.start()
     }
 
     private fun serverStopped() {
-- 
GitLab