aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala
diff options
context:
space:
mode:
authorZach Smith <zach@driver.xyz>2018-03-05 19:57:27 -0800
committerZach Smith <zach@driver.xyz>2018-03-06 22:43:58 -0800
commit93b6eb324feacd2d52afcf8635a3d8e197f01f84 (patch)
tree33d0ea8ed0fb669d3b0b654ac87f9bcc0a40d94e /src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala
parent575872b556eeb403147df9fe96b58236e0402050 (diff)
downloaddriver-core-93b6eb324feacd2d52afcf8635a3d8e197f01f84.tar.gz
driver-core-93b6eb324feacd2d52afcf8635a3d8e197f01f84.tar.bz2
driver-core-93b6eb324feacd2d52afcf8635a3d8e197f01f84.zip
Add StringId, LongId, and UuidId types to corezsmith/id-types
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala')
-rw-r--r--src/main/scala/xyz/driver/core/rest/auth/CachedTokenAuthorization.scala3
1 files changed, 2 insertions, 1 deletions
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)