From b402a8eb6d84034f72ace44ec33f74d992c3e2d3 Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jdb@jdb-labs.com>
Date: Sun, 23 Apr 2017 00:19:32 -0500
Subject: [PATCH] Fix jester options (port, appName).

---
 src/main/nim/strawbosspkg/core.nim   |  2 +-
 src/main/nim/strawbosspkg/server.nim | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/nim/strawbosspkg/core.nim b/src/main/nim/strawbosspkg/core.nim
index 6deb49c..f939d68 100644
--- a/src/main/nim/strawbosspkg/core.nim
+++ b/src/main/nim/strawbosspkg/core.nim
@@ -1,4 +1,4 @@
-import logging, nre, os, osproc, sequtils, streams, strtabs, strutils, tables, tempfile
+import logging, nre, os, osproc, sequtils, streams, strtabs, strutils, tables
 
 import private/util
 import configuration
diff --git a/src/main/nim/strawbosspkg/server.nim b/src/main/nim/strawbosspkg/server.nim
index b8d12c7..4aa28e8 100644
--- a/src/main/nim/strawbosspkg/server.nim
+++ b/src/main/nim/strawbosspkg/server.nim
@@ -3,9 +3,6 @@ import asyncdispatch, bcrypt, jester, json, jwt, os, osproc, sequtils, tempfile,
 
 import ./configuration, ./core, private/util
 
-settings:
-  port = Port(8180)
-
 type Worker = object
   process*: Process
   workingDir*: string
@@ -114,23 +111,26 @@ proc start*(givenCfg: StrawBossConfig): void =
   let stopFuture = newFuture[void]()
   var workers: seq[Worker] = @[]
 
+  settings:
+    port = Port(8180)
+    appName = "/api"
+
   routes:
-    get "/api/ping":
+    get "/ping":
       resp($(%*"pong"), "application/json")
 
-    get "/api/auth-token":
-      resp(Http501, makeJsonResp(Http501), "application/json")
+    get "/auth-token":
+      echo $request.params
+      try:
+        let authToken = makeAuthToken(givenCfg, @"username", @"password")
+        resp("\"" & $authToken & "\"", "application/json")
+      except: resp(Http401, makeJsonResp(Http401, getCurrentExceptionMsg()))
 
-    get "/api/projects":
+    get "/projects":
       requireAuth()
       resp($(%(givenCfg.projects)), "application/json")
 
-    get "/api/auth-token":
-      try:
-        let authToken = makeAuthToken(givenCfg, @"username", @"password")
-      except: resp(Http401, makeJsonResp(Http401, getCurrentExceptionMsg()))
-
-    post "/api/project/@projectName/@stepName/run/@buildRef?":
+    post "/project/@projectName/@stepName/run/@buildRef?":
       workers.add(spawnWorker(RunRequest(
         projectName: @"projectName",
         stepName: @"stepName",