From 89675a069079085df849b78238e0bc7c3c48a473 Mon Sep 17 00:00:00 2001 From: Janis Date: Sun, 26 Oct 2025 11:24:05 +0100 Subject: [PATCH] chore(base): resolved merge-conflict #5 [Story] Create User Sessions --- knockoutwhistweb/app/logic/user/SessionManager.scala | 3 --- knockoutwhistweb/app/logic/user/UserManager.scala | 9 ++------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/knockoutwhistweb/app/logic/user/SessionManager.scala b/knockoutwhistweb/app/logic/user/SessionManager.scala index aad7472..c573b23 100644 --- a/knockoutwhistweb/app/logic/user/SessionManager.scala +++ b/knockoutwhistweb/app/logic/user/SessionManager.scala @@ -1,10 +1,7 @@ package logic.user -import com.google.inject.ImplementedBy -import logic.user.impl.BaseSessionManager import model.users.User -@ImplementedBy(classOf[BaseSessionManager]) trait SessionManager { def createSession(user: User): String diff --git a/knockoutwhistweb/app/logic/user/UserManager.scala b/knockoutwhistweb/app/logic/user/UserManager.scala index b6a4f47..69e4481 100644 --- a/knockoutwhistweb/app/logic/user/UserManager.scala +++ b/knockoutwhistweb/app/logic/user/UserManager.scala @@ -1,15 +1,10 @@ package logic.user -import com.google.inject.ImplementedBy -import logic.user.impl.StubUserManager -import model.users.User - -@ImplementedBy(classOf[StubUserManager]) trait UserManager { def addUser(name: String, password: String): Boolean - def authenticate(name: String, password: String): Option[User] - def userExists(name: String): Option[User] + def authenticate(name: String, password: String): Boolean + def userExists(name: String): Boolean def removeUser(name: String): Boolean }