From f4a093f16fb05539c64261f0e707854250e277bd Mon Sep 17 00:00:00 2001 From: "Khaled Y.M" Date: Sat, 9 Nov 2024 13:13:11 +0000 Subject: [PATCH 1/2] Prepare development version 0.23.0 --- dal/cockroachdb-dal/cockroachdb-cache/pom.xml | 2 +- dal/cockroachdb-dal/cockroachdb-persistence/pom.xml | 2 +- dal/cockroachdb-dal/pom.xml | 2 +- dal/hibernate-dal/hibernate-cache/pom.xml | 2 +- dal/hibernate-dal/hibernate-common/pom.xml | 2 +- dal/hibernate-dal/hibernate-persistence/pom.xml | 2 +- dal/hibernate-dal/pom.xml | 2 +- dal/memory-dal/pom.xml | 2 +- dal/mongo-dal/mongo-cache/pom.xml | 2 +- dal/mongo-dal/mongo-common/pom.xml | 2 +- dal/mongo-dal/mongo-persistence/pom.xml | 2 +- dal/mongo-dal/pom.xml | 2 +- dal/mysql-dal/mysql-cache/pom.xml | 2 +- dal/mysql-dal/mysql-persistence/pom.xml | 2 +- dal/mysql-dal/pom.xml | 2 +- dal/pom.xml | 2 +- dal/postgres-dal/pom.xml | 2 +- dal/postgres-dal/postgres-cache/pom.xml | 2 +- dal/postgres-dal/postgres-persistence/pom.xml | 2 +- dal/redis-cache/pom.xml | 2 +- email/javamail-provider/pom.xml | 2 +- email/log-email/pom.xml | 2 +- email/pom.xml | 2 +- email/sendgrid-provider/pom.xml | 2 +- emb/kafka-bridge/pom.xml | 2 +- emb/log-emb/pom.xml | 2 +- emb/pom.xml | 4 ++-- pom.xml | 4 ++-- sms/log-sms/pom.xml | 2 +- sms/pom.xml | 2 +- 30 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dal/cockroachdb-dal/cockroachdb-cache/pom.xml b/dal/cockroachdb-dal/cockroachdb-cache/pom.xml index 3d62e76..3fa2fe2 100644 --- a/dal/cockroachdb-dal/cockroachdb-cache/pom.xml +++ b/dal/cockroachdb-dal/cockroachdb-cache/pom.xml @@ -5,7 +5,7 @@ cockroachdb-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/cockroachdb-dal/cockroachdb-persistence/pom.xml b/dal/cockroachdb-dal/cockroachdb-persistence/pom.xml index 1042c6f..aef9005 100644 --- a/dal/cockroachdb-dal/cockroachdb-persistence/pom.xml +++ b/dal/cockroachdb-dal/cockroachdb-persistence/pom.xml @@ -5,7 +5,7 @@ cockroachdb-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/cockroachdb-dal/pom.xml b/dal/cockroachdb-dal/pom.xml index a911bdf..8871c1e 100644 --- a/dal/cockroachdb-dal/pom.xml +++ b/dal/cockroachdb-dal/pom.xml @@ -5,7 +5,7 @@ dal-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/hibernate-dal/hibernate-cache/pom.xml b/dal/hibernate-dal/hibernate-cache/pom.xml index 84f71a4..59d6b96 100644 --- a/dal/hibernate-dal/hibernate-cache/pom.xml +++ b/dal/hibernate-dal/hibernate-cache/pom.xml @@ -5,7 +5,7 @@ hibernate-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/hibernate-dal/hibernate-common/pom.xml b/dal/hibernate-dal/hibernate-common/pom.xml index 13cfbdc..d3114fb 100644 --- a/dal/hibernate-dal/hibernate-common/pom.xml +++ b/dal/hibernate-dal/hibernate-common/pom.xml @@ -5,7 +5,7 @@ hibernate-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml diff --git a/dal/hibernate-dal/hibernate-persistence/pom.xml b/dal/hibernate-dal/hibernate-persistence/pom.xml index 03552bb..d346fe6 100644 --- a/dal/hibernate-dal/hibernate-persistence/pom.xml +++ b/dal/hibernate-dal/hibernate-persistence/pom.xml @@ -5,7 +5,7 @@ hibernate-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/hibernate-dal/pom.xml b/dal/hibernate-dal/pom.xml index 4b27f50..402e636 100644 --- a/dal/hibernate-dal/pom.xml +++ b/dal/hibernate-dal/pom.xml @@ -5,7 +5,7 @@ dal-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/memory-dal/pom.xml b/dal/memory-dal/pom.xml index 93189e5..2a404b3 100644 --- a/dal/memory-dal/pom.xml +++ b/dal/memory-dal/pom.xml @@ -5,7 +5,7 @@ dal-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/mongo-dal/mongo-cache/pom.xml b/dal/mongo-dal/mongo-cache/pom.xml index 4ef7f81..8d6492d 100644 --- a/dal/mongo-dal/mongo-cache/pom.xml +++ b/dal/mongo-dal/mongo-cache/pom.xml @@ -5,7 +5,7 @@ mongo-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/mongo-dal/mongo-common/pom.xml b/dal/mongo-dal/mongo-common/pom.xml index b440c79..cd65c47 100644 --- a/dal/mongo-dal/mongo-common/pom.xml +++ b/dal/mongo-dal/mongo-common/pom.xml @@ -5,7 +5,7 @@ mongo-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/mongo-dal/mongo-persistence/pom.xml b/dal/mongo-dal/mongo-persistence/pom.xml index 27101a1..b2ea11e 100644 --- a/dal/mongo-dal/mongo-persistence/pom.xml +++ b/dal/mongo-dal/mongo-persistence/pom.xml @@ -5,7 +5,7 @@ mongo-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/mongo-dal/pom.xml b/dal/mongo-dal/pom.xml index 904c262..8421744 100644 --- a/dal/mongo-dal/pom.xml +++ b/dal/mongo-dal/pom.xml @@ -5,7 +5,7 @@ dal-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/mysql-dal/mysql-cache/pom.xml b/dal/mysql-dal/mysql-cache/pom.xml index 7ecad8c..51df1fd 100644 --- a/dal/mysql-dal/mysql-cache/pom.xml +++ b/dal/mysql-dal/mysql-cache/pom.xml @@ -5,7 +5,7 @@ mysql-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/mysql-dal/mysql-persistence/pom.xml b/dal/mysql-dal/mysql-persistence/pom.xml index 49f47c8..c1c519a 100644 --- a/dal/mysql-dal/mysql-persistence/pom.xml +++ b/dal/mysql-dal/mysql-persistence/pom.xml @@ -5,7 +5,7 @@ mysql-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/mysql-dal/pom.xml b/dal/mysql-dal/pom.xml index eebf630..e3516d5 100644 --- a/dal/mysql-dal/pom.xml +++ b/dal/mysql-dal/pom.xml @@ -5,7 +5,7 @@ dal-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/pom.xml b/dal/pom.xml index 6249d68..db4c7d9 100644 --- a/dal/pom.xml +++ b/dal/pom.xml @@ -5,7 +5,7 @@ extensions com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/postgres-dal/pom.xml b/dal/postgres-dal/pom.xml index 89b1cf2..d894347 100644 --- a/dal/postgres-dal/pom.xml +++ b/dal/postgres-dal/pom.xml @@ -5,7 +5,7 @@ dal-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/postgres-dal/postgres-cache/pom.xml b/dal/postgres-dal/postgres-cache/pom.xml index e70719f..2f3dc47 100644 --- a/dal/postgres-dal/postgres-cache/pom.xml +++ b/dal/postgres-dal/postgres-cache/pom.xml @@ -5,7 +5,7 @@ postgres-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/postgres-dal/postgres-persistence/pom.xml b/dal/postgres-dal/postgres-persistence/pom.xml index 2ef16b3..c08ee16 100644 --- a/dal/postgres-dal/postgres-persistence/pom.xml +++ b/dal/postgres-dal/postgres-persistence/pom.xml @@ -5,7 +5,7 @@ postgres-dal com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/dal/redis-cache/pom.xml b/dal/redis-cache/pom.xml index ad93fda..3d5ae37 100644 --- a/dal/redis-cache/pom.xml +++ b/dal/redis-cache/pom.xml @@ -5,7 +5,7 @@ dal-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/email/javamail-provider/pom.xml b/email/javamail-provider/pom.xml index 650b52d..c7ba884 100644 --- a/email/javamail-provider/pom.xml +++ b/email/javamail-provider/pom.xml @@ -5,7 +5,7 @@ email-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/email/log-email/pom.xml b/email/log-email/pom.xml index ed8aec3..94a9abd 100644 --- a/email/log-email/pom.xml +++ b/email/log-email/pom.xml @@ -5,7 +5,7 @@ email-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 4.0.0 diff --git a/email/pom.xml b/email/pom.xml index 17a695c..9546b24 100644 --- a/email/pom.xml +++ b/email/pom.xml @@ -5,7 +5,7 @@ extensions com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/email/sendgrid-provider/pom.xml b/email/sendgrid-provider/pom.xml index 65996e1..29777e5 100644 --- a/email/sendgrid-provider/pom.xml +++ b/email/sendgrid-provider/pom.xml @@ -5,7 +5,7 @@ email-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/emb/kafka-bridge/pom.xml b/emb/kafka-bridge/pom.xml index ef8c72a..c825f51 100644 --- a/emb/kafka-bridge/pom.xml +++ b/emb/kafka-bridge/pom.xml @@ -7,7 +7,7 @@ emb-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml diff --git a/emb/log-emb/pom.xml b/emb/log-emb/pom.xml index 4893d3d..0c85aba 100644 --- a/emb/log-emb/pom.xml +++ b/emb/log-emb/pom.xml @@ -5,7 +5,7 @@ emb-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/emb/pom.xml b/emb/pom.xml index 3a72991..9d5a462 100644 --- a/emb/pom.xml +++ b/emb/pom.xml @@ -7,14 +7,14 @@ extensions com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml Extensions :: EMB emb-parent - 0.22.0 + 0.23.0 pom diff --git a/pom.xml b/pom.xml index 3bfc44d..ef4afc6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.nexblocks.authguard extensions pom - 0.22.0 + 0.23.0 @@ -38,7 +38,7 @@ 3.8.0 - 0.22.0 + 0.23.0 4.2.2 2.12.6 2.9.0 diff --git a/sms/log-sms/pom.xml b/sms/log-sms/pom.xml index f7753a8..4b60bcb 100644 --- a/sms/log-sms/pom.xml +++ b/sms/log-sms/pom.xml @@ -5,7 +5,7 @@ sms-extensions-parent com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 diff --git a/sms/pom.xml b/sms/pom.xml index 9cbbe3b..c2bc680 100644 --- a/sms/pom.xml +++ b/sms/pom.xml @@ -5,7 +5,7 @@ extensions com.nexblocks.authguard - 0.22.0 + 0.23.0 ../pom.xml 4.0.0 From b96cd0f65d836c7ff33115b09124d57d4f1bd200 Mon Sep 17 00:00:00 2001 From: "Khaled Y.M" Date: Wed, 20 Nov 2024 21:39:55 +0000 Subject: [PATCH 2/2] Retrieve sessions by account ID --- .../hibernate/cache/HibernateSessionsRepository.java | 11 +++++++++++ .../dal/memory/dal/MockSessionsRepository.java | 12 ++++++++++++ .../dal/mongo/cache/MongoSessionsRepository.java | 7 +++++++ .../dal/cache/redis/RedisSessionsRepository.java | 7 +++++++ 4 files changed, 37 insertions(+) diff --git a/dal/hibernate-dal/hibernate-cache/src/main/java/com/nexblocks/authguard/dal/hibernate/cache/HibernateSessionsRepository.java b/dal/hibernate-dal/hibernate-cache/src/main/java/com/nexblocks/authguard/dal/hibernate/cache/HibernateSessionsRepository.java index 73987af..f8d2b18 100644 --- a/dal/hibernate-dal/hibernate-cache/src/main/java/com/nexblocks/authguard/dal/hibernate/cache/HibernateSessionsRepository.java +++ b/dal/hibernate-dal/hibernate-cache/src/main/java/com/nexblocks/authguard/dal/hibernate/cache/HibernateSessionsRepository.java @@ -3,15 +3,18 @@ import com.google.inject.Inject; import com.nexblocks.authguard.dal.cache.SessionsRepository; import com.nexblocks.authguard.dal.hibernate.common.AbstractHibernateRepository; +import com.nexblocks.authguard.dal.hibernate.common.CommonFields; import com.nexblocks.authguard.dal.hibernate.common.QueryExecutor; import com.nexblocks.authguard.dal.model.SessionDO; +import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; public class HibernateSessionsRepository extends AbstractHibernateRepository implements SessionsRepository { private static final String GET_BY_TOKEN = "sessions.getByToken"; + private static final String GET_BY_ACCOUNT_ID = "getByAccountId"; private static final String TOKEN_FIELD = "token"; @Inject @@ -36,4 +39,12 @@ public CompletableFuture> deleteByToken(final String session return CompletableFuture.completedFuture(Optional.empty()); }); } + + @Override + public CompletableFuture> findByAccountId(final long accountId, final String domain) { + return queryExecutor.getAList(session -> session.createNamedQuery(GET_BY_ACCOUNT_ID, SessionDO.class) + .setParameter(CommonFields.DOMAIN, domain) + .setParameter(CommonFields.ACCOUNT_ID, accountId)); + + } } diff --git a/dal/memory-dal/src/main/java/com/nexblocks/authguard/dal/memory/dal/MockSessionsRepository.java b/dal/memory-dal/src/main/java/com/nexblocks/authguard/dal/memory/dal/MockSessionsRepository.java index 0fd5cb0..d815f48 100644 --- a/dal/memory-dal/src/main/java/com/nexblocks/authguard/dal/memory/dal/MockSessionsRepository.java +++ b/dal/memory-dal/src/main/java/com/nexblocks/authguard/dal/memory/dal/MockSessionsRepository.java @@ -4,8 +4,11 @@ import com.nexblocks.authguard.dal.model.SessionDO; import javax.inject.Singleton; +import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; @Singleton public class MockSessionsRepository extends AbstractRepository @@ -26,4 +29,13 @@ public CompletableFuture> deleteByToken(final String session return opt; }); } + + @Override + public CompletableFuture> findByAccountId(final long accountId, final String domain) { + return CompletableFuture.supplyAsync(() -> getRepo().values() + .stream() + .filter(session -> Objects.equals(accountId, session.getAccountId()) + && Objects.equals(domain, session.getDomain())) + .collect(Collectors.toList())); + } } diff --git a/dal/mongo-dal/mongo-cache/src/main/java/com/nexblocks/authguard/dal/mongo/cache/MongoSessionsRepository.java b/dal/mongo-dal/mongo-cache/src/main/java/com/nexblocks/authguard/dal/mongo/cache/MongoSessionsRepository.java index 6c0ee48..0f96b80 100644 --- a/dal/mongo-dal/mongo-cache/src/main/java/com/nexblocks/authguard/dal/mongo/cache/MongoSessionsRepository.java +++ b/dal/mongo-dal/mongo-cache/src/main/java/com/nexblocks/authguard/dal/mongo/cache/MongoSessionsRepository.java @@ -8,6 +8,7 @@ import com.nexblocks.authguard.dal.mongo.common.setup.MongoClientWrapper; import com.nexblocks.authguard.dal.mongo.config.Defaults; +import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -28,4 +29,10 @@ public CompletableFuture> getByToken(final String token) { public CompletableFuture> deleteByToken(final String sessionToken) { return facade.deleteByFilter(Filters.eq("sessionToken", sessionToken)); } + + @Override + public CompletableFuture> findByAccountId(final long accountId, final String domain) { + return facade.find(Filters.and(Filters.eq("accountId", accountId), + Filters.eq("domain", domain))); + } } diff --git a/dal/redis-cache/src/main/java/com/nexblocks/authguard/dal/cache/redis/RedisSessionsRepository.java b/dal/redis-cache/src/main/java/com/nexblocks/authguard/dal/cache/redis/RedisSessionsRepository.java index c30a372..ae0fd9b 100644 --- a/dal/redis-cache/src/main/java/com/nexblocks/authguard/dal/cache/redis/RedisSessionsRepository.java +++ b/dal/redis-cache/src/main/java/com/nexblocks/authguard/dal/cache/redis/RedisSessionsRepository.java @@ -10,6 +10,7 @@ import java.time.Duration; import java.time.Instant; +import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -48,4 +49,10 @@ public CompletableFuture> getByToken(final String sessionTok public CompletableFuture> deleteByToken(final String sessionToken) { return redisRepository.delete(sessionToken); } + + @Override + public CompletableFuture> findByAccountId(final long accountId, final String domain) { + throw new UnsupportedOperationException("Retrieving sessions by account ID isn't " + + "currently supported by Redis cache implementation"); + } }