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

634 double encoding breaks query params #680

Merged
merged 11 commits into from
Aug 12, 2021
Merged

634 double encoding breaks query params #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c45f210
Remove redundant usages of java.net.URLEncoder
josiah14 Jul 30, 2021
ca55de6
Add integration test to validate searchRepos ability to handle search…
josiah14 Aug 9, 2021
9eae7a9
Insert missing newline at end of file
josiah14 Aug 9, 2021
c57649e
Change githubApiUrl to use SSL/TLS encryption
josiah14 Aug 9, 2021
8a75cb4
Modify integration test to validate searchIssues ability to handle se…
josiah14 Aug 9, 2021
26bb95f
Merge branch 'main' of github.com:47degrees/github4s into 634-double-…
josiah14 Aug 11, 2021
3e85b30
give Repos.searchRepos spec httpClient mock url parameter an actual u…
josiah14 Aug 11, 2021
ef3817e
delint IssuesInterpreter.scala
josiah14 Aug 11, 2021
8cb8e4e
delint RepositoriesInterpreter.scala
josiah14 Aug 11, 2021
e953662
delint ReposSpec integration tests
josiah14 Aug 11, 2021
ae33100
use string interpolation instead of mkString
josiah14 Aug 12, 2021
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
3 changes: 1 addition & 2 deletions github4s/src/main/scala/github4s/interpreters/IssuesInterpreter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package github4s.interpreters

import java.net.URLEncoder.encode
import java.time.ZonedDateTime

import cats.syntax.all._
Expand Down Expand Up @@ -55,7 +54,7 @@ class IssuesInterpreter[F[_]](implicit client: HttpClient[F]) extends Issues[F]
client.get[SearchIssuesResult](
method = "search/issues",
headers = headers,
params = Map("q" -> s"${encode(query, "utf-8")}+${searchParams.map(_.value).mkString("+")}"),
params = Map("q" -> s"$query+${searchParams.map(_.value).mkString("+")}"),
pagination
)

Expand Down
4 changes: 1 addition & 3 deletions github4s/src/main/scala/github4s/interpreters/RepositoriesInterpreter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package github4s.interpreters

import java.net.URLEncoder.encode

import cats.Functor
import cats.data.NonEmptyList
import cats.syntax.functor._
Expand Down Expand Up @@ -74,7 +72,7 @@ class RepositoriesInterpreter[F[_]: Functor](implicit
client.get[SearchReposResult](
"search/repositories",
headers,
params = Map("q" -> s"${encode(query, "utf-8")}+${searchParams.map(_.value).mkString("+")}"),
params = Map("q" -> s"$query+${searchParams.map(_.value).mkString("+")}"),
pagination
)

Expand Down
2 changes: 1 addition & 1 deletion github4s/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
<AppenderRef ref="Console"/>
</Root>
</Loggers>
</Configuration>
</Configuration>
17 changes: 17 additions & 0 deletions github4s/src/test/scala/github4s/integration/ReposSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,23 @@ trait ReposSpec extends BaseIntegrationSpec {
response.statusCode shouldBe okStatusCode
}

it should "successfully return results when a valid repo is provided using <owner>/<name> syntax" taggedAs Integration in {
val response = clientResource
.use { client =>
Github[IO](client, accessToken).repos
.searchRepos(s"$validRepoOwner/$validRepoName", Nil)
}
.unsafeRunSync()

testIsRight[SearchReposResult](
response,
{ r =>
r.total_count > 0 shouldBe true
r.items.nonEmpty shouldBe true
}
)
}

it should "return an empty result for a non existent query string" taggedAs Integration in {
val response = clientResource
.use { client =>
Expand Down
2 changes: 1 addition & 1 deletion github4s/src/test/scala/github4s/unit/ReposSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ class ReposSpec extends BaseSpec {
"Repos.searchRepos" should "call httpClient.get with the right parameters" in {

implicit val httpClientMock: HttpClient[IO] = httpClientMockGet[SearchReposResult](
url = "search/repositories",
url = githubApiUrl,
params = Map("q" -> s"+${validSearchParams.map(_.value).mkString("+")}"),
response = IO.pure(searchReposResult)
)
Expand Down
4 changes: 2 additions & 2 deletions github4s/src/test/scala/github4s/utils/TestData.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ trait TestData {
val invalidUsername = "GHInvalidUserName"
val invalidPassword = "invalidPassword"

val githubApiUrl = "http://api.github.com"
val githubApiUrl = "https://api.github.com"
val user = User(1, validUsername, githubApiUrl, githubApiUrl)
val userRepoPermission: UserRepoPermission = UserRepoPermission("admin", user)

Expand Down Expand Up @@ -89,7 +89,7 @@ trait TestData {

val validFileContent = "def hack(target: String): Option[Int] = None"

val validSearchQuery = "Scala 2.12"
val validSearchQuery = "\"/\" not accepted in SearchRepos"
val nonExistentSearchQuery = "nonExistentSearchQueryString"
val validSearchParams = List(
OwnerParamInRepository(s"$validRepoOwner/$validRepoName")
Expand Down