Added clientIpAddress parameter to query the security logs.

abpframework · Dec 26, 2024 · 3203430 · 3203430
1 parent e03ed0f
commit 3203430
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/...identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentitySecurityLogRepository.cs b/...identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentitySecurityLogRepository.cs
@@ -21,6 +21,7 @@ Task<List<IdentitySecurityLog>> GetListAsync(
         string userName = null,
         string clientId = null,
         string correlationId = null,
+        string clientIpAddress = null,
         bool includeDetails = false,
         CancellationToken cancellationToken = default);
 
@@ -34,6 +35,7 @@ Task<long> GetCountAsync(
         string userName = null,
         string clientId = null,
         string correlationId = null,
+        string clientIpAddress = null,
         CancellationToken cancellationToken = default);
 
     Task<IdentitySecurityLog> GetByUserIdAsync(

diff --git a/...rameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentitySecurityLogRepository.cs b/...rameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentitySecurityLogRepository.cs
@@ -31,6 +31,7 @@ public virtual async Task<List<IdentitySecurityLog>> GetListAsync(
         string userName = null,
         string clientId = null,
         string correlationId = null,
+        string clientIpAddress = null,
         bool includeDetails = false,
         CancellationToken cancellationToken = default)
     {
@@ -46,6 +47,7 @@ public virtual async Task<List<IdentitySecurityLog>> GetListAsync(
             userName,
             clientId,
             correlationId,
+            clientIpAddress,
             cancellationToken
         );
 
@@ -64,6 +66,7 @@ public virtual async Task<long> GetCountAsync(
         string userName = null,
         string clientId = null,
         string correlationId = null,
+        string clientIpAddress = null,
         CancellationToken cancellationToken = default)
     {
         cancellationToken = GetCancellationToken(cancellationToken);
@@ -78,6 +81,7 @@ public virtual async Task<long> GetCountAsync(
             userName,
             clientId,
             correlationId,
+            clientIpAddress,
             cancellationToken
         );
 
@@ -101,6 +105,7 @@ protected virtual async Task<IQueryable<IdentitySecurityLog>> GetListQueryAsync(
           string userName = null,
           string clientId = null,
           string correlationId = null,
+          string clientIpAddress = null,
           CancellationToken cancellationToken = default)
     {
         return (await GetDbSetAsync()).AsNoTracking()
@@ -112,6 +117,7 @@ protected virtual async Task<IQueryable<IdentitySecurityLog>> GetListQueryAsync(
             .WhereIf(userId.HasValue, securityLog => securityLog.UserId == userId)
             .WhereIf(!userName.IsNullOrWhiteSpace(), securityLog => securityLog.UserName == userName)
             .WhereIf(!clientId.IsNullOrWhiteSpace(), securityLog => securityLog.ClientId == clientId)
-            .WhereIf(!correlationId.IsNullOrWhiteSpace(), securityLog => securityLog.CorrelationId == correlationId);
+            .WhereIf(!correlationId.IsNullOrWhiteSpace(), securityLog => securityLog.CorrelationId == correlationId)
+            .WhereIf(!clientIpAddress.IsNullOrWhiteSpace(), securityLog => securityLog.ClientIpAddress == clientIpAddress);
     }
 }
diff --git a/...Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs b/...Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentitySecurityLogRepository.cs
@@ -32,6 +32,7 @@ public virtual async Task<List<IdentitySecurityLog>> GetListAsync(
         string userName = null,
         string clientId = null,
         string correlationId = null,
+        string clientIpAddress = null,
         bool includeDetails = false,
         CancellationToken cancellationToken = default)
     {
@@ -45,6 +46,7 @@ public virtual async Task<List<IdentitySecurityLog>> GetListAsync(
             userName,
             clientId,
             correlationId,
+            clientIpAddress,
             cancellationToken
         );
 
@@ -64,6 +66,7 @@ public virtual async Task<long> GetCountAsync(
         string userName = null,
         string clientId = null,
         string correlationId = null,
+        string clientIpAddress = null,
         CancellationToken cancellationToken = default)
     {
         var query = await GetListQueryAsync(
@@ -76,6 +79,7 @@ public virtual async Task<long> GetCountAsync(
             userName,
             clientId,
             correlationId,
+            clientIpAddress,
             cancellationToken
         );
 
@@ -101,19 +105,19 @@ protected virtual async Task<IQueryable<IdentitySecurityLog>> GetListQueryAsync(
         string userName = null,
         string clientId = null,
         string correlationId = null,
+        string clientIpAddress = null,
         CancellationToken cancellationToken = default)
     {
         return (await GetMongoQueryableAsync(cancellationToken))
             .WhereIf(startTime.HasValue, securityLog => securityLog.CreationTime >= startTime.Value)
             .WhereIf(endTime.HasValue, securityLog => securityLog.CreationTime < endTime.Value.AddDays(1).Date)
-            .WhereIf(!applicationName.IsNullOrWhiteSpace(),
-                securityLog => securityLog.ApplicationName == applicationName)
+            .WhereIf(!applicationName.IsNullOrWhiteSpace(), securityLog => securityLog.ApplicationName == applicationName)
             .WhereIf(!identity.IsNullOrWhiteSpace(), securityLog => securityLog.Identity == identity)
             .WhereIf(!action.IsNullOrWhiteSpace(), securityLog => securityLog.Action == action)
             .WhereIf(userId.HasValue, securityLog => securityLog.UserId == userId)
             .WhereIf(!userName.IsNullOrWhiteSpace(), securityLog => securityLog.UserName == userName)
             .WhereIf(!clientId.IsNullOrWhiteSpace(), securityLog => securityLog.ClientId == clientId)
-            .WhereIf(!correlationId.IsNullOrWhiteSpace(),
-                securityLog => securityLog.CorrelationId == correlationId);
+            .WhereIf(!correlationId.IsNullOrWhiteSpace(), securityLog => securityLog.CorrelationId == correlationId)
+            .WhereIf(!clientIpAddress.IsNullOrWhiteSpace(), securityLog => securityLog.ClientIpAddress == clientIpAddress);
     }
 }