fix: tenantid in old CDI fix

src/main/java/io/supertokens/webserver/api/core/UsersAPI.java

@@ -187,7 +187,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
 
             if (getVersionFromRequest(req).lesserThan(SemVer.v3_0)) {
                 for (JsonElement user : usersJson) {
-                    user.getAsJsonObject().remove("tenantIds");
+                    user.getAsJsonObject().get("user").getAsJsonObject().remove("tenantIds");
                 }
             }
 

src/main/java/io/supertokens/webserver/api/thirdparty/SignInUpAPI.java

@@ -132,6 +132,11 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
                 result.addProperty("status", "OK");
                 result.addProperty("createdNewUser", response.createdNewUser);
                 JsonObject userJson = new JsonParser().parse(new Gson().toJson(response.user)).getAsJsonObject();
+
+                if (getVersionFromRequest(req).lesserThan(SemVer.v3_0)) {
+                    userJson.remove("tenantIds");
+                }
+
                 result.add("user", userJson);
                 super.sendJsonResponse(200, result, resp);
 

src/main/java/io/supertokens/webserver/api/thirdparty/UserAPI.java

@@ -29,6 +29,7 @@
 import io.supertokens.thirdparty.ThirdParty;
 import io.supertokens.useridmapping.UserIdMapping;
 import io.supertokens.useridmapping.UserIdType;
+import io.supertokens.utils.SemVer;
 import io.supertokens.webserver.InputParser;
 import io.supertokens.webserver.WebserverAPI;
 import jakarta.servlet.ServletException;
@@ -110,6 +111,11 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
                 JsonObject result = new JsonObject();
                 result.addProperty("status", "OK");
                 JsonObject userJson = new JsonParser().parse(new Gson().toJson(user)).getAsJsonObject();
+
+                if (getVersionFromRequest(req).lesserThan(SemVer.v3_0)) {
+                    userJson.remove("tenantIds");
+                }
+
                 result.add("user", userJson);
                 super.sendJsonResponse(200, result, resp);
             }

src/test/java/io/supertokens/test/emailpassword/api/EmailPasswordGetUserAPITest2_7.java

@@ -124,7 +124,7 @@ public void testGoodInput() throws Exception {
             assertEquals(signUpUser.get("email").getAsString(), userInfo.get("email").getAsString());
             assertEquals(signUpUser.get("id").getAsString(), userInfo.get("id").getAsString());
             signUpUser.get("timeJoined").getAsLong();
-            assertEquals(signUpUser.entrySet().size(), 4);
+            assertEquals(signUpUser.entrySet().size(), 3);
         }
 
         {
@@ -149,7 +149,7 @@ public void testGoodInput() throws Exception {
             assertEquals(signUpUser.get("email").getAsString(), userInfo.get("email").getAsString());
             assertEquals(signUpUser.get("id").getAsString(), userInfo.get("id").getAsString());
             signUpUser.get("timeJoined").getAsLong();
-            assertEquals(signUpUser.entrySet().size(), 4);
+            assertEquals(signUpUser.entrySet().size(), 3);
         }
 
         process.kill();

src/test/java/io/supertokens/test/emailpassword/api/SignInAPITest2_7.java

@@ -156,7 +156,7 @@ public void testGoodInput() throws Exception {
         assertEquals(signInResponse.get("user").getAsJsonObject().get("email").getAsString(),
                 userInfo.get("email").getAsString());
         signInResponse.get("user").getAsJsonObject().get("timeJoined").getAsLong();
-        assertEquals(signInResponse.get("user").getAsJsonObject().entrySet().size(), 4);
+        assertEquals(signInResponse.get("user").getAsJsonObject().entrySet().size(), 3);
 
         int activeUsers = ActiveUsers.countUsersActiveSince(process.getProcess(), beforeSignIn);
         assert (activeUsers == 1);
@@ -199,7 +199,7 @@ public void testThatUnnormalisedEmailShouldAlsoWork() throws Exception {
         assertEquals(signInResponse.get("user").getAsJsonObject().get("email").getAsString(),
                 userInfo.get("email").getAsString());
         signInResponse.get("user").getAsJsonObject().get("timeJoined").getAsLong();
-        assertEquals(signInResponse.get("user").getAsJsonObject().entrySet().size(), 4);
+        assertEquals(signInResponse.get("user").getAsJsonObject().entrySet().size(), 3);
 
         process.kill();
         assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STOPPED));

src/test/java/io/supertokens/test/emailpassword/api/SignUpAPITest2_7.java

@@ -168,7 +168,7 @@ public void testGoodInput() throws Exception {
         assertEquals(signInResponse.get("user").getAsJsonObject().get("email").getAsString(),
                 signUpUser.get("email").getAsString());
         signInResponse.get("user").getAsJsonObject().get("timeJoined").getAsLong();
-        assertEquals(signInResponse.get("user").getAsJsonObject().entrySet().size(), 4);
+        assertEquals(signInResponse.get("user").getAsJsonObject().entrySet().size(), 3);
 
         process.kill();
         assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STOPPED));