From 8e997899471d9a7bfcdc8e0f9fc43ea8f2ddf6b2 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Wed, 1 Mar 2023 15:41:55 +0100 Subject: [PATCH] moved /login and /register REST endpoints to /auth/. and added /auth/token-login for JWT auth --- Core/src/org/tbasket/endpoint/Endpoint.scala | 11 +++++++---- .../org/tbasket/endpoint/auth/TokenLoginHandler.scala | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Core/src/org/tbasket/endpoint/Endpoint.scala b/Core/src/org/tbasket/endpoint/Endpoint.scala index 70a1a44..595175d 100644 --- a/Core/src/org/tbasket/endpoint/Endpoint.scala +++ b/Core/src/org/tbasket/endpoint/Endpoint.scala @@ -12,7 +12,7 @@ import org.tbasket.dispatch.StaticWebService import org.tbasket.endpoint.Endpoint.{Log, app} import org.tbasket.error.* import EndpointUtils.errorBody -import org.tbasket.endpoint.auth.{LoginHandler, RegisterHandler} +import org.tbasket.endpoint.auth.{LoginHandler, RegisterHandler, TokenLoginHandler} import zio.* import zio.http.* import zio.http.ServerConfig.LeakDetectionLevel @@ -50,10 +50,13 @@ object Endpoint: final val Log = LogManager.getLogger("API") private def tryHandle(r: Request) = r match - case r@POST -> _ / "login" => + case r@POST -> _ / "auth" / "login" => LoginHandler.login(r) - - case r@POST -> _ / "register" => + + case r@POST -> _ / "auth" / "token-login" => + TokenLoginHandler.login(r) + + case r@POST -> _ / "auth" / "register" => RegisterHandler.register(r) case r@GET -> _ => diff --git a/Core/src/org/tbasket/endpoint/auth/TokenLoginHandler.scala b/Core/src/org/tbasket/endpoint/auth/TokenLoginHandler.scala index 41b3d96..6ce72a8 100644 --- a/Core/src/org/tbasket/endpoint/auth/TokenLoginHandler.scala +++ b/Core/src/org/tbasket/endpoint/auth/TokenLoginHandler.scala @@ -2,7 +2,7 @@ package org.tbasket.endpoint.auth import zio.http.Request -class TokenLoginHandler { +object TokenLoginHandler { def login(request: Request) = {