From a3f42c3771a7ea887dfe88f6a8a1926ebb1de521 Mon Sep 17 00:00:00 2001 From: Pauline Conde Date: Thu, 25 Jan 2024 13:17:57 +0000 Subject: [PATCH 1/4] Revert "Updated getExternalId function for Oura Oauth" --- .../org/radarbase/authorizer/api/ApiDeclarations.kt | 4 ++-- .../authorizer/service/OuraAuthorizationService.kt | 10 ++++------ 2 files changed, 6 insertions(+), 8 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 508e6a42..1253d53b 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 biological_sex: String, + val gender: String, val email: String, - @SerialName("id") val userId: String, + @SerialName("user_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 928622b7..b1479a69 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,10 +4,8 @@ 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 @@ -79,9 +77,9 @@ class OuraAuthorizationService( private suspend fun getExternalId(accessToken: String): String = withContext(Dispatchers.IO) { try { val response = httpClient.get { - url(OURA_USER_ID_ENDPOINT) - headers { - append(HttpHeaders.Authorization, "Bearer $accessToken") + url { + takeFrom(OURA_USER_ID_ENDPOINT) + parameters.append("access_token", accessToken) } } if (response.status.isSuccess()) { @@ -101,6 +99,6 @@ class OuraAuthorizationService( } companion object { - private const val OURA_USER_ID_ENDPOINT = "https://api.ouraring.com/v2/usercollection/personal_info" + private const val OURA_USER_ID_ENDPOINT = "https://api.ouraring.com/v1/userinfo" } } From 668c7ec953cb41303799593dc35253f8e1daa44f Mon Sep 17 00:00:00 2001 From: Heet Sankesara Date: Thu, 25 Jan 2024 15:32:11 +0530 Subject: [PATCH 2/4] 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 98e50004eb0e3ee89d1619b8f6bb4ace78b27c44 Mon Sep 17 00:00:00 2001 From: Heet Sankesara Date: Thu, 25 Jan 2024 16:01:15 +0530 Subject: [PATCH 3/4] 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 ec2c5386e902671cb3e6245e153dfac59b59b5bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 16:44:24 +0000 Subject: [PATCH 4/4] Bump follow-redirects from 1.15.2 to 1.15.5 in /authorizer-app Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.5. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.5) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- authorizer-app/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/authorizer-app/yarn.lock b/authorizer-app/yarn.lock index c75d9903..201912b6 100644 --- a/authorizer-app/yarn.lock +++ b/authorizer-app/yarn.lock @@ -3856,9 +3856,9 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== follow-redirects@^1.0.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + version "1.15.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020" + integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw== for-each@^0.3.3: version "0.3.3"