fix: disable bulk import for in-memory db

supertokens · Apr 29, 2024 · ddfaa1c · ddfaa1c
1 parent fcdfb54
commit ddfaa1c
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 78 deletions.
diff --git a/src/main/java/io/supertokens/cronjobs/bulkimport/ProcessBulkImportUsers.java b/src/main/java/io/supertokens/cronjobs/bulkimport/ProcessBulkImportUsers.java
@@ -107,7 +107,7 @@ protected void doTaskPerApp(AppIdentifier app)
             throws TenantOrAppNotFoundException, StorageQueryException, InvalidConfigException, IOException,
             DbInitException {
 
-        if (StorageLayer.getBaseStorage(main).getType() != STORAGE_TYPE.SQL) {
+        if (StorageLayer.getBaseStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
             return;
         }
 

diff --git a/src/main/java/io/supertokens/inmemorydb/Start.java b/src/main/java/io/supertokens/inmemorydb/Start.java
@@ -137,8 +137,7 @@ public void constructor(String processId, boolean silent, boolean isTesting) {
 
     @Override
     public Storage createBulkImportProxyStorageInstance() {
-        // throw not implemented error
-        throw new UnsupportedOperationException("Unimplemented method 'createBulkImportProxyStorageInstance'");
+        throw new UnsupportedOperationException("'createBulkImportProxyStorageInstance' is not supported for in-memory db");
 
     }
 

diff --git a/src/main/java/io/supertokens/webserver/api/bulkimport/BulkImportAPI.java b/src/main/java/io/supertokens/webserver/api/bulkimport/BulkImportAPI.java
@@ -38,6 +38,7 @@
 import io.supertokens.pluginInterface.exceptions.StorageQueryException;
 import io.supertokens.pluginInterface.multitenancy.AppIdentifier;
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
+import io.supertokens.storageLayer.StorageLayer;
 import io.supertokens.utils.Utils;
 import io.supertokens.webserver.InputParser;
 import io.supertokens.webserver.WebserverAPI;
@@ -58,6 +59,11 @@ public String getPath() {
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         // API is app specific
+
+        if (StorageLayer.isInMemDb(main)) {
+            throw new ServletException(new BadRequestException("This API is not supported in the in-memory database."));
+        }
+
         String statusString = InputParser.getQueryParamOrThrowError(req, "status", true);
         String paginationToken = InputParser.getQueryParamOrThrowError(req, "paginationToken", true);
         Integer limit = InputParser.getIntQueryParamOrThrowError(req, "limit", true);
@@ -118,6 +124,11 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         // API is app specific
+
+        if (StorageLayer.isInMemDb(main)) {
+            throw new ServletException(new BadRequestException("This API is not supported in the in-memory database."));
+        }
+
         JsonObject input = InputParser.parseJsonObjectOrThrowError(req);
         JsonArray users = InputParser.parseArrayOrThrowError(input, "users", false);
 

diff --git a/src/main/java/io/supertokens/webserver/api/bulkimport/DeleteBulkImportUserAPI.java b/src/main/java/io/supertokens/webserver/api/bulkimport/DeleteBulkImportUserAPI.java
@@ -30,6 +30,7 @@
 import io.supertokens.pluginInterface.exceptions.StorageQueryException;
 import io.supertokens.pluginInterface.multitenancy.AppIdentifier;
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
+import io.supertokens.storageLayer.StorageLayer;
 import io.supertokens.webserver.InputParser;
 import io.supertokens.webserver.WebserverAPI;
 import jakarta.servlet.ServletException;
@@ -49,6 +50,11 @@ public String getPath() {
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         // API is app specific
+
+        if (StorageLayer.isInMemDb(main)) {
+            throw new ServletException(new BadRequestException("This API is not supported in the in-memory database."));
+        }
+
         JsonObject input = InputParser.parseJsonObjectOrThrowError(req);
         JsonArray arr = InputParser.parseArrayOrThrowError(input, "ids", false);
 

diff --git a/src/test/java/io/supertokens/test/bulkimport/BulkImportTest.java b/src/test/java/io/supertokens/test/bulkimport/BulkImportTest.java
@@ -29,6 +29,7 @@
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
+import io.supertokens.Main;
 import io.supertokens.ProcessState;
 import io.supertokens.bulkimport.BulkImport;
 import io.supertokens.bulkimport.BulkImportUserPaginationContainer;
@@ -66,8 +67,9 @@ public void shouldAddUsersInBulkImportUsersTable() throws Exception {
 
         TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
         assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));
+        Main main = process.getProcess();
 
-        if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
+        if (StorageLayer.getStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
             return;
         }
 
@@ -100,8 +102,9 @@ public void shouldCreatedNewIdsIfDuplicateIdIsFound() throws Exception {
 
         TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
         assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));
+        Main main = process.getProcess();
 
-        if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
+        if (StorageLayer.getStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
             return;
         }
 
@@ -140,8 +143,9 @@ public void testGetUsersStatusFilter() throws Exception {
 
         TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
         assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));
+        Main main = process.getProcess();
 
-        if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
+        if (StorageLayer.getStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
             return;
         }
 
@@ -209,8 +213,9 @@ public void randomPaginationTest() throws Exception {
         process.startProcess();
 
         assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));
+        Main main = process.getProcess();
 
-        if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
+        if (StorageLayer.getStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
             return;
         }
 

diff --git a/src/test/java/io/supertokens/test/bulkimport/ProcessBulkImportUsersCronJobTest.java b/src/test/java/io/supertokens/test/bulkimport/ProcessBulkImportUsersCronJobTest.java
@@ -94,6 +94,10 @@ public void shouldProcessBulkImportUsersInTheSameTenant() throws Exception {
         TestingProcess process = startCronProcess();
         Main main = process.getProcess();
 
+        if (StorageLayer.getBaseStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
+            return;
+        }
+
         // Create user roles before inserting bulk users
         {
             UserRoles.createNewRoleOrModifyItsPermissions(main, "role1", null);
@@ -137,6 +141,10 @@ public void shouldProcessBulkImportUsersInMultipleTenantsWithDifferentStorages()
         TestingProcess process = startCronProcess();
         Main main = process.getProcess();
 
+        if (StorageLayer.getBaseStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
+            return;
+        }
+
         // Create user roles before inserting bulk users
         {
             UserRoles.createNewRoleOrModifyItsPermissions(main, "role1", null);
@@ -197,6 +205,10 @@ public void shouldDeleteEverythingFromtheDBIfAnythingFails() throws Exception {
         TestingProcess process = startCronProcess();
         Main main = process.getProcess();
 
+        if (StorageLayer.getBaseStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
+            return;
+        }
+
         createTenants(main);
 
         BulkImportSQLStorage storage = (BulkImportSQLStorage) StorageLayer.getStorage(main);
@@ -225,6 +237,10 @@ public void shouldThrowTenantDoesNotExistError() throws Exception {
         TestingProcess process = startCronProcess();
         Main main = process.getProcess();
 
+        if (StorageLayer.getBaseStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
+            return;
+        }
+
         BulkImportSQLStorage storage = (BulkImportSQLStorage) StorageLayer.getStorage(main);
         AppIdentifier appIdentifier = new AppIdentifier(null, null);
 
@@ -254,6 +270,10 @@ public void shouldThrowTenantHaveDifferentStoragesError() throws Exception {
         TestingProcess process = startCronProcess();
         Main main = process.getProcess();
 
+        if (StorageLayer.getBaseStorage(main).getType() != STORAGE_TYPE.SQL || StorageLayer.isInMemDb(main)) {
+            return;
+        }
+
         BulkImportSQLStorage storage = (BulkImportSQLStorage) StorageLayer.getStorage(main);
         AppIdentifier appIdentifier = new AppIdentifier(null, null);