Merge pull request #256 from RADAR-base/release-4.4.1

Release 4.4.1
RADAR-base · Jan 25, 2024 · bdb6fa4 · bdb6fa4
2 parents 4243cbb + 5067214
commit bdb6fa4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 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
@@ -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/...er-app-backend/src/main/java/org/radarbase/authorizer/service/OuraAuthorizationService.kt b/...er-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"
     }
 }
diff --git 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
@@ -1,6 +1,6 @@
 @Suppress("ConstPropertyName")
 object Versions {
-    const val project = "4.4.0"
+    const val project = "4.4.1"
 
     const val java = 17