feat: returns only non expired session handles for user (#48)

Author: rishabhpoddar

CHANGELOG.md

@@ -7,7 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [1.17.0] - 2022-06-07
+
+- Compatibility with plugin interface 2.15 - returns only non expired session handles for a user
+
 ## [1.16.0] - 2022-05-05
+
 - Adds support for UserRoles recipe
 
 ## [1.15.0] - 2022-03-04

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-version = "1.16.0"
+version = "1.17.0"
 
 repositories {
     mavenCentral()

pluginInterfaceSupported.json

@@ -1,6 +1,6 @@
 {
   "_comment": "contains a list of plugin interfaces branch names that this core supports",
   "versions": [
-    "2.14"
+    "2.15"
   ]
 }

src/main/java/io/supertokens/storage/postgresql/Start.java

@@ -407,9 +407,9 @@ public int deleteSession(String[] sessionHandles) throws StorageQueryException {
     }
 
     @Override
-    public String[] getAllSessionHandlesForUser(String userId) throws StorageQueryException {
+    public String[] getAllNonExpiredSessionHandlesForUser(String userId) throws StorageQueryException {
         try {
-            return SessionQueries.getAllSessionHandlesForUser(this, userId);
+            return SessionQueries.getAllNonExpiredSessionHandlesForUser(this, userId);
         } catch (SQLException e) {
             throw new StorageQueryException(e);
         }

src/main/java/io/supertokens/storage/postgresql/queries/SessionQueries.java

@@ -48,12 +48,13 @@ public static String getQueryToCreateSessionInfoTable(Start start) {
         return "CREATE TABLE IF NOT EXISTS " + sessionInfoTable + " ("
                 + "session_handle VARCHAR(255) NOT NULL,"
                 + "user_id VARCHAR(128) NOT NULL,"
-                + "refresh_token_hash_2 VARCHAR(128) NOT NULL," 
-                + "session_data TEXT," 
+                + "refresh_token_hash_2 VARCHAR(128) NOT NULL,"
+                + "session_data TEXT,"
                 + "expires_at BIGINT NOT NULL,"
-                + "created_at_time BIGINT NOT NULL," 
-                + "jwt_user_payload TEXT," 
-                + "CONSTRAINT " + Utils.getConstraintName(schema, sessionInfoTable, null, "pkey") + " PRIMARY KEY(session_handle)" + " );";
+                + "created_at_time BIGINT NOT NULL,"
+                + "jwt_user_payload TEXT,"
+                + "CONSTRAINT " + Utils.getConstraintName(schema, sessionInfoTable, null, "pkey") +
+                " PRIMARY KEY(session_handle)" + " );";
         // @formatter:on
 
     }
@@ -63,9 +64,10 @@ static String getQueryToCreateAccessTokenSigningKeysTable(Start start) {
         String accessTokenSigningKeysTable = Config.getConfig(start).getAccessTokenSigningKeysTable();
         // @formatter:off
         return "CREATE TABLE IF NOT EXISTS " + accessTokenSigningKeysTable + " ("
-                + "created_at_time BIGINT NOT NULL," 
-                + "value TEXT," 
-                + "CONSTRAINT " + Utils.getConstraintName(schema, accessTokenSigningKeysTable, null, "pkey") + " PRIMARY KEY(created_at_time)" + " );";
+                + "created_at_time BIGINT NOT NULL,"
+                + "value TEXT,"
+                + "CONSTRAINT " + Utils.getConstraintName(schema, accessTokenSigningKeysTable, null, "pkey") +
+                " PRIMARY KEY(created_at_time)" + " );";
         // @formatter:on
     }
 
@@ -157,11 +159,15 @@ public static void deleteSessionsOfUser(Start start, String userId) throws SQLEx
         update(start, QUERY.toString(), pst -> pst.setString(1, userId));
     }
 
-    public static String[] getAllSessionHandlesForUser(Start start, String userId)
+    public static String[] getAllNonExpiredSessionHandlesForUser(Start start, String userId)
             throws SQLException, StorageQueryException {
-        String QUERY = "SELECT session_handle FROM " + getConfig(start).getSessionInfoTable() + " WHERE user_id = ?";
+        String QUERY = "SELECT session_handle FROM " + getConfig(start).getSessionInfoTable()
+                + " WHERE user_id = ? AND expires_at >= ?";
 
-        return execute(start, QUERY, pst -> pst.setString(1, userId), result -> {
+        return execute(start, QUERY, pst -> {
+            pst.setString(1, userId);
+            pst.setLong(2, currentTimeMillis());
+        }, result -> {
             List<String> temp = new ArrayList<>();
             while (result.next()) {
                 temp.add(result.getString("session_handle"));