You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by pa...@apache.org on 2020/06/04 19:07:52 UTC
[beam] branch master updated: Merge pull request #11893 from
[BEAM-10175] use bearer token header instead of url param for token
This is an automated email from the ASF dual-hosted git repository.
pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 2b961e6 Merge pull request #11893 from [BEAM-10175] use bearer token header instead of url param for token
2b961e6 is described below
commit 2b961e601cde5f7f81e4a9358353b4277fa7e675
Author: Jacob Ferriero <jf...@google.com>
AuthorDate: Thu Jun 4 12:07:36 2020 -0700
Merge pull request #11893 from [BEAM-10175] use bearer token header instead of url param for token
* use bearer token header instead of url param for token
* remove url param
* spotless
---
.../apache/beam/sdk/io/gcp/healthcare/HttpHealthcareApiClient.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/HttpHealthcareApiClient.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/HttpHealthcareApiClient.java
index 653e9a8..2b001a4 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/HttpHealthcareApiClient.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/HttpHealthcareApiClient.java
@@ -407,10 +407,7 @@ public class HttpHealthcareApiClient implements HealthcareApiClient, Serializabl
StringEntity requestEntity = new StringEntity(bundle, ContentType.APPLICATION_JSON);
URI uri;
try {
- uri =
- new URIBuilder(client.getRootUrl() + "v1beta1/" + fhirStore + "/fhir")
- .setParameter("access_token", credentials.getAccessToken().getTokenValue())
- .build();
+ uri = new URIBuilder(client.getRootUrl() + "v1beta1/" + fhirStore + "/fhir").build();
} catch (URISyntaxException e) {
LOG.error("URL error when making executeBundle request to FHIR API. " + e.getMessage());
throw new IllegalArgumentException(e);
@@ -420,6 +417,7 @@ public class HttpHealthcareApiClient implements HealthcareApiClient, Serializabl
RequestBuilder.post()
.setUri(uri)
.setEntity(requestEntity)
+ .addHeader("Authorization", "Bearer " + credentials.getAccessToken().getTokenValue())
.addHeader("User-Agent", USER_AGENT)
.addHeader("Content-Type", FHIRSTORE_HEADER_CONTENT_TYPE)
.addHeader("Accept-Charset", FHIRSTORE_HEADER_ACCEPT_CHARSET)
@@ -429,6 +427,7 @@ public class HttpHealthcareApiClient implements HealthcareApiClient, Serializabl
HttpResponse response = httpClient.execute(request);
HttpEntity responseEntity = response.getEntity();
String content = EntityUtils.toString(responseEntity);
+
// Check 2XX code.
if (!(response.getStatusLine().getStatusCode() / 100 == 2)) {
throw HealthcareHttpException.of(response);