replace zone references with tenant and app_tid (#1265)

SAP · Aug 21, 2023 · bd65785 · bd65785
1 parent a8f2ef4
commit bd65785
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/samples/spring-security-hybrid-usage/src/main/java/sample/spring/security/DataService.java b/samples/spring-security-hybrid-usage/src/main/java/sample/spring/security/DataService.java
@@ -26,7 +26,7 @@ public class DataService {
      *
      */
     String readSensitiveData() {
-        String zoneId = SpringSecurityContext.getToken().getZoneId();
-        return "You got the sensitive data for zone '" + zoneId + "'.";
+        String appTid = SpringSecurityContext.getToken().getAppTid();
+        return "You got the sensitive data for tenant '" + appTid + "'.";
     }
 }
diff --git a/...spring-security-hybrid-usage/src/test/java/sample/spring/security/TestControllerTest.java b/...spring-security-hybrid-usage/src/test/java/sample/spring/security/TestControllerTest.java
@@ -65,7 +65,7 @@ public void sayHello() throws Exception {
                 .andReturn().getResponse().getContentAsString();
 
         assertTrue(response.contains("sb-clientId!t0815"));
-        assertTrue(response.contains("the-zone-id"));
+        assertTrue(response.contains("the-app-tid"));
     }
 
     @Test
@@ -74,13 +74,13 @@ public void readData_OK() throws Exception {
                 .perform(get("/method").with(bearerToken(jwtXsuaa)))
                 .andExpect(status().isOk())
                 .andReturn().getResponse().getContentAsString();
-        assertTrue(response.contains("You got the sensitive data for zone 'the-zone-id'."));
+        assertTrue(response.contains("You got the sensitive data for tenant 'the-zone-id'."));
 
         response = mvc
                 .perform(get("/method").with(bearerToken(jwtIas)))
                 .andExpect(status().isOk())
                 .andReturn().getResponse().getContentAsString();
-        assertTrue(response.contains("You got the sensitive data for zone 'the-zone-id'."));
+        assertTrue(response.contains("You got the sensitive data for tenant 'the-app-tid'."));
     }
 
     @Test

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
@@ -62,7 +62,7 @@ void readData_OK() throws Exception {
 				.andExpect(status().isOk())
 				.andReturn().getResponse().getContentAsString();
 
-		assertTrue(response.contains("You got the sensitive data for zone 'the-app-tid'."));
+		assertTrue(response.contains("You got the sensitive data for tenant 'the-app-tid'."));
 	}
 
 	@Test

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
@@ -66,7 +66,7 @@ void readData_OK() throws Exception {
 				.andExpect(status().isOk())
 				.andReturn().getResponse().getContentAsString();
 
-		assertTrue(response.contains("You got the sensitive data for zone 'the-zone-id'."));
+		assertTrue(response.contains("You got the sensitive data for tenant 'the-zone-id'."));
 	}
 
 	@Test