fix the multiple bean issue

Signed-off-by: liga-oz <[email protected]>
SAP · Feb 8, 2024 · 36d7860 · 36d7860
1 parent 1f1bc2e
commit 36d7860
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 33 deletions.
diff --git a/...pring-security-hybrid-usage/src/main/java/sample/spring/security/XsuaaAuthzConverter.java b/...pring-security-hybrid-usage/src/main/java/sample/spring/security/XsuaaAuthzConverter.java
@@ -8,11 +8,8 @@
 import com.sap.cloud.security.spring.token.authentication.XsuaaTokenAuthorizationConverter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.oauth2.jwt.Jwt;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,7 +20,7 @@
 public class XsuaaAuthzConverter {
 
 	@Bean
-	public Converter<Jwt, AbstractAuthenticationToken> multipleXsuaaConfigAuthzConverter(
+	public XsuaaTokenAuthorizationConverter multipleXsuaaConfigAuthzConverter(
 			XsuaaServiceConfigurations xsuaaConfigs) {
 		return new XsuaaTokenAuthorizationConverterExt (
 				xsuaaConfigs.getConfigurations().get(0).getProperty(APP_ID),

diff --git a/...urity-hybrid-usage/src/test/java/sample/spring/security/junitjupiter/ApplicationTest.java b/...urity-hybrid-usage/src/test/java/sample/spring/security/junitjupiter/ApplicationTest.java
@@ -9,13 +9,11 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @SpringBootTest
 @java.lang.SuppressWarnings("squid:S2699")
-@ActiveProfiles("multixsuaa") // properties are provided with /resources/application-multixsuaa.yml
 class ApplicationTest {
     @Autowired
     XsuaaTokenFlows tokenflows;

diff --git a/...hybrid-usage/src/test/java/sample/spring/security/junitjupiter/TestControllerIasTest.java b/...hybrid-usage/src/test/java/sample/spring/security/junitjupiter/TestControllerIasTest.java
@@ -15,7 +15,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -25,7 +24,6 @@
 
 @SpringBootTest
 @AutoConfigureMockMvc
-@ActiveProfiles("multixsuaa") // properties are provided with /resources/application-multixsuaa.yml
 @ExtendWith(IasExtension.class)
 class TestControllerIasTest {
 

diff --git a/...brid-usage/src/test/java/sample/spring/security/junitjupiter/TestControllerXsuaaTest.java b/...brid-usage/src/test/java/sample/spring/security/junitjupiter/TestControllerXsuaaTest.java
@@ -15,7 +15,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -26,7 +25,6 @@
 @SpringBootTest
 @AutoConfigureMockMvc
 @ExtendWith(XsuaaExtension.class)
-@ActiveProfiles("multixsuaa") // properties are provided with /resources/application-multixsuaa.yml
 class TestControllerXsuaaTest {
 
 	@Autowired

diff --git a/samples/spring-security-hybrid-usage/src/test/resources/application-multixsuaa.yml b/samples/spring-security-hybrid-usage/src/test/resources/application-multixsuaa.yml
diff --git a/samples/spring-security-hybrid-usage/src/test/resources/application.yml b/samples/spring-security-hybrid-usage/src/test/resources/application.yml
@@ -4,13 +4,34 @@
 sap:
   security:
     services:
-      xsuaa:
+      xsuaa[0]:
         xsappname: xsapp!t0815
         uaadomain: localhost
         clientid: sb-clientId!t0815
         clientsecret: pwd
         url: http://localhost
+        plan: application
+      xsuaa[1]:
+        xsappname: xsapp!b04711
+        clientid: sb-clientId!b04711
+        plan: broker
 
       identity:
         clientid: sb-clientId!t0815
-        domains: localhost
+        domains: localhost
+
+#Single xsuaa service configuration
+#      xsuaa:
+#        xsappname: xsapp!t0815
+#        uaadomain: localhost
+#        clientid: sb-clientId!t0815
+#        clientsecret: pwd
+#        url: http://localhost
+#
+#      identity:
+#        clientid: sb-clientId!t0815
+#        domains: localhost
+
+logging.level:
+  com.sap: DEBUG                      # set SAP-class loggers to DEBUG.
+  org.springframework: DEBUG