raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

=htc make basic credentials token method return correct token

Browse source
This commit is contained in:
Anderson Osagie 2016-02-18 13:29:16 -05:00
parent f0a4805b03
commit d67c6eb011
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/HttpCredentials.scala
View file

@ -27,9 +27,9 @@ final case class BasicHttpCredentials(username: String, password: String) extend
} }
def render[R <: Rendering](r: R): r.type = r ~~ "Basic " ~~ cookie def render[R <: Rendering](r: R): r.type = r ~~ "Basic " ~~ cookie
def scheme: String = "Basic" override def scheme: String = "Basic"
def token = cookie.toString override def token: String = String.valueOf(cookie)
def params = Map.empty override def params: Map[String, String] = Map.empty
} }
object BasicHttpCredentials { object BasicHttpCredentials {
@ -46,8 +46,8 @@ object BasicHttpCredentials {
final case class OAuth2BearerToken(token: String) extends jm.headers.OAuth2BearerToken { final case class OAuth2BearerToken(token: String) extends jm.headers.OAuth2BearerToken {
def render[R <: Rendering](r: R): r.type = r ~~ "Bearer " ~~ token def render[R <: Rendering](r: R): r.type = r ~~ "Bearer " ~~ token
def scheme: String = "Bearer" override def scheme: String = "Bearer"
def params: Map[String, String] = Map.empty override def params: Map[String, String] = Map.empty
} }
final case class GenericHttpCredentials(scheme: String, token: String, final case class GenericHttpCredentials(scheme: String, token: String,

1
akka-http-core/src/test/scala/akka/http/impl/model/parser/HttpHeaderSpec.scala
View file

@ -128,6 +128,7 @@ class HttpHeaderSpec extends FreeSpec with Matchers {
} }
"Authorization" in { "Authorization" in {
BasicHttpCredentials("Aladdin", "open sesame").token shouldEqual "QWxhZGRpbjpvcGVuIHNlc2FtZQ=="
"Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" =!= "Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" =!=
Authorization(BasicHttpCredentials("Aladdin", "open sesame")) Authorization(BasicHttpCredentials("Aladdin", "open sesame"))
"Authorization: bAsIc QWxhZGRpbjpvcGVuIHNlc2FtZQ==" =!= "Authorization: bAsIc QWxhZGRpbjpvcGVuIHNlc2FtZQ==" =!=