From 9cb75b6eead6e2b685f7a058428ce8c452435d30 Mon Sep 17 00:00:00 2001
From: haynescd <haynescd@chop.edu>
Date: Wed, 17 Jan 2024 23:01:46 -0500
Subject: [PATCH] Force Method Auth if using oauth2 or saml

---
 .../org/cbioportal/security/config/MethodSecurityConfig.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/cbioportal/security/config/MethodSecurityConfig.java b/src/main/java/org/cbioportal/security/config/MethodSecurityConfig.java
index 9a6822286e7..a2cc8f66953 100644
--- a/src/main/java/org/cbioportal/security/config/MethodSecurityConfig.java
+++ b/src/main/java/org/cbioportal/security/config/MethodSecurityConfig.java
@@ -15,9 +15,7 @@
 
 @Configuration
 @EnableMethodSecurity(prePostEnabled = true)
-@ConditionalOnExpression("{'oauth2','saml','optional_oauth2'}.contains('${authenticate}')")
-//TODO: Potentially Delete after import pipeline fixed
-@ConditionalOnProperty(name = "security.method_authorization_enabled", havingValue = "true")
+@ConditionalOnExpression("{'oauth2','saml'}.contains('${authenticate}')")
 public class MethodSecurityConfig {
     @Value("${app.name:}")
     private String appName;