Merge pull request #10423 from cBioPortal/pvannierop-patch-1

Fix context initialization when property 'dat.method' is missing
cBioPortal · Oct 9, 2023 · 399ca10 · 399ca10
2 parents 80f067d + 1c62013
commit 399ca10
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ava/org/cbioportal/security/spring/authentication/token/config/DataAccessTokenConfig.java b/...ava/org/cbioportal/security/spring/authentication/token/config/DataAccessTokenConfig.java
@@ -48,7 +48,7 @@ public OAuth2DataAccessTokenServiceImpl oauth2DataAccessTokenService() {
     }
 
     @Bean("dataAccessTokenService")
-    @ConditionalOnProperty(name = "dat.method", havingValue = "none")
+    @ConditionalOnProperty(name = "dat.method", havingValue = "none", matchIfMissing = true)
     public UnauthDataAccessTokenServiceImpl unauthDataAccessTokenService() {
         return new UnauthDataAccessTokenServiceImpl();
     }
@@ -65,4 +65,4 @@ public JwtDataAccessTokenServiceImpl jwtDataAccessTokenService() {
         return new JwtDataAccessTokenServiceImpl();
     }
 
-}
+}