Auth provider simplification

1 files changed, 3 insertions, 6 deletions

diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index ebdb1b9..32ac3fa 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -80,15 +80,12 @@ object rest {
     }
   }
 
-  trait AuthProvider[U <: User] {
+  abstract class AuthProvider[U <: User](val authorization: Authorization,
+                                         log: Logger)(implicit execution: ExecutionContext) {
 
     import akka.http.scaladsl.server._
     import Directives._
 
-    protected implicit val execution: ExecutionContext
-    protected val authorization: Authorization
-    protected val log: Logger
-
     /**
       * Specific implementation on how to extract user from request context,
       * can either need to do a network call to auth server or extract everything from self-contained token
@@ -96,7 +93,7 @@ object rest {
       * @param context set of request values which can be relevant to authenticate user
       * @return authenticated user
       */
-    protected def authenticatedUser(context: ServiceRequestContext): OptionT[Future, U]
+    def authenticatedUser(context: ServiceRequestContext): OptionT[Future, U]
 
     def authorize(permissions: Permission*): Directive1[U] = {
       serviceContext flatMap { ctx =>