From b872ee2649c7b56df413fbde746ee68312c17abd Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Sun, 19 Nov 2017 23:29:03 -0800 Subject: Apply new formatting --- src/main/scala/xyz/driver/core/rest/auth/AlwaysAllowAuthorization.scala | 2 +- src/main/scala/xyz/driver/core/rest/auth/AuthProvider.scala | 2 +- src/main/scala/xyz/driver/core/rest/auth/Authorization.scala | 2 +- src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala | 2 +- src/main/scala/xyz/driver/core/rest/auth/ChainedAuthorization.scala | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/scala/xyz/driver/core/rest/auth') diff --git a/src/main/scala/xyz/driver/core/rest/auth/AlwaysAllowAuthorization.scala b/src/main/scala/xyz/driver/core/rest/auth/AlwaysAllowAuthorization.scala index ea29a6a..5007774 100644 --- a/src/main/scala/xyz/driver/core/rest/auth/AlwaysAllowAuthorization.scala +++ b/src/main/scala/xyz/driver/core/rest/auth/AlwaysAllowAuthorization.scala @@ -7,7 +7,7 @@ import scala.concurrent.Future class AlwaysAllowAuthorization[U <: User] extends Authorization[U] { override def userHasPermissions(user: U, permissions: Seq[Permission])( - implicit ctx: ServiceRequestContext): Future[AuthorizationResult] = { + implicit ctx: ServiceRequestContext): Future[AuthorizationResult] = { val permissionsMap = permissions.map(_ -> true).toMap Future.successful(AuthorizationResult(authorized = permissionsMap, ctx.permissionsToken)) } diff --git a/src/main/scala/xyz/driver/core/rest/auth/AuthProvider.scala b/src/main/scala/xyz/driver/core/rest/auth/AuthProvider.scala index 35b65f7..9c89fc6 100644 --- a/src/main/scala/xyz/driver/core/rest/auth/AuthProvider.scala +++ b/src/main/scala/xyz/driver/core/rest/auth/AuthProvider.scala @@ -14,7 +14,7 @@ import scalaz.Scalaz.futureInstance import scalaz.OptionT abstract class AuthProvider[U <: User](val authorization: Authorization[U], log: Logger)( - implicit execution: ExecutionContext) { + implicit execution: ExecutionContext) { import akka.http.scaladsl.server._ import Directives._ diff --git a/src/main/scala/xyz/driver/core/rest/auth/Authorization.scala b/src/main/scala/xyz/driver/core/rest/auth/Authorization.scala index 87d0614..1a5e9be 100644 --- a/src/main/scala/xyz/driver/core/rest/auth/Authorization.scala +++ b/src/main/scala/xyz/driver/core/rest/auth/Authorization.scala @@ -7,5 +7,5 @@ import scala.concurrent.Future trait Authorization[U <: User] { def userHasPermissions(user: U, permissions: Seq[Permission])( - implicit ctx: ServiceRequestContext): Future[AuthorizationResult] + implicit ctx: ServiceRequestContext): Future[AuthorizationResult] } diff --git a/src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala b/src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala index 4f4c811..66de4ef 100644 --- a/src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala +++ b/src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala @@ -13,7 +13,7 @@ import scalaz.syntax.std.boolean._ class CachedTokenAuthorization[U <: User](publicKey: => PublicKey, issuer: String) extends Authorization[U] { override def userHasPermissions(user: U, permissions: Seq[Permission])( - implicit ctx: ServiceRequestContext): Future[AuthorizationResult] = { + implicit ctx: ServiceRequestContext): Future[AuthorizationResult] = { import spray.json._ def extractPermissionsFromTokenJSON(tokenObject: JsObject): Option[Map[String, Boolean]] = diff --git a/src/main/scala/xyz/driver/core/rest/auth/ChainedAuthorization.scala b/src/main/scala/xyz/driver/core/rest/auth/ChainedAuthorization.scala index f5eb402..131e7fc 100644 --- a/src/main/scala/xyz/driver/core/rest/auth/ChainedAuthorization.scala +++ b/src/main/scala/xyz/driver/core/rest/auth/ChainedAuthorization.scala @@ -12,7 +12,7 @@ class ChainedAuthorization[U <: User](authorizations: Authorization[U]*)(implici extends Authorization[U] { override def userHasPermissions(user: U, permissions: Seq[Permission])( - implicit ctx: ServiceRequestContext): Future[AuthorizationResult] = { + implicit ctx: ServiceRequestContext): Future[AuthorizationResult] = { def allAuthorized(permissionsMap: Map[Permission, Boolean]): Boolean = permissions.forall(permissionsMap.getOrElse(_, false)) -- cgit v1.2.3