From 16bdae27befd9cf3b723ad919ba2140b38d18c48 Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 1 Nov 2016 15:19:36 -0700 Subject: DIR-135 Consistent request context extraction --- src/test/scala/xyz/driver/core/AuthTest.scala | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/test/scala') diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala index 97279de..ca7e019 100644 --- a/src/test/scala/xyz/driver/core/AuthTest.scala +++ b/src/test/scala/xyz/driver/core/AuthTest.scala @@ -16,10 +16,10 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo val authStatusService: AuthService[User] = new AuthService[User] { override def authStatus(authToken: AuthToken): OptionT[Future, User] = OptionT.optionT[Future] { - Future.successful(Some(new User() { + Future.successful(Some(new User { override def id: Id[User] = Id[User](1L) override def roles: Set[Role] = Set(PathologistRole) - })) + }: User)) } } @@ -29,7 +29,7 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo Get("/naive/attempt") ~> authorize(CanSignOutReport) { - case (authToken, user) => + case user => complete("Never going to be here") } ~> check { @@ -40,13 +40,13 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo it should "throw error is authorized user is not having the requested permission" in { - val referenceAuthToken = AuthToken(Base64("I am a pathologist's token"), "BC131CD") + val referenceAuthToken = AuthToken("I am a pathologist's token") Post("/administration/attempt").addHeader( - RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value.value) + RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value) ) ~> authorize(CanAssignRoles) { - case (authToken, user) => + case user => complete("Never going to get here") } ~> check { @@ -60,18 +60,18 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo it should "pass and retrieve the token to client code, if token is in request and user has permission" in { - val referenceAuthToken = AuthToken(Base64("I am token"), "AAADDDFFF") + val referenceAuthToken = AuthToken("I am token") Get("/valid/attempt/?a=2&b=5").addHeader( - RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value.value) + RawHeader(AuthService.AuthenticationTokenHeader, referenceAuthToken.value) ) ~> authorize(CanSignOutReport) { - case (authToken, user) => - complete("Alright, \"" + authToken.value.value + "\" is handled") + case user => + complete("Alright, user \"" + user.id + "\" is authorized") } ~> check { handled shouldBe true - responseAs[String] shouldBe "Alright, \"I am token\" is handled" + responseAs[String] shouldBe "Alright, user \"1\" is authorized" } } } -- cgit v1.2.3