diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2017-08-10 14:16:13 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2017-08-16 19:26:10 -0700 |
| commit | 5e6f97aab7c05a7f38b0c1abee2ccdc2f6bfc83a (patch) | |
| tree | 0d522b144ffa422f84a4e8967f7881f44a8dacf6 | |
| parent | a59d6910eaccf9b5540fb41648a7d4e67cc241b5 (diff) | |
| download | rest-query-5e6f97aab7c05a7f38b0c1abee2ccdc2f6bfc83a.tar.gz rest-query-5e6f97aab7c05a7f38b0c1abee2ccdc2f6bfc83a.tar.bz2 rest-query-5e6f97aab7c05a7f38b0c1abee2ccdc2f6bfc83a.zip | |
Use AuthUserInfo
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/project/build.properties b/project/build.properties index 6561361..3507256 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ #Activator-generated Properties #Wed Jul 06 16:08:49 PDT 2016 template.uuid=a675a7df-bee3-48df-9eaa-688d99e5814e -sbt.version=0.13.15 +sbt.version=0.13.16 diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala index a9d7b38..ec89649 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala @@ -4,7 +4,7 @@ import akka.http.scaladsl.server._ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.model._ import xyz.driver.core.rest.ContextHeaders -import xyz.driver.entities.users.UserInfo +import xyz.driver.entities.users.AuthUserInfo import xyz.driver.pdsuicommon.auth._ import xyz.driver.pdsuicommon.error._ import xyz.driver.pdsuicommon.error.DomainError._ @@ -82,7 +82,7 @@ trait Directives { handleExceptions(domainExceptionHandler(id)) } - implicit class AuthProviderWrapper(provider: AuthProvider[UserInfo]) { + implicit class AuthProviderWrapper(provider: AuthProvider[AuthUserInfo]) { val authenticate: Directive1[AuthenticatedRequestContext] = (provider.authorize() & tracked) tflatMap { case (core, requestId) => provide( |