fix: fixes storage handling for non-auth recipes

ee/src/main/java/io/supertokens/ee/EEFeatureFlag.java

@@ -271,7 +271,7 @@ private JsonObject getMultiTenancyStats()
         return stats;
     }
 
-    private JsonObject getAccountLinkingStats() throws StorageQueryException {
+    private JsonObject getAccountLinkingStats() throws StorageQueryException, TenantOrAppNotFoundException {
         JsonObject result = new JsonObject();
         Storage[] storages = StorageLayer.getStoragesForApp(main, this.appIdentifier);
         boolean usesAccountLinking = false;

src/main/java/io/supertokens/ActiveUsers.java

@@ -1,51 +1,54 @@
 package io.supertokens;
 
+import io.supertokens.pluginInterface.Storage;
+import io.supertokens.pluginInterface.StorageUtils;
 import io.supertokens.pluginInterface.authRecipe.sqlStorage.AuthRecipeSQLStorage;
 import io.supertokens.pluginInterface.exceptions.StorageQueryException;
 import io.supertokens.pluginInterface.exceptions.StorageTransactionLogicException;
-import io.supertokens.pluginInterface.multitenancy.AppIdentifierWithStorage;
+import io.supertokens.pluginInterface.multitenancy.AppIdentifier;
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
 import io.supertokens.storageLayer.StorageLayer;
 import org.jetbrains.annotations.TestOnly;
 
 public class ActiveUsers {
 
-    public static void updateLastActive(AppIdentifierWithStorage appIdentifierWithStorage, Main main, String userId)
+    public static void updateLastActive(AppIdentifier appIdentifier, Main main, String userId)
             throws TenantOrAppNotFoundException {
+        Storage storage = StorageLayer.getStorage(appIdentifier.getAsPublicTenantIdentifier(), main);
         try {
-            appIdentifierWithStorage.getActiveUsersStorage().updateLastActive(appIdentifierWithStorage, userId);
+            StorageUtils.getActiveUsersStorage(storage).updateLastActive(appIdentifier, userId);
         } catch (StorageQueryException ignored) {
         }
     }
 
     @TestOnly
     public static void updateLastActive(Main main, String userId) {
         try {
-            ActiveUsers.updateLastActive(new AppIdentifierWithStorage(null, null, StorageLayer.getStorage(main)), main,
-                    userId);
+            ActiveUsers.updateLastActive(new AppIdentifier(null, null),
+                    main, userId);
         } catch (TenantOrAppNotFoundException e) {
             throw new IllegalStateException(e);
         }
     }
 
-    public static int countUsersActiveSince(AppIdentifierWithStorage appIdentifierWithStorage, Main main, long time)
+    public static int countUsersActiveSince(AppIdentifier appIdentifier, Storage storage, long time)
             throws StorageQueryException, TenantOrAppNotFoundException {
-        return appIdentifierWithStorage.getActiveUsersStorage().countUsersActiveSince(appIdentifierWithStorage, time);
+        return StorageUtils.getActiveUsersStorage(storage).countUsersActiveSince(appIdentifier, time);
     }
 
     @TestOnly
     public static int countUsersActiveSince(Main main, long time)
             throws StorageQueryException, TenantOrAppNotFoundException {
-        return countUsersActiveSince(new AppIdentifierWithStorage(null, null, StorageLayer.getStorage(main)), main,
-                time);
+        return countUsersActiveSince(new AppIdentifier(null, null),
+                StorageLayer.getStorage(main), time);
     }
 
-    public static void removeActiveUser(AppIdentifierWithStorage appIdentifierWithStorage, String userId)
+    public static void removeActiveUser(AppIdentifier appIdentifier, Storage storage, String userId)
             throws StorageQueryException {
         try {
-            ((AuthRecipeSQLStorage) appIdentifierWithStorage.getActiveUsersStorage()).startTransaction(con -> {
-                appIdentifierWithStorage.getActiveUsersStorage().deleteUserActive_Transaction(con, appIdentifierWithStorage, userId);
-                ((AuthRecipeSQLStorage) appIdentifierWithStorage.getActiveUsersStorage()).commitTransaction(con);
+            ((AuthRecipeSQLStorage) StorageUtils.getActiveUsersStorage(storage)).startTransaction(con -> {
+                StorageUtils.getActiveUsersStorage(storage).deleteUserActive_Transaction(con, appIdentifier, userId);
+                ((AuthRecipeSQLStorage) StorageUtils.getActiveUsersStorage(storage)).commitTransaction(con);
                 return null;
             });
 

src/main/java/io/supertokens/AppIdentifierWithStorageAndUserIdMapping.java → src/main/java/io/supertokens/StorageAndUserIdMapping.java

@@ -16,23 +16,21 @@
 
 package io.supertokens;
 
-import io.supertokens.pluginInterface.multitenancy.AppIdentifierWithStorage;
+import io.supertokens.pluginInterface.Storage;
 import io.supertokens.pluginInterface.useridmapping.UserIdMapping;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class AppIdentifierWithStorageAndUserIdMapping {
+public class StorageAndUserIdMapping {
     @Nullable
     public final io.supertokens.pluginInterface.useridmapping.UserIdMapping userIdMapping;
 
     @Nonnull
-    public final AppIdentifierWithStorage appIdentifierWithStorage;
+    public final Storage storage;
 
-    public AppIdentifierWithStorageAndUserIdMapping(AppIdentifierWithStorage appIdentifierWithStorage, UserIdMapping userIdMapping) {
-        this.appIdentifierWithStorage = appIdentifierWithStorage;
+    public StorageAndUserIdMapping(Storage storage, UserIdMapping userIdMapping) {
+        this.storage = storage;
         this.userIdMapping = userIdMapping;
-
-        assert(this.appIdentifierWithStorage != null);
     }
 }