fix: derived properties not saved

BREAKING CHANGE: RavenDb ids

Author: github-actions

src/Aguacongas.AspNetCore.Authentication.RavenDb/DynamicProviderStore.cs

@@ -37,14 +37,15 @@ public class DynamicProviderStore<TSchemeDefinition> : IDynamicProviderStore<TSc
         private readonly IAsyncDocumentSession _session;
         private readonly IAuthenticationSchemeOptionsSerializer _authenticationSchemeOptionsSerializer;
         private readonly ILogger<DynamicProviderStore<TSchemeDefinition>> _logger;
+        private readonly string _entitybasePath;
 
         /// <summary>
         /// Gets the scheme definitions list.
         /// </summary>
         /// <value>
         /// The scheme definitions list.
         /// </value>
-        public virtual IQueryable<TSchemeDefinition> SchemeDefinitions => _session.Query<SerializedData>()
+        public virtual IQueryable<TSchemeDefinition> SchemeDefinitions => _session.Query<TSchemeDefinition>()
             .ToListAsync().ConfigureAwait(false).GetAwaiter().GetResult()
             .Select(Deserialize)
             .AsQueryable();
@@ -67,6 +68,7 @@ public DynamicProviderStore(IAsyncDocumentSession session, IAuthenticationScheme
             _session = session ?? throw new ArgumentNullException(nameof(session));
             _authenticationSchemeOptionsSerializer = authenticationSchemeOptionsSerializer ?? throw new ArgumentNullException(nameof(authenticationSchemeOptionsSerializer));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _entitybasePath = typeof(TSchemeDefinition).Name.ToLower() + "/";
         }
 
         /// <summary>
@@ -83,7 +85,7 @@ public virtual async Task AddAsync(TSchemeDefinition definition, CancellationTok
             cancellationToken.ThrowIfCancellationRequested();
 
             var data = Serialize(definition);
-            await _session.StoreAsync(data, cancellationToken).ConfigureAwait(false);
+            await _session.StoreAsync(data, $"{_entitybasePath}{definition.Scheme}", cancellationToken).ConfigureAwait(false);
             await _session.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
 
             _logger.LogInformation("Scheme {scheme} added for {handlerType} with options: {options}", definition.Scheme, definition.HandlerType, data.SerializedOptions);
@@ -102,7 +104,7 @@ public virtual async Task RemoveAsync(TSchemeDefinition definition, Cancellation
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            var data = await _session.LoadAsync<SerializedData>(definition.Scheme, cancellationToken).ConfigureAwait(false);
+            var data = await _session.LoadAsync<TSchemeDefinition>($"{_entitybasePath}{definition.Scheme}", cancellationToken).ConfigureAwait(false);
             _session.Delete(data);
             await _session.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
 
@@ -124,7 +126,7 @@ public virtual async Task UpdateAsync(TSchemeDefinition definition, Cancellation
 
             var serialized = Serialize(definition);
 
-            var data = await _session.LoadAsync<SerializedData>(definition.Scheme, cancellationToken).ConfigureAwait(false);
+            var data = await _session.LoadAsync<TSchemeDefinition>($"{_entitybasePath}{definition.Scheme}", cancellationToken).ConfigureAwait(false);
 
             data.SerializedOptions = serialized.SerializedOptions;
             data.SerializedHandlerType = serialized.SerializedHandlerType;
@@ -149,7 +151,7 @@ public virtual async Task<TSchemeDefinition> FindBySchemeAsync(string scheme, Ca
             CheckScheme(scheme);
 
             cancellationToken.ThrowIfCancellationRequested();
-            var data = await _session.LoadAsync<SerializedData>(scheme, cancellationToken).ConfigureAwait(false);
+            var data = await _session.LoadAsync<TSchemeDefinition>($"{_entitybasePath}{scheme}", cancellationToken).ConfigureAwait(false);
 
             if (data != null)
             {
@@ -167,35 +169,22 @@ private static void CheckScheme(string scheme)
             }
         }
 
-        private SerializedData Serialize(TSchemeDefinition definition)
+        private TSchemeDefinition Serialize(TSchemeDefinition definition)
         {
-            return new SerializedData
-            {
-                Id = definition.Scheme,
-                SerializedHandlerType = _authenticationSchemeOptionsSerializer.SerializeType(definition.HandlerType),
-                SerializedOptions = _authenticationSchemeOptionsSerializer.SerializeOptions(definition.Options, definition.HandlerType.GetAuthenticationSchemeOptionsType())
-            };
+            var data = (TSchemeDefinition)definition.Clone();
+            data.SerializedHandlerType = _authenticationSchemeOptionsSerializer.SerializeType(definition.HandlerType);
+            data.SerializedOptions = _authenticationSchemeOptionsSerializer.SerializeOptions(definition.Options, definition.HandlerType.GetAuthenticationSchemeOptionsType());
+            data.HandlerType = null;
+            data.Options = null;
+            return data;
         }
 
-        private TSchemeDefinition Deserialize(SerializedData data)
+        private TSchemeDefinition Deserialize(TSchemeDefinition data)
         {            
             var handlerType = _authenticationSchemeOptionsSerializer.DeserializeType(data.SerializedHandlerType);
-            return new TSchemeDefinition
-            {
-                Scheme = data.Id,
-                HandlerType = handlerType,
-                Options = _authenticationSchemeOptionsSerializer.DeserializeOptions(data.SerializedOptions, handlerType.GetAuthenticationSchemeOptionsType())
-            };
-        }
-
-        class SerializedData
-        {
-            public string Id { get; set; }
-
-            public string SerializedOptions { get; set; }
-
-            public string SerializedHandlerType { get; set; }
-            
-        }
+            data.HandlerType = handlerType;
+            data.Options = _authenticationSchemeOptionsSerializer.DeserializeOptions(data.SerializedOptions, handlerType.GetAuthenticationSchemeOptionsType());
+            return data;
+        }        
     }
 }

src/Aguacongas.AspNetCore.Authentication.RavenDb/SchemeDefinition.cs

@@ -1,12 +1,40 @@
 // Project: aguacongas/DymamicAuthProviders
 // Copyright (c) 2021 @Olivier Lefebvre
+using System;
+
 namespace Aguacongas.AspNetCore.Authentication.RavenDb
 {
     /// <summary>
     /// Scheme definition for entity framework store
     /// </summary>
     /// <seealso cref="SchemeDefinitionBase" />
-    public class SchemeDefinition: SchemeDefinitionBase
+    public class SchemeDefinition: SchemeDefinitionBase, ICloneable
     {
+        /// <summary>
+        /// Gets or sets the serialized handler type.
+        /// </summary>
+        /// <value>
+        /// The name of the serialized handler type.
+        /// </value>
+        public string SerializedHandlerType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the serialized options.
+        /// </summary>
+        /// <value>
+        /// The serialized options.
+        /// </value>
+        public string SerializedOptions { get; set; }
+
+        /// <summary>
+        /// Creates a new object that is a copy of the current instance.
+        /// </summary>
+        /// <returns>
+        /// A new object that is a copy of this instance.
+        /// </returns>
+        public object Clone()
+        {
+            return MemberwiseClone();
+        }
     }
 }