From 1af300ba18929fa76d5a49edb565d12548ea4127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Mon, 23 Dec 2019 08:55:50 +0300
Subject: [PATCH] Add cancellationToken to IPermissionGrantRepository

---
 .../IPermissionGrantRepository.cs             | 14 +++++++++++--
 .../EfCorePermissionGrantRepository.cs        | 20 ++++++++++++++-----
 .../MongoDb/MongoPermissionGrantRepository.cs | 17 ++++++++++++----
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionGrantRepository.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionGrantRepository.cs
index 886d546073..8c0beffd1a 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionGrantRepository.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionGrantRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories;
 
@@ -7,8 +8,17 @@ namespace Volo.Abp.PermissionManagement
 {
     public interface IPermissionGrantRepository : IBasicRepository<PermissionGrant, Guid>
     {
-        Task<PermissionGrant> FindAsync(string name, string providerName, string providerKey);
+        Task<PermissionGrant> FindAsync(
+            string name,
+            string providerName,
+            string providerKey,
+            CancellationToken cancellationToken = default
+        );
 
-        Task<List<PermissionGrant>> GetListAsync(string providerName, string providerKey);
+        Task<List<PermissionGrant>> GetListAsync(
+            string providerName,
+            string providerKey,
+            CancellationToken cancellationToken = default
+        );
     }
 }
\ No newline at end of file
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs
index 413a960c7c..d8241d6f8f 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
@@ -8,7 +9,8 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
 {
-    public class EfCorePermissionGrantRepository : EfCoreRepository<IPermissionManagementDbContext, PermissionGrant, Guid>, IPermissionGrantRepository
+    public class EfCorePermissionGrantRepository : EfCoreRepository<IPermissionManagementDbContext, PermissionGrant, Guid>, 
+        IPermissionGrantRepository
     {
         public EfCorePermissionGrantRepository(IDbContextProvider<IPermissionManagementDbContext> dbContextProvider)
             : base(dbContextProvider)
@@ -16,23 +18,31 @@ namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
 
         }
 
-        public async Task<PermissionGrant> FindAsync(string name, string providerName, string providerKey)
+        public async Task<PermissionGrant> FindAsync(
+            string name, 
+            string providerName, 
+            string providerKey,
+            CancellationToken cancellationToken = default)
         {
             return await DbSet
                 .FirstOrDefaultAsync(s =>
                     s.Name == name &&
                     s.ProviderName == providerName &&
-                    s.ProviderKey == providerKey
+                    s.ProviderKey == providerKey,
+                    GetCancellationToken(cancellationToken)
                 );
         }
 
-        public async Task<List<PermissionGrant>> GetListAsync(string providerName, string providerKey)
+        public async Task<List<PermissionGrant>> GetListAsync(
+            string providerName,
+            string providerKey,
+            CancellationToken cancellationToken = default)
         {
             return await DbSet
                 .Where(s =>
                     s.ProviderName == providerName &&
                     s.ProviderKey == providerKey
-                ).ToListAsync();
+                ).ToListAsync(GetCancellationToken(cancellationToken));
         }
     }
 }
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/MongoPermissionGrantRepository.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/MongoPermissionGrantRepository.cs
index 70614c890d..67befaa717 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/MongoPermissionGrantRepository.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/MongoPermissionGrantRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
@@ -16,23 +17,31 @@ namespace Volo.Abp.PermissionManagement.MongoDB
 
         }
 
-        public async Task<PermissionGrant> FindAsync(string name, string providerName, string providerKey)
+        public async Task<PermissionGrant> FindAsync(
+            string name, 
+            string providerName, 
+            string providerKey,
+            CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
                 .FirstOrDefaultAsync(s =>
                     s.Name == name &&
                     s.ProviderName == providerName &&
-                    s.ProviderKey == providerKey
+                    s.ProviderKey == providerKey,
+                    GetCancellationToken(cancellationToken)
                 );
         }
 
-        public async Task<List<PermissionGrant>> GetListAsync(string providerName, string providerKey)
+        public async Task<List<PermissionGrant>> GetListAsync(
+            string providerName, 
+            string providerKey,
+            CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
                 .Where(s =>
                     s.ProviderName == providerName &&
                     s.ProviderKey == providerKey
-                ).ToListAsync();
+                ).ToListAsync(GetCancellationToken(cancellationToken));
         }
     }
 }
\ No newline at end of file