From 2060025bfca691d5e33b715090bb18f6adf31e6e Mon Sep 17 00:00:00 2001
From: Pim van Nierop <pim@thehyve.nl>
Date: Thu, 6 Jun 2024 13:54:45 +0200
Subject: [PATCH] Working version of subject specific auth

---
 data-dashboard-backend/dashboard.yml            | 17 +++++++++++------
 data-dashboard-backend/dev/dashboard.yml        |  2 +-
 .../api/resource/ObservationResource.kt         |  6 +-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/data-dashboard-backend/dashboard.yml b/data-dashboard-backend/dashboard.yml
index 84b0d99..2c63a8d 100644
--- a/data-dashboard-backend/dashboard.yml
+++ b/data-dashboard-backend/dashboard.yml
@@ -1,14 +1,19 @@
+service:
+  baseUri: http://0.0.0.0:9000/api
+  advertisedBaseUri: http://0.0.0.0:9000/api
+  enableCors: false
+
 auth:
   managementPortal:
-    url: http://localhost:8080/managementportal
-    clientId: data_dashboard_api
-    clientSecret: data_dashboard_api_secret
+    url: http://management-portal:8080/managementportal
+    clientId: radar_data_dashboard_backend
+    clientSecret: XKf2oJUW8zE9IcYdvbJijnHowvq23h8RlVzGTydd
   jwtResourceName: res_DataDashboardAPI
 
 database:
-  url: jdbc:postgresql://localhost:5432/data
-  user: radarbase
-  password: radarbase
+  url: jdbc:postgresql://timescaledb-postgresql-hl/data-dashboard
+  user: postgres
+  password: s_tgh4_6Y3ciMWtgZ8tXVxu8
   dialect: org.hibernate.dialect.PostgreSQLDialect
   liquibase:
     contexts: [prod]
diff --git a/data-dashboard-backend/dev/dashboard.yml b/data-dashboard-backend/dev/dashboard.yml
index 7ed44ec..cf18b29 100644
--- a/data-dashboard-backend/dev/dashboard.yml
+++ b/data-dashboard-backend/dev/dashboard.yml
@@ -11,7 +11,7 @@ auth:
   jwtResourceName: res_DataDashboardAPI
 
 database:
-  url: jdbc:postgresql://127.0.0.1:5432/data
+  url: jdbc:postgresql://127.0.0.1:5432/data-dashboard
   user: radarbase
   password: radarbase
   dialect: org.hibernate.dialect.PostgreSQLDialect
diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/resource/ObservationResource.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/resource/ObservationResource.kt
index 04574fc..1bca0c2 100644
--- a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/resource/ObservationResource.kt
+++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/resource/ObservationResource.kt
@@ -21,11 +21,9 @@ package org.radarbase.datadashboard.api.resource
 import jakarta.annotation.Resource
 import jakarta.ws.rs.Consumes
 import jakarta.ws.rs.GET
-import jakarta.ws.rs.NotFoundException
 import jakarta.ws.rs.Path
 import jakarta.ws.rs.PathParam
 import jakarta.ws.rs.Produces
-import jakarta.ws.rs.container.ContainerRequestContext
 import jakarta.ws.rs.core.Context
 import org.radarbase.auth.authorization.Permission
 import org.radarbase.datadashboard.api.api.ObservationListDto
@@ -41,12 +39,10 @@ import org.slf4j.LoggerFactory
 @Authenticated
 class ObservationResource(
     @Context private val observationService: ObservationService,
-    @Context private val request: ContainerRequestContext,
 ) {
     @GET
     @Path("observations")
-//    @NeedsPermission(Permission.MEASUREMENT_READ, "projectId", "subjectId")
-    @NeedsPermission(Permission.MEASUREMENT_READ)
+    @NeedsPermission(Permission.MEASUREMENT_READ, "projectId", "subjectId")
     fun getObservations(
         @PathParam("projectId") projectId: String,
         @PathParam("subjectId") subjectId: String,