Skip to content

fix: not adding tenantids in old version #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2023
Merged

fix: not adding tenantids in old version #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/main/java/io/supertokens/webserver/api/core/UsersAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@

package io.supertokens.webserver.api.core;

import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.*;
import io.supertokens.Main;
import io.supertokens.authRecipe.AuthRecipe;
import io.supertokens.authRecipe.UserPaginationContainer;
Expand All @@ -31,6 +28,7 @@
import io.supertokens.pluginInterface.multitenancy.TenantIdentifierWithStorage;
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.useridmapping.UserIdMapping;
import io.supertokens.utils.SemVer;
import io.supertokens.utils.Utils;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.WebserverAPI;
Expand Down Expand Up @@ -186,6 +184,13 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
result.addProperty("status", "OK");

JsonArray usersJson = new JsonParser().parse(new Gson().toJson(users.users)).getAsJsonArray();

if (getVersionFromRequest(req).lesserThan(SemVer.v3_0)) {
for (JsonElement user : usersJson) {
user.getAsJsonObject().remove("tenantIds");
}
}

result.add("users", usersJson);

if (users.nextPaginationToken != null) {
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/io/supertokens/webserver/api/emailpassword/ImportUserWithPasswordHashAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import io.supertokens.pluginInterface.exceptions.StorageQueryException;
import io.supertokens.pluginInterface.exceptions.StorageTransactionLogicException;
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.utils.SemVer;
import io.supertokens.utils.Utils;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.WebserverAPI;
Expand Down Expand Up @@ -98,6 +99,11 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
JsonObject response = new JsonObject();
response.addProperty("status", "OK");
JsonObject userJson = new JsonParser().parse(new Gson().toJson(importUserResponse.user)).getAsJsonObject();

if (getVersionFromRequest(req).lesserThan(SemVer.v3_0)) {
userJson.remove("tenantIds");
}

response.add("user", userJson);
response.addProperty("didUserAlreadyExist", importUserResponse.didUserAlreadyExist);
super.sendJsonResponse(200, response, resp);
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/io/supertokens/webserver/api/emailpassword/SignInAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.pluginInterface.useridmapping.UserIdMapping;
import io.supertokens.useridmapping.UserIdType;
import io.supertokens.utils.SemVer;
import io.supertokens.utils.Utils;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.WebserverAPI;
Expand Down Expand Up @@ -91,6 +92,9 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
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);

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/io/supertokens/webserver/api/emailpassword/SignUpAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import io.supertokens.pluginInterface.exceptions.StorageQueryException;
import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.utils.SemVer;
import io.supertokens.utils.Utils;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.WebserverAPI;
Expand Down Expand Up @@ -85,6 +86,11 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
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);

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/io/supertokens/webserver/api/emailpassword/UserAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.supertokens.AppIdentifierWithStorageAndUserIdMapping;
import io.supertokens.useridmapping.UserIdMapping;
import io.supertokens.useridmapping.UserIdType;
import io.supertokens.utils.SemVer;
import io.supertokens.utils.Utils;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.WebserverAPI;
Expand Down Expand Up @@ -124,6 +125,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);
}
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/io/supertokens/webserver/api/passwordless/ConsumeCodeAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.pluginInterface.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;
Expand Down Expand Up @@ -99,6 +100,10 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
result.addProperty("status", "OK");
JsonObject userJson = new JsonParser().parse(new Gson().toJson(consumeCodeResponse.user)).getAsJsonObject();

if (getVersionFromRequest(req).lesserThan(SemVer.v3_0)) {
userJson.remove("tenantIds");
}

result.addProperty("createdNewUser", consumeCodeResponse.createdNewUser);
result.add("user", userJson);

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/io/supertokens/webserver/api/passwordless/UserAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import io.supertokens.pluginInterface.passwordless.exception.DuplicatePhoneNumberException;
import io.supertokens.pluginInterface.useridmapping.UserIdMapping;
import io.supertokens.useridmapping.UserIdType;
import io.supertokens.utils.SemVer;
import io.supertokens.utils.Utils;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.WebserverAPI;
Expand Down Expand Up @@ -123,6 +124,11 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
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);
}
Expand Down
13 changes: 9 additions & 4 deletions src/main/java/io/supertokens/webserver/api/thirdparty/GetUsersByEmailAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@

package io.supertokens.webserver.api.thirdparty;

import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.*;
import io.supertokens.Main;
import io.supertokens.pluginInterface.multitenancy.AppIdentifierWithStorage;
import io.supertokens.pluginInterface.multitenancy.TenantIdentifierWithStorage;
Expand All @@ -30,6 +27,7 @@
import io.supertokens.thirdparty.ThirdParty;
import io.supertokens.useridmapping.UserIdMapping;
import io.supertokens.useridmapping.UserIdType;
import io.supertokens.utils.SemVer;
import io.supertokens.utils.Utils;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.WebserverAPI;
Expand Down Expand Up @@ -76,6 +74,13 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
JsonObject result = new JsonObject();
result.addProperty("status", "OK");
JsonArray usersJson = new JsonParser().parse(new Gson().toJson(users)).getAsJsonArray();

if (getVersionFromRequest(req).lesserThan(SemVer.v3_0)) {
for (JsonElement user : usersJson) {
user.getAsJsonObject().remove("tenantIds");
}
}

result.add("users", usersJson);

super.sendJsonResponse(200, result, resp);
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/io/supertokens/webserver/api/thirdparty/SignInUpAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,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);

Expand Down