Reworked AuthenticatedAction

2026-09-01 00:42:38 +03:00
parent 88b187e6a3
commit a6bbef1bf3
3 changed files with 14 additions and 6 deletions
@@ -22,7 +22,13 @@ implicit val tokenWrites: Writes[AuthToken] = (token: AuthToken) => Json.obj(


@Singleton
-class SessionsController @Inject()(controllerComponents: ControllerComponents, usersDAO: UsersDAO, authTokensDAO: AuthTokensDAO, implicit val ec: ExecutionContext) extends AbstractController(controllerComponents) {
+class SessionsController @Inject()(
+                                    controllerComponents: ControllerComponents,
+                                    usersDAO: UsersDAO,
+                                    authTokensDAO: AuthTokensDAO,
+                                    authenticatedAction: AuthenticatedAction)
+                                  (implicit val ec: ExecutionContext)
+  extends AbstractController(controllerComponents) {
  def login() = Action.async(parse.json) { implicit request =>
    val loginDataResult = request.body.validate[LoginData]
    loginDataResult.fold(
@@ -41,7 +47,7 @@ class SessionsController @Inject()(controllerComponents: ControllerComponents, u
    )
  }

-  def logout = Action.andThen(new AuthenticatedAction(authTokensDAO)).async { request =>
+  def logout = authenticatedAction.async { request =>
    authTokensDAO.destroy(request.token).map{ _ => Ok("") }
  }
 }