Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

/addresses/seed/{address} api method protection by api_key #95

Merged
merged 1 commit into from
Jun 3, 2016
Merged

/addresses/seed/{address} api method protection by api_key #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions scorex-transaction/src/main/scala/scorex/api/http/AddressApiRoute.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,14 @@ case class AddressApiRoute(override val application: Application)(implicit val c
))
def seed: Route = {
path("seed" / Segment) { case address =>
getJsonRoute {
//TODO CHECK IF WALLET EXISTS
withPrivateKeyAccount(wallet, address) { account =>
wallet.exportAccountSeed(account.address) match {
case None => WalletSeedExportFailed.json
case Some(seed) => Json.obj("address" -> address, "seed" -> Base58.encode(seed))
withAuth {
getJsonRoute {
//TODO CHECK IF WALLET EXISTS
withPrivateKeyAccount(wallet, address) { account =>
wallet.exportAccountSeed(account.address) match {
case None => WalletSeedExportFailed.json
case Some(seed) => Json.obj("address" -> address, "seed" -> Base58.encode(seed))
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scorex/lagonaki/TestingCommons.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ object TestingCommons {
body: String = "",
headers: Map[String, String] = Map.empty,
peer: String = peerUrl(application)): JsValue = {
val request = Http(url(peer + us).GET)
val request = Http(url(peer + us).GET <:< headers)
val response = Await.result(request, 5.seconds)
Json.parse(response.getResponseBody)
}
Expand Down
5 changes: 4 additions & 1 deletion src/test/scala/scorex/lagonaki/integration/api/AddressesAPISpecification.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ class AddressesAPISpecification extends FunSuite with Matchers {
}

test("/addresses/seed/{address} API route") {
val response = GET.request(s"/addresses/seed/${account.address}")
val path = s"/addresses/seed/${account.address}"
GET.incorrectApiKeyTest(path)

val response = GET.request(us = path, headers = Map("api_key" -> "test"))
(response \ "address").as[String] shouldBe account.address
(response \ "seed").as[String] shouldBe Base58.encode(account.seed)
}
Expand Down