From 51f7f400cab116c2511df1d27ca4edfc3cb0cbc3 Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 2 Feb 2017 18:52:29 -0500 Subject: Removing permissions from user and role as permission is something to check not something to have now Adding couple handy case classes --- src/test/scala/xyz/driver/core/AuthTest.scala | 22 +++++++++++++--------- 1 file changed, 13 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 57f79ff..50c8291 100644 --- a/src/test/scala/xyz/driver/core/AuthTest.scala +++ b/src/test/scala/xyz/driver/core/AuthTest.scala @@ -1,13 +1,14 @@ package xyz.driver.core -import akka.http.scaladsl.testkit.ScalatestRouteTest -import akka.http.scaladsl.server._ -import Directives._ import akka.http.scaladsl.model.headers.{HttpChallenges, RawHeader} import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsRejected +import akka.http.scaladsl.server.Directives._ +import akka.http.scaladsl.server._ +import akka.http.scaladsl.testkit.ScalatestRouteTest import org.scalatest.mock.MockitoSugar import org.scalatest.{FlatSpec, Matchers} -import xyz.driver.core.rest.Auth._ +import xyz.driver.core.auth._ +import xyz.driver.core.rest.AuthProvider import xyz.driver.core.rest.ServiceRequestContext import scala.concurrent.Future @@ -18,13 +19,16 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo case object TestRoleAllowedPermission extends Permission case object TestRoleNotAllowedPermission extends Permission - case object TestRole extends Role { - val id = Id("1") - val name = Name("testRole") - val permissions = Set[Permission](TestRoleAllowedPermission) - } + val TestRole = Role(Id("1"), Name("testRole")) val authStatusService: AuthProvider[User] = new AuthProvider[User] { + + override implicit val execution = scala.concurrent.ExecutionContext.global + + override protected def userHasPermission(user: User, permission: Permission): Future[Boolean] = { + Future.successful(permission === TestRoleAllowedPermission) + } + 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