aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandr <ognelisar@gmail.com>2018-04-04 16:29:55 +0700
committerAleksandr <ognelisar@gmail.com>2018-04-04 16:29:55 +0700
commit9ffa65c1ccdc5fdea4ccec26c4b39557d45867f7 (patch)
treedca0293e9bf3d147ab8f79ce5e16c0e1f7516b8b
parentacf366c1a7f4b7dc7758d8a73b2e497068bb1fe8 (diff)
downloaddriver-core-9ffa65c1ccdc5fdea4ccec26c4b39557d45867f7.tar.gz
driver-core-9ffa65c1ccdc5fdea4ccec26c4b39557d45867f7.tar.bz2
driver-core-9ffa65c1ccdc5fdea4ccec26c4b39557d45867f7.zip
Removed fingerprint hash from ServiceRequestContext and it's derivates
-rw-r--r--src/main/scala/xyz/driver/core/rest/package.scala1
-rw-r--r--src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala9
2 files changed, 1 insertions, 9 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/package.scala b/src/main/scala/xyz/driver/core/rest/package.scala
index 07eb92e..b35a07d 100644
--- a/src/main/scala/xyz/driver/core/rest/package.scala
+++ b/src/main/scala/xyz/driver/core/rest/package.scala
@@ -148,7 +148,6 @@ object `package` {
new ServiceRequestContext(
extractTrackingId(request),
extractOriginatingIP(request, remoteAddress),
- extractFingerprintHash(request),
extractContextHeaders(request))
def extractTrackingId(request: HttpRequest): String = {
diff --git a/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala
index 7206049..775106e 100644
--- a/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala
+++ b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala
@@ -6,13 +6,11 @@ import xyz.driver.core.auth.{AuthToken, PermissionsToken, User}
import xyz.driver.core.generators
import scalaz.Scalaz.{mapEqual, stringInstance}
-import scalaz.Scalaz.optionEqual
import scalaz.syntax.equal._
class ServiceRequestContext(
val trackingId: String = generators.nextUuid().toString,
val originatingIp: Option[InetAddress] = None,
- val fingerprintHash: Option[String] = None,
val contextHeaders: Map[String, String] = Map.empty[String, String]) {
def authToken: Option[AuthToken] =
contextHeaders.get(AuthProvider.AuthenticationTokenHeader).map(AuthToken.apply)
@@ -24,7 +22,6 @@ class ServiceRequestContext(
new ServiceRequestContext(
trackingId,
originatingIp,
- fingerprintHash,
contextHeaders.updated(AuthProvider.AuthenticationTokenHeader, authToken.value)
)
@@ -32,20 +29,18 @@ class ServiceRequestContext(
new AuthorizedServiceRequestContext(
trackingId,
originatingIp,
- fingerprintHash,
contextHeaders.updated(AuthProvider.AuthenticationTokenHeader, authToken.value),
user
)
override def hashCode(): Int =
- Seq[Any](trackingId, originatingIp, fingerprintHash, contextHeaders)
+ Seq[Any](trackingId, originatingIp, contextHeaders)
.foldLeft(31)((result, obj) => 31 * result + obj.hashCode())
override def equals(obj: Any): Boolean = obj match {
case ctx: ServiceRequestContext =>
trackingId === ctx.trackingId &&
originatingIp == originatingIp &&
- fingerprintHash === ctx.fingerprintHash &&
contextHeaders === ctx.contextHeaders
case _ => false
}
@@ -56,7 +51,6 @@ class ServiceRequestContext(
class AuthorizedServiceRequestContext[U <: User](
override val trackingId: String = generators.nextUuid().toString,
override val originatingIp: Option[InetAddress] = None,
- override val fingerprintHash: Option[String] = None,
override val contextHeaders: Map[String, String] = Map.empty[String, String],
val authenticatedUser: U)
extends ServiceRequestContext {
@@ -65,7 +59,6 @@ class AuthorizedServiceRequestContext[U <: User](
new AuthorizedServiceRequestContext[U](
trackingId,
originatingIp,
- fingerprintHash,
contextHeaders.updated(AuthProvider.PermissionsTokenHeader, permissionsToken.value),
authenticatedUser)