From feb2cedf9b0ec5505fa221b44205cd8c078b42f1 Mon Sep 17 00:00:00 2001 From: Heet Sankesara Date: Thu, 25 Jan 2024 15:32:11 +0530 Subject: [PATCH 1/3] updated getExternalId fun in Oura Oauth --- .../org/radarbase/authorizer/api/ApiDeclarations.kt | 4 ++-- .../authorizer/service/OuraAuthorizationService.kt | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/authorizer-app-backend/src/main/java/org/radarbase/authorizer/api/ApiDeclarations.kt b/authorizer-app-backend/src/main/java/org/radarbase/authorizer/api/ApiDeclarations.kt index 1253d53b..508e6a42 100644 --- a/authorizer-app-backend/src/main/java/org/radarbase/authorizer/api/ApiDeclarations.kt +++ b/authorizer-app-backend/src/main/java/org/radarbase/authorizer/api/ApiDeclarations.kt @@ -55,9 +55,9 @@ data class OuraAuthUserId( val age: Int, val weight: Float, val height: Float, - val gender: String, + val biological_sex: String, val email: String, - @SerialName("user_id") val userId: String, + @SerialName("id") val userId: String, ) data class SignRequestParams( diff --git a/authorizer-app-backend/src/main/java/org/radarbase/authorizer/service/OuraAuthorizationService.kt b/authorizer-app-backend/src/main/java/org/radarbase/authorizer/service/OuraAuthorizationService.kt index b1479a69..b62506d5 100644 --- a/authorizer-app-backend/src/main/java/org/radarbase/authorizer/service/OuraAuthorizationService.kt +++ b/authorizer-app-backend/src/main/java/org/radarbase/authorizer/service/OuraAuthorizationService.kt @@ -4,8 +4,10 @@ import io.ktor.client.call.body import io.ktor.client.request.basicAuth import io.ktor.client.request.forms.submitForm import io.ktor.client.request.get +import io.ktor.client.request.headers import io.ktor.client.request.url import io.ktor.client.statement.bodyAsText +import io.ktor.http.HttpHeaders import io.ktor.http.isSuccess import io.ktor.http.takeFrom import jakarta.ws.rs.core.Context @@ -77,9 +79,9 @@ class OuraAuthorizationService( private suspend fun getExternalId(accessToken: String): String = withContext(Dispatchers.IO) { try { val response = httpClient.get { - url { - takeFrom(OURA_USER_ID_ENDPOINT) - parameters.append("access_token", accessToken) + url(OURA_USER_ID_ENDPOINT) + headers { + append(HttpHeaders.Authorization, "Bearer ${accessToken}") } } if (response.status.isSuccess()) { @@ -99,6 +101,6 @@ class OuraAuthorizationService( } companion object { - private const val OURA_USER_ID_ENDPOINT = "https://api.ouraring.com/v1/userinfo" + private const val OURA_USER_ID_ENDPOINT = "https://api.ouraring.com/v2/usercollection/personal_info" } } From 15f87959d6ee4e15436840c7d73ba9984a8aa8e8 Mon Sep 17 00:00:00 2001 From: Heet Sankesara Date: Thu, 25 Jan 2024 16:01:15 +0530 Subject: [PATCH 2/3] fixed klint CI error --- .../radarbase/authorizer/service/OuraAuthorizationService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/authorizer-app-backend/src/main/java/org/radarbase/authorizer/service/OuraAuthorizationService.kt b/authorizer-app-backend/src/main/java/org/radarbase/authorizer/service/OuraAuthorizationService.kt index b62506d5..928622b7 100644 --- a/authorizer-app-backend/src/main/java/org/radarbase/authorizer/service/OuraAuthorizationService.kt +++ b/authorizer-app-backend/src/main/java/org/radarbase/authorizer/service/OuraAuthorizationService.kt @@ -81,7 +81,7 @@ class OuraAuthorizationService( val response = httpClient.get { url(OURA_USER_ID_ENDPOINT) headers { - append(HttpHeaders.Authorization, "Bearer ${accessToken}") + append(HttpHeaders.Authorization, "Bearer $accessToken") } } if (response.status.isSuccess()) { From 50672147786a67a885105bfd23d619549a5c7bff Mon Sep 17 00:00:00 2001 From: Pauline Date: Thu, 25 Jan 2024 14:42:39 +0000 Subject: [PATCH 3/3] Bump versions --- authorizer-app/package.json | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/authorizer-app/package.json b/authorizer-app/package.json index 3e0a7a8b..99bceb76 100644 --- a/authorizer-app/package.json +++ b/authorizer-app/package.json @@ -1,6 +1,6 @@ { "name": "authorizer-app", - "version": "4.4.0", + "version": "4.4.1", "description": "Simple app to authorize to collect data from third party services ", "repository": { "type": "git", diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 5b0fd5c3..125a48b5 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,6 @@ @Suppress("ConstPropertyName") object Versions { - const val project = "4.4.0" + const val project = "4.4.1" const val java = 17