From b97bc7242d1686a303f6366755652b6bf93e3851 Mon Sep 17 00:00:00 2001 From: vlad Date: Fri, 24 Mar 2017 22:14:47 -0700 Subject: PDW-238 Session validity verification support for `AuthProvider` --- src/test/scala/xyz/driver/core/AuthTest.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/test/scala/xyz/driver/core/AuthTest.scala') diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala index c39d9da..e6025fb 100644 --- a/src/test/scala/xyz/driver/core/AuthTest.scala +++ b/src/test/scala/xyz/driver/core/AuthTest.scala @@ -31,8 +31,8 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo } 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)) { + override def authenticatedUser(implicit ctx: ServiceRequestContext): OptionT[Future, User] = OptionT.optionT[Future] { + if (ctx.contextHeaders.keySet.contains(AuthProvider.AuthenticationTokenHeader)) { Future.successful(Some(BasicUser(Id[User]("1"), Set(TestRole)))) } else { Future.successful(Option.empty[User]) -- cgit v1.2.3 From f2d98d0d3f473c2a3ae51b11ce0386114bf87a0d Mon Sep 17 00:00:00 2001 From: vlad Date: Fri, 24 Mar 2017 22:27:32 -0700 Subject: PDW-238 Session validity verification support for `AuthProvider` --- src/test/scala/xyz/driver/core/AuthTest.scala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/test/scala/xyz/driver/core/AuthTest.scala') diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala index e6025fb..76c2933 100644 --- a/src/test/scala/xyz/driver/core/AuthTest.scala +++ b/src/test/scala/xyz/driver/core/AuthTest.scala @@ -31,13 +31,14 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo } val authStatusService = new AuthProvider[User](authorization, NoLogger) { - override def authenticatedUser(implicit ctx: ServiceRequestContext): OptionT[Future, User] = OptionT.optionT[Future] { - if (ctx.contextHeaders.keySet.contains(AuthProvider.AuthenticationTokenHeader)) { - Future.successful(Some(BasicUser(Id[User]("1"), Set(TestRole)))) - } else { - Future.successful(Option.empty[User]) + override def authenticatedUser(implicit ctx: ServiceRequestContext): OptionT[Future, User] = + OptionT.optionT[Future] { + if (ctx.contextHeaders.keySet.contains(AuthProvider.AuthenticationTokenHeader)) { + Future.successful(Some(BasicUser(Id[User]("1"), Set(TestRole)))) + } else { + Future.successful(Option.empty[User]) + } } - } } import authStatusService._ -- cgit v1.2.3 From e74e0229b85a2cb85b31c1f9389dada65ec08b7d Mon Sep 17 00:00:00 2001 From: vlad Date: Sat, 25 Mar 2017 14:03:32 -0700 Subject: PDW-238 Session validity verification support for `AuthProvider`, abstract `isSessionValid` --- src/main/scala/xyz/driver/core/rest.scala | 2 +- src/test/scala/xyz/driver/core/AuthTest.scala | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/test/scala/xyz/driver/core/AuthTest.scala') diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala index 42ffac4..d3a06d2 100644 --- a/src/main/scala/xyz/driver/core/rest.scala +++ b/src/main/scala/xyz/driver/core/rest.scala @@ -141,7 +141,7 @@ package rest { * Specific implementation can verify session expiration and single sign out * to verify if session is still valid */ - def isSessionValid(user: U)(implicit ctx: ServiceRequestContext): Future[Boolean] = Future.successful(true) + def isSessionValid(user: U)(implicit ctx: ServiceRequestContext): Future[Boolean] /** * Verifies if request is authenticated and authorized to have `permissions` diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala index 76c2933..d1a37a2 100644 --- a/src/test/scala/xyz/driver/core/AuthTest.scala +++ b/src/test/scala/xyz/driver/core/AuthTest.scala @@ -31,6 +31,10 @@ class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRo } val authStatusService = new AuthProvider[User](authorization, NoLogger) { + + override def isSessionValid(user: User)(implicit ctx: ServiceRequestContext): Future[Boolean] = + Future.successful(true) + override def authenticatedUser(implicit ctx: ServiceRequestContext): OptionT[Future, User] = OptionT.optionT[Future] { if (ctx.contextHeaders.keySet.contains(AuthProvider.AuthenticationTokenHeader)) { -- cgit v1.2.3