Url amendments, really we need config...

RawToast · Apr 1, 2018 · ebec7d7 · ebec7d7
1 parent 5e3b80b
commit ebec7d7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/dokusho-server/src/main/scala/Main.scala b/dokusho-server/src/main/scala/Main.scala
@@ -33,7 +33,7 @@ object Main extends StreamApp[IO]  {
     BlazeBuilder[IO]
       .bindHttp(8080, "0.0.0.0")
       .mountService(historyService.routes, "/")
-      .mountService(authHistory, "/authed")
+      .mountService(authHistory, "/authed/")
       .withBanner(ServerBuilder.DefaultBanner)
       .serve
 }
diff --git a/dokusho-server/src/main/scala/dokusho/ReadingHistoryRouter.scala b/dokusho-server/src/main/scala/dokusho/ReadingHistoryRouter.scala
@@ -46,7 +46,7 @@ class AltReadingHistoryRouter(readingHistoryService: ReadingHistoryService) exte
     IO(req.headers.find(_.name == CaseInsensitiveString("User")).map(_.value))
 
   implicit private def routeWithErrorHandling(io: OptionT[IO, IO[Response[IO]]]): IO[Response[IO]] =
-    io.value.flatMap(_.getOrElse(Ok("Hey")))
+    io.value.flatMap(_.getOrElse(NotFound()))
 
   val routes: HttpService[IO] = HttpService[IO] {
     case req@GET -> Root / "history" =>

diff --git a/dokusho/src/app/Client.re b/dokusho/src/app/Client.re
@@ -26,7 +26,7 @@ module Client = {
   let userHistory = (userId:string) => {
     Js.Console.log("Get history " ++ accessToken());
     Js.Promise.(
-      Fetch.fetchWithInit(backendURI ++ "/history/" ++ userId,
+      Fetch.fetchWithInit(backendURI ++ "/authed/history",
         Fetch.RequestInit.make(
           ~method_=Get,
           ~headers=authHeader(),
@@ -39,7 +39,7 @@ module Client = {
   /* Adds a new reading entry for today to a user's reading history */
   let newEntry = (userId:string, kind: pageType, value: int) => {
     Js.Promise.(
-      Fetch.fetchWithInit(backendURI ++ "/history/" ++ userId ++ "/add",
+      Fetch.fetchWithInit(backendURI ++ "/authed/history/add",
       Fetch.RequestInit.make(
         ~method_=Post,
         ~body=Fetch.BodyInit.make(Encoders.endcodeInput(kind, value) |> Js.Json.stringify),
@@ -53,7 +53,7 @@ module Client = {
   /* Resets a user's reading history */
   let resetUser = (userId:string) => {
     Js.Promise.(
-      Fetch.fetchWithInit(backendURI ++ "/history/" ++ userId ++ "/reset",
+      Fetch.fetchWithInit(backendURI ++ "/authed/history/reset",
         Fetch.RequestInit.make(
           ~method_=Put,
           ~headers=authHeader(),

diff --git a/dokusho/src/app/LoginButton.re b/dokusho/src/app/LoginButton.re
@@ -59,6 +59,7 @@ module Auth {
 let authOptions = {
     "domain": "dokusho.eu.auth0.com",
     "clientID": "mal13rQ1KYJSpAjTBvs72ioa8xhnq8wh",
+    /* "redirectUri": "http://35.189.106.56:3000/callback", */
     "redirectUri": "http://localhost:3000/callback",
     "responseType": "token id_token",
     "scope": "openid"