From 74e32a5693e309425a7643ca9f22b6bda62ae6a2 Mon Sep 17 00:00:00 2001 From: vlad Date: Fri, 24 Mar 2017 19:09:04 -0700 Subject: Auth provider simplification --- src/test/scala/xyz/driver/core/AuthTest.scala | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/test') diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala index c6df168..c39d9da 100644 --- a/src/test/scala/xyz/driver/core/AuthTest.scala +++ b/src/test/scala/xyz/driver/core/AuthTest.scala @@ -21,18 +21,16 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo val TestRole = Role(Id("1"), Name("testRole")) - val authStatusService: AuthProvider[User] = new AuthProvider[User] { + implicit val exec = scala.concurrent.ExecutionContext.global - override implicit val execution = scala.concurrent.ExecutionContext.global - override val log = NoLogger - - override protected val authorization: Authorization = new Authorization { - override def userHasPermission(user: User, permission: Permission)( - implicit ctx: ServiceRequestContext): Future[Boolean] = { - Future.successful(permission === TestRoleAllowedPermission) - } + val authorization: Authorization = new Authorization { + override def userHasPermission(user: User, permission: Permission)( + implicit ctx: ServiceRequestContext): Future[Boolean] = { + Future.successful(permission === TestRoleAllowedPermission) } + } + val authStatusService = new AuthProvider[User](authorization, NoLogger) { override def authenticatedUser(context: ServiceRequestContext): OptionT[Future, User] = OptionT.optionT[Future] { if (context.contextHeaders.keySet.contains(AuthProvider.AuthenticationTokenHeader)) { Future.successful(Some(BasicUser(Id[User]("1"), Set(TestRole)))) -- cgit v1.2.3