Updated SqlServerPersistedGrantStore.StoreAsync method so that we che…

…ck if the grant exists before adding it.
HealthCatalyst · Dec 12, 2017 · 42f3ed8 · 42f3ed8
1 parent 76d691b
commit 42f3ed8
Showing 1 changed file with 30 additions and 5 deletions.
diff --git a/Fabric.Identity.API/Persistence/SqlServer/Stores/SqlServerPersistedGrantStore.cs b/Fabric.Identity.API/Persistence/SqlServer/Stores/SqlServerPersistedGrantStore.cs
@@ -5,17 +5,20 @@
 using Microsoft.EntityFrameworkCore;
 using Fabric.Identity.API.Persistence.SqlServer.EntityModels;
 using Fabric.Identity.API.Persistence.SqlServer.Mappers;
+using Serilog;
 
 
 namespace Fabric.Identity.API.Persistence.SqlServer.Stores
 {
     public class SqlServerPersistedGrantStore : IPersistedGrantStore
     {
         private readonly IIdentityDbContext _identityDbContext;
+        private readonly ILogger _logger;
 
-        public SqlServerPersistedGrantStore(IIdentityDbContext identityDbContext)
+        public SqlServerPersistedGrantStore(IIdentityDbContext identityDbContext, ILogger logger)
         {
             _identityDbContext = identityDbContext;
+            _logger = logger;
         }
 
         public Task<IEnumerable<IdentityServer4.Models.PersistedGrant>> GetAllAsync(string subjectId)
@@ -64,14 +67,36 @@ public async Task RemoveAsync(string key)
         private async Task DeletePersistedGrantsAsync(IQueryable<PersistedGrant> persistedGrants)
         {
             await persistedGrants.ForEachAsync(pg => _identityDbContext.PersistedGrants.Remove(pg));
-            await _identityDbContext.SaveChangesAsync();
+            try
+            {
+                await _identityDbContext.SaveChangesAsync();
+            }
+            catch (DbUpdateConcurrencyException ex)
+            {
+                _logger.Warning("Exception removing persistedGrants from the database. Error: {message}", ex.Message);
+            }
         }
 
         public async Task StoreAsync(IdentityServer4.Models.PersistedGrant grant)
         {
-            var persistedGrantEntity = grant.ToEntity();
-            _identityDbContext.PersistedGrants.Add(persistedGrantEntity);
-            await _identityDbContext.SaveChangesAsync();
+            var existingGrant = _identityDbContext.PersistedGrants.SingleOrDefault(pg => pg.Key == grant.Key);
+            if (existingGrant == null)
+            {
+                var persistedGrantEntity = grant.ToEntity();
+                _identityDbContext.PersistedGrants.Add(persistedGrantEntity);
+            }
+            else
+            {
+                grant.ToEntity(existingGrant);
+            }
+            try
+            {
+                await _identityDbContext.SaveChangesAsync();
+            }
+            catch (DbUpdateConcurrencyException ex)
+            {
+                _logger.Warning("Exception updating {grantKey}. Error: {error}", grant.Key, ex.Message);
+            }
         }
     }
 }