diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 168b17c8..dc1eed2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -126,9 +126,9 @@ jobs: # Use runtime labels from docker_meta_backend as well as fixed labels labels: | ${{ steps.docker_meta.outputs.labels }} - maintainer=Joris Borgdorff , Nivethika Mahasivam , Pauline Conde + maintainer=Nivethika Mahasivam , Pauline Conde , Bastiaan de Graaf org.opencontainers.image.description=RADAR-base rest sources authorizer backend application - org.opencontainers.image.authors=Joris Borgdorff , Nivethika Mahasivam , Pauline Conde + org.opencontainers.image.authors=Nivethika Mahasivam , Pauline Conde , Bastiaan de Graaf org.opencontainers.image.vendor=RADAR-base org.opencontainers.image.licenses=Apache-2.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f07f018c..a40abec0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,9 +80,9 @@ jobs: # Use runtime labels from docker_meta_backend as well as fixed labels labels: | ${{ steps.docker_meta.outputs.labels }} - maintainer=Joris Borgdorff , Nivethika Mahasivam , Pauline Conde + maintainer=Nivethika Mahasivam , Pauline Conde , Bastiaan de Graaf org.opencontainers.image.description=RADAR-base rest sources authorizer backend application - org.opencontainers.image.authors=Joris Borgdorff , Nivethika Mahasivam , Pauline Conde + org.opencontainers.image.authors=Nivethika Mahasivam , Pauline Conde , Bastiaan de Graaf org.opencontainers.image.vendor=RADAR-base org.opencontainers.image.licenses=Apache-2.0 diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index ccf0ce47..cc7b032e 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -1,8 +1,7 @@ name: Snyk test on: pull_request: - branches: - - master + branches: [ master, dev ] jobs: security: runs-on: ubuntu-latest @@ -34,3 +33,4 @@ jobs: --configuration-matching='^runtimeClasspath$' --org=radar-base --policy-path=$PWD/.snyk + --severity-threshold=high 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..c4fd991b 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 @@ -52,10 +52,10 @@ data class RestOauth1UserId( @Serializable data class OuraAuthUserId( - val age: Int, - val weight: Float, - val height: Float, - val biological_sex: String, + val age: Int? = null, + val weight: Float? = null, + val height: Float? = null, + val biological_sex: String? = null, val email: String, @SerialName("id") val userId: String, ) diff --git a/authorizer-app/package.json b/authorizer-app/package.json index 99bceb76..0cbeadb2 100644 --- a/authorizer-app/package.json +++ b/authorizer-app/package.json @@ -1,6 +1,6 @@ { "name": "authorizer-app", - "version": "4.4.1", + "version": "4.4.2", "description": "Simple app to authorize to collect data from third party services ", "repository": { "type": "git", diff --git a/authorizer-app/src/app/auth/services/management-portal-auth.service.ts b/authorizer-app/src/app/auth/services/management-portal-auth.service.ts index 84d36003..b765d04e 100644 --- a/authorizer-app/src/app/auth/services/management-portal-auth.service.ts +++ b/authorizer-app/src/app/auth/services/management-portal-auth.service.ts @@ -91,6 +91,7 @@ export class ManagementPortalAuthService extends AuthService { .set('grant_type', environment.authorizationGrantType) .set('redirect_uri', window.location.href.split('?')[0]) .set('code', authCode) + .set('client_id', environment.appClientId) } getTokenRequestHeaders() { diff --git a/authorizer-app/yarn.lock b/authorizer-app/yarn.lock index 553ac4ae..2d1eed01 100644 --- a/authorizer-app/yarn.lock +++ b/authorizer-app/yarn.lock @@ -2776,11 +2776,11 @@ brace-expansion@^2.0.1: balanced-match "^1.0.0" braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" browserslist@4.21.4, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4: version "4.21.4" @@ -3813,10 +3813,10 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" @@ -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.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== for-each@^0.3.3: version "0.3.3" @@ -4348,9 +4348,9 @@ inquirer@8.2.4: wrap-ansi "^7.0.0" ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105" + integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ== ipaddr.js@1.9.1: version "1.9.1" @@ -6837,9 +6837,9 @@ wrappy@1: integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@^8.4.2: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" - integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== + version "8.17.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" + integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== xtend@~4.0.1: version "4.0.2" diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 125a48b5..78c273ec 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,23 +1,23 @@ @Suppress("ConstPropertyName") object Versions { - const val project = "4.4.1" + const val project = "4.4.2" const val java = 17 - const val kotlin = "1.9.10" + const val kotlin = "1.9.23" - const val radarCommons = "1.1.1" - const val radarJersey = "0.11.0" - const val postgresql = "42.6.0" - const val ktor = "2.3.5" - const val jedis = "5.0.2" + const val radarCommons = "1.1.2" + const val radarJersey = "0.11.1" + const val postgresql = "42.6.1" + const val ktor = "2.3.11" + const val jedis = "5.1.3" - const val slf4j = "2.0.9" - const val log4j2 = "2.21.0" + const val slf4j = "2.0.13" + const val log4j2 = "2.23.1" - const val jersey = "3.1.3" - const val junit = "5.10.0" - const val mockitoKotlin = "5.1.0" + const val jersey = "3.1.7" + const val junit = "5.10.2" + const val mockitoKotlin = "5.3.1" const val hamcrest = "2.2" const val gradle = "8.4" diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 00000000..6b671344 --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,10 @@ +{ + "systemParams": "win32-x64-93", + "modulesFolders": [], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 00000000..fb57ccd1 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + +