From 93b6eb324feacd2d52afcf8635a3d8e197f01f84 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Mon, 5 Mar 2018 19:57:27 -0800 Subject: Add StringId, LongId, and UuidId types to core --- .../scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala') 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 66de4ef..38e52bc 100644 --- a/src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala +++ b/src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala @@ -7,6 +7,7 @@ import java.security.spec.X509EncodedKeySpec import pdi.jwt.{Jwt, JwtAlgorithm} import xyz.driver.core.auth.{Permission, User} import xyz.driver.core.rest.ServiceRequestContext +import xyz.driver.core.json.idFormat import scala.concurrent.Future import scalaz.syntax.std.boolean._ @@ -30,7 +31,7 @@ class CachedTokenAuthorization[U <: User](publicKey: => PublicKey, issuer: Strin jwtJson = jwt.parseJson.asJsObject // Ensure jwt is for the currently authenticated user and the correct issuer, otherwise return None - _ <- jwtJson.fields.get("sub").contains(JsString(user.id.value)).option(()) + _ <- jwtJson.fields.get("sub").contains(user.id.toJson).option(()) _ <- jwtJson.fields.get("iss").contains(JsString(issuer)).option(()) permissionsMap <- extractPermissionsFromTokenJSON(jwtJson) -- cgit v1.2.3