MTM-60160: the oauth based authentication fails with newer spring version cause of change : spring-projects/spring-security#10347. The microservice proxy sends basic auth in combination with cookie authentication which now triggers re authentication as username don't match (#90)

Author: jaro-herod

microservice/security/src/main/java/com/cumulocity/microservice/security/token/JwtTokenAuthentication.java

@@ -65,15 +65,25 @@ public Object getDetails() {
 
     @Override
     public Object getPrincipal() {
-        return currentUserRepresentation != null ? currentUserRepresentation.getUserName() : null;
+        return getUserName();
     }
 
     @Override
     public String getName() {
+        final String tenantName = getTenantName();
+        final String userName = getUserName();
+        if (userName != null && tenantName != null) {
+            return tenantName + "/" + userName;
+        } else {
+            return userName;
+        }
+    }
+
+    private String getUserName() {
         return currentUserRepresentation != null ? currentUserRepresentation.getUserName() : null;
     }
 
-    String getTenantName(){
+    String getTenantName() {
         return userCredentials == null ? null : userCredentials.getTenant();
     }
 }

microservice/security/src/test/java/com/cumulocity/microservice/security/token/JwtTokenAuthenticationTest.java

@@ -1,6 +1,7 @@
 package com.cumulocity.microservice.security.token;
 
 import com.cumulocity.microservice.context.credentials.UserCredentials;
+import com.cumulocity.rest.representation.user.CurrentUserRepresentation;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -51,4 +52,21 @@ public void shouldGetNullTenantNameWhenUserCredentialsAreMissing() {
         assertThat(tenantName).isNull();
     }
 
+    // Fix of https://cumulocity.atlassian.net/browse/MTM-60160
+    @Test
+    public void shouldReturnNameToIncludeTenantAndUserNameToMatch() {
+        // given
+        JwtTokenAuthentication jwtTokenAuthentication = new JwtTokenAuthentication(credentials);
+        jwtTokenAuthentication.setUserCredentials(UserCredentials.builder().tenant(TENANT_NAME).build());
+        CurrentUserRepresentation currentUser = new CurrentUserRepresentation();
+        currentUser.setUserName("user");
+        jwtTokenAuthentication.setCurrentUserRepresentation(currentUser);
+        //when
+        String tenantName = jwtTokenAuthentication.getName();
+
+        //then
+        assertThat(tenantName).isEqualTo(TENANT_NAME + "/" + currentUser.getUserName());
+    }
+
+
 }