From eb8369ddfac2bb3664b23433bb52f138fc797179 Mon Sep 17 00:00:00 2001 From: haynescd Date: Wed, 3 Jan 2024 09:45:05 -0500 Subject: [PATCH] fix InActiveCacheMapUtil --- .../persistence/cachemaputil/InactiveCacheMapUtil.java | 2 +- .../org/cbioportal/security/config/OAuth2SecurityConfig.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/cbioportal/persistence/cachemaputil/InactiveCacheMapUtil.java b/src/main/java/org/cbioportal/persistence/cachemaputil/InactiveCacheMapUtil.java index 26cc6a826e1..2ef34e3839c 100644 --- a/src/main/java/org/cbioportal/persistence/cachemaputil/InactiveCacheMapUtil.java +++ b/src/main/java/org/cbioportal/persistence/cachemaputil/InactiveCacheMapUtil.java @@ -42,7 +42,7 @@ @Component // This implementation of the CacheMapUtils is instantiated on portals where all uses can access any study. -@ConditionalOnProperty(name = "authenticate", havingValue = "false", matchIfMissing = true) +@ConditionalOnProperty(name = "security.method_authorization_enabled", havingValue = "false", matchIfMissing = true) public class InactiveCacheMapUtil implements CacheMapUtil { // Since user-permission evaluation is not needed when this bean is present, throw an error when it is accessed. diff --git a/src/main/java/org/cbioportal/security/config/OAuth2SecurityConfig.java b/src/main/java/org/cbioportal/security/config/OAuth2SecurityConfig.java index 4a8801029a0..1a9e27634bd 100644 --- a/src/main/java/org/cbioportal/security/config/OAuth2SecurityConfig.java +++ b/src/main/java/org/cbioportal/security/config/OAuth2SecurityConfig.java @@ -10,7 +10,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; -import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;