From c39f3bad0ff27fcc3761e079c125351c50f43030 Mon Sep 17 00:00:00 2001 From: Pauline Date: Mon, 21 Oct 2024 23:30:52 +0800 Subject: [PATCH 1/2] Add support for jwksurl in rest-sources-backend --- charts/radar-rest-sources-backend/README.md | 2 ++ charts/radar-rest-sources-backend/templates/configmap.yaml | 7 +++++++ charts/radar-rest-sources-backend/values.yaml | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/charts/radar-rest-sources-backend/README.md b/charts/radar-rest-sources-backend/README.md index 27a7efe1..53d45692 100644 --- a/charts/radar-rest-sources-backend/README.md +++ b/charts/radar-rest-sources-backend/README.md @@ -84,6 +84,8 @@ A Helm chart for the backend application of RADAR-base Rest Sources Authorizer | serverName | string | `"localhost"` | Resolvable server name, needed to find the advertised URL and callback URL | | managementportal_url | string | `"http://management-portal:8080/managementportal"` | URL of the Management Portal | | client_secret | string | `"secret"` | OAuth2 client secret of the radar-rest-sources-backend client from Management Portal | +| public_key_endpoints | list | `[]` | List of public key endpoints for token verification | +| auth_url | string | `"http://management-portal:8080/managementportal/oauth/token"` | Auth url for MP client | | restSourceClients.fitbit.enable | bool | `false` | set to true, if Fitbit client should be used | | restSourceClients.fitbit.sourceType | string | `"FitBit"` | Type of the data sources | | restSourceClients.fitbit.authorizationEndpoint | string | `"https://www.fitbit.com/oauth2/authorize"` | Authorization endpoint for Fitbit authentication and authorization | diff --git a/charts/radar-rest-sources-backend/templates/configmap.yaml b/charts/radar-rest-sources-backend/templates/configmap.yaml index 8cbb8a7a..5b786f04 100644 --- a/charts/radar-rest-sources-backend/templates/configmap.yaml +++ b/charts/radar-rest-sources-backend/templates/configmap.yaml @@ -21,10 +21,17 @@ data: auth: # Management Portal URL managementPortalUrl: {{ .Values.managementportal_url }} + # OAuth2 Auth URL for MP Client + authUrl: {{ .Values.auth_url }} # OAuth2 Client id of rest sources authorizer backend clientId: radar_rest_sources_auth_backend # OAuth2 Client Secret of rest sources authorizer backend client clientSecret: {{ .Values.client_secret }} + # List of public key endpoints for token verification + jwksUrls: + {{- range .Values.public_key_endpoints }} + - {{ . | quote }} + {{ end -}} database: driver: org.postgresql.Driver diff --git a/charts/radar-rest-sources-backend/values.yaml b/charts/radar-rest-sources-backend/values.yaml index 2652b00e..3f62ae7e 100644 --- a/charts/radar-rest-sources-backend/values.yaml +++ b/charts/radar-rest-sources-backend/values.yaml @@ -240,6 +240,13 @@ managementportal_url: http://management-portal:8080/managementportal # -- OAuth2 client secret of the radar-rest-sources-backend client from Management Portal client_secret: secret +# -- List of public key endpoints for token verification +public_key_endpoints: [] + # - https://localhost/managementportal/oauth/token_key + +# -- Auth url for MP client +auth_url: http://management-portal:8080/managementportal/oauth/token + restSourceClients: fitbit: # -- set to true, if Fitbit client should be used From af3630c960b96593cef63acd60eee2a4ce1197e1 Mon Sep 17 00:00:00 2001 From: Pauline Date: Mon, 21 Oct 2024 23:33:30 +0800 Subject: [PATCH 2/2] Bump version --- charts/radar-rest-sources-backend/Chart.yaml | 2 +- charts/radar-rest-sources-backend/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/radar-rest-sources-backend/Chart.yaml b/charts/radar-rest-sources-backend/Chart.yaml index b9d951a7..5ce33812 100644 --- a/charts/radar-rest-sources-backend/Chart.yaml +++ b/charts/radar-rest-sources-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "4.4.4" description: A Helm chart for the backend application of RADAR-base Rest Sources Authorizer name: radar-rest-sources-backend -version: 1.1.8 +version: 1.1.9 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-rest-sources-backend diff --git a/charts/radar-rest-sources-backend/README.md b/charts/radar-rest-sources-backend/README.md index 53d45692..b9d2f234 100644 --- a/charts/radar-rest-sources-backend/README.md +++ b/charts/radar-rest-sources-backend/README.md @@ -3,7 +3,7 @@ # radar-rest-sources-backend [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-rest-sources-backend)](https://artifacthub.io/packages/helm/radar-base/radar-rest-sources-backend) -![Version: 1.1.8](https://img.shields.io/badge/Version-1.1.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.4](https://img.shields.io/badge/AppVersion-4.4.4-informational?style=flat-square) +![Version: 1.1.9](https://img.shields.io/badge/Version-1.1.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.4](https://img.shields.io/badge/AppVersion-4.4.4-informational?style=flat-square) A Helm chart for the backend application of RADAR-base Rest Sources Authorizer