chore: remove user id claim from property and make elixir_id default …

…instead
GenomicDataInfrastructure · Aug 22, 2024 · 7af7e69 · 7af7e69
1 parent 673dba1
commit 7af7e69
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationCommandApiImpl.java b/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationCommandApiImpl.java
@@ -29,7 +29,7 @@ public ApplicationCommandApiImpl(
             SubmitApplicationService submitApplicationService,
             AttachFileToApplicationService attachFileToApplicationService,
             AcceptTermsService acceptTermsService,
-            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim") String userIdClaim
+            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim", defaultValue = "elixir_id") String userIdClaim
     ) {
         this.identity = identity;
         this.saveApplicationService = saveApplicationService;

diff --git a/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationQueryApiImpl.java b/src/main/java/io/github/genomicdatainfrastructure/daam/api/ApplicationQueryApiImpl.java
@@ -26,7 +26,7 @@ public ApplicationQueryApiImpl(
             SecurityIdentity identity,
             ListApplicationsService listApplicationsService,
             RetrieveApplicationService retrieveApplicationService,
-            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim") String userIdClaim
+            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim", defaultValue = "elixir_id") String userIdClaim
     ) {
         this.identity = identity;
         this.listApplicationsService = listApplicationsService;

diff --git a/src/main/java/io/github/genomicdatainfrastructure/daam/api/EntitlementQueryApiImpl.java b/src/main/java/io/github/genomicdatainfrastructure/daam/api/EntitlementQueryApiImpl.java
@@ -19,7 +19,7 @@ public class EntitlementQueryApiImpl implements EntitlementQueryApi {
     public EntitlementQueryApiImpl(
             SecurityIdentity identity,
             RetrieveGrantedDatasetIdentifiersService retrieveGrantedDatasetIdentifiersService,
-            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim") String userIdClaim
+            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim", defaultValue = "elixir_id") String userIdClaim
     ) {
         this.identity = identity;
         this.retrieveGrantedDatasetIdentifiersService = retrieveGrantedDatasetIdentifiersService;

diff --git a/...main/java/io/github/genomicdatainfrastructure/daam/security/PostAuthenticationFilter.java b/...main/java/io/github/genomicdatainfrastructure/daam/security/PostAuthenticationFilter.java
@@ -29,7 +29,7 @@ public class PostAuthenticationFilter implements ContainerRequestFilter {
     public PostAuthenticationFilter(
             SecurityIdentity identity,
             CreateRemsUserService createRemsUserService,
-            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim") String userIdClaim
+            @ConfigProperty(name = "quarkus.rest-client.rems_yaml.user-id-claim", defaultValue = "elixir_id") String userIdClaim
     ) {
         this.identity = identity;
         this.createRemsUserService = createRemsUserService;

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -15,7 +15,6 @@ quarkus.openapi-generator.codegen.spec.rems_yaml.generate-part-filename=false
 quarkus.rest-client.rems_yaml.api-key=42
 quarkus.rest-client.rems_yaml.bot-user=owner
 quarkus.rest-client.rems_yaml.url=http://localhost:4000
-quarkus.rest-client.rems_yaml.user-id-claim=elixir_id
 quarkus.keycloak.devservices.realm-path=quarkus-realm.json
 quarkus.keycloak.devservices.port=32794
 quarkus.wiremock.devservices.port=4000