Feature/architecture (#2)

qdimka · web-flow · commit 090ffefc4d7e · 2020-03-19T22:03:37.000+03:00
* Split Core to packages

* Update README.md
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ This library is still under construction and needs to be peer reviewed as well a
 Add reference to EntityFramework.DataProtection.Core to your project.
 
 ```
-dotnet add package EF.DataProtection.Core
+dotnet add package EF.DataProtection.Extensions
 ```
 
 Include the following code to Startup.cs
diff --git a/src/EF.DataProtection.Abstractions/Abstractions/IDataEncryptor.cs b/src/EF.DataProtection.Abstractions/Abstractions/IDataEncryptor.cs
@@ -1,4 +1,4 @@
-namespace EF.DataProtection.Core.Abstractions
+namespace EF.DataProtection.Abstractions.Abstractions
 {
     public interface IDataEncryptor : IDataProtector
     {
diff --git a/src/EF.DataProtection.Abstractions/Abstractions/IDataHasher.cs b/src/EF.DataProtection.Abstractions/Abstractions/IDataHasher.cs
@@ -1,4 +1,4 @@
-namespace EF.DataProtection.Core.Abstractions
+namespace EF.DataProtection.Abstractions.Abstractions
 {
     public interface IDataHasher : IDataProtector
     {
diff --git a/src/EF.DataProtection.Abstractions/Abstractions/IDataProtector.cs b/src/EF.DataProtection.Abstractions/Abstractions/IDataProtector.cs
@@ -1,4 +1,4 @@
-﻿namespace EF.DataProtection.Core.Abstractions
+﻿namespace EF.DataProtection.Abstractions.Abstractions
 {
     public interface IDataProtector
     {
diff --git a/src/EF.DataProtection.Abstractions/Attributes/DataProtectionAttribute.cs b/src/EF.DataProtection.Abstractions/Attributes/DataProtectionAttribute.cs
@@ -1,13 +1,14 @@
 ﻿using System;
+using EF.DataProtection.Abstractions.Abstractions;
 
-namespace EF.DataProtection.Core.Abstractions
+namespace EF.DataProtection.Abstractions.Attributes
 {
     [AttributeUsage(AttributeTargets.Property)]
     public class DataProtectionAttribute: Attribute
     {
         public Type ProtectorType { get; }
 
-        public DataProtectionAttribute(Type protectorType)
+        protected DataProtectionAttribute(Type protectorType)
         {
             ProtectorType = typeof(IDataProtector)
                     .IsAssignableFrom(protectorType)
diff --git a/src/EF.DataProtection.Abstractions/EF.DataProtection.Abstractions.csproj b/src/EF.DataProtection.Abstractions/EF.DataProtection.Abstractions.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <AssemblyName>EF.DataProtection.Abstractions</AssemblyName>
+        <PackageId>EF.DataProtection.Abstractions</PackageId>
+        <Version>1.1.0</Version>
+        <PackageProjectUrl>https://github.com/qdimka/EntityFramework.DataProtection</PackageProjectUrl>
+        <IsTestProject>false</IsTestProject>
+    </PropertyGroup>
+
+</Project>
diff --git a/src/EF.DataProtection.Aes/Class1.cs b/src/EF.DataProtection.Aes/Class1.cs
@@ -0,0 +1,8 @@
+﻿using System;
+
+namespace EF.DataProtection.Aes
+{
+    public class Class1
+    {
+    }
+}
diff --git a/src/EF.DataProtection.Aes/EF.DataProtection.Aes.csproj b/src/EF.DataProtection.Aes/EF.DataProtection.Aes.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+    </PropertyGroup>
+
+</Project>
diff --git a/src/EF.DataProtection.Core.Tests/Services/Aes256DataEncryptorTests.cs b/src/EF.DataProtection.Core.Tests/Services/Aes256DataEncryptorTests.cs
@@ -1,5 +1,5 @@
-using EF.DataProtection.Core.Abstractions;
-using EF.DataProtection.Core.Services.Aes256;
+using EF.DataProtection.Abstractions.Abstractions;
+using EF.DataProtection.Services.Aes256;
 using Xunit;
 
 namespace EF.DataProtection.Core.Tests.Services
diff --git a/src/EF.DataProtection.Core/Customizers/EncryptedModelCustomizer.cs b/src/EF.DataProtection.Core/Customizers/EncryptedModelCustomizer.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Reflection;
-using EF.DataProtection.Core.Abstractions;
+using EF.DataProtection.Abstractions.Abstractions;
+using EF.DataProtection.Abstractions.Attributes;
 using EF.DataProtection.Core.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
diff --git a/src/EF.DataProtection.Core/EF.DataProtection.Core.csproj b/src/EF.DataProtection.Core/EF.DataProtection.Core.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <AssemblyName>EF.DataProtection.Core</AssemblyName>
         <PackageId>EF.DataProtection.Core</PackageId>
-        <Version>1.0.1</Version>
+        <Version>1.1.0</Version>
         <PackageProjectUrl>https://github.com/qdimka/EntityFramework.DataProtection</PackageProjectUrl>
         <IsTestProject>false</IsTestProject>
     </PropertyGroup>
@@ -14,4 +14,9 @@
       <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\EF.DataProtection.Abstractions\EF.DataProtection.Abstractions.csproj" />
+      <ProjectReference Include="..\EF.DataProtection.Services\EF.DataProtection.Services.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/EF.DataProtection.Core/Services/EncryptionServicesOptions.cs b/src/EF.DataProtection.Core/Services/EncryptionServicesOptions.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using EF.DataProtection.Abstractions.Abstractions;
+
+namespace EF.DataProtection.Core.Services
+{
+    public class EncryptionServicesOptions
+    {
+        public Dictionary<Type, IDataEncryptor> Encryptors { get; set; }
+        
+        public Dictionary<Type, IDataHasher> Hashers { get; set; }
+    }
+}
diff --git a/src/EF.DataProtection.Core/Services/ValueConverterResolver.cs b/src/EF.DataProtection.Core/Services/ValueConverterResolver.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EF.DataProtection.Core.Extensions;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.Extensions.Options;
 
diff --git a/src/EF.DataProtection.Encryptors/EF.DataProtection.Encryptors.csproj b/src/EF.DataProtection.Encryptors/EF.DataProtection.Encryptors.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\EF.DataProtection.Abstractions\EF.DataProtection.Abstractions.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/EF.DataProtection.Extensions/EF.DataProtection.Extensions.csproj b/src/EF.DataProtection.Extensions/EF.DataProtection.Extensions.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <AssemblyName>EF.DataProtection.Extensions</AssemblyName>
+        <PackageId>EF.DataProtection.Extensions</PackageId>
+        <Version>1.1.0</Version>
+        <PackageProjectUrl>https://github.com/qdimka/EntityFramework.DataProtection</PackageProjectUrl>
+        <IsTestProject>false</IsTestProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.1" />
+      <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\EF.DataProtection.Abstractions\EF.DataProtection.Abstractions.csproj" />
+      <ProjectReference Include="..\EF.DataProtection.Core\EF.DataProtection.Core.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/EF.DataProtection.Extensions/Extensions/EncryptionServicesBuilder.cs b/src/EF.DataProtection.Extensions/Extensions/EncryptionServicesBuilder.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EF.DataProtection.Core.Services
+namespace EF.DataProtection.Extensions.Extensions
 {
     public class EncryptionServicesBuilder
     {
diff --git a/src/EF.DataProtection.Extensions/Extensions/EncryptionsServicesOptionsPostConfigure.cs b/src/EF.DataProtection.Extensions/Extensions/EncryptionsServicesOptionsPostConfigure.cs
@@ -1,9 +1,10 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
-using EF.DataProtection.Core.Abstractions;
+using EF.DataProtection.Abstractions.Abstractions;
+using EF.DataProtection.Core.Services;
 using Microsoft.Extensions.Options;
 
-namespace EF.DataProtection.Core.Extensions
+namespace EF.DataProtection.Extensions.Extensions
 {
     public class EncryptionsServicesOptionsPostConfigure : IPostConfigureOptions<EncryptionServicesOptions>
     {
diff --git a/src/EF.DataProtection.Extensions/Extensions/ServiceCollectionExtensions.cs b/src/EF.DataProtection.Extensions/Extensions/ServiceCollectionExtensions.cs
@@ -1,14 +1,13 @@
 using System;
-using System.Collections.Generic;
-using EF.DataProtection.Core.Abstractions;
+using EF.DataProtection.Abstractions.Abstractions;
 using EF.DataProtection.Core.Customizers;
 using EF.DataProtection.Core.Services;
-using EF.DataProtection.Core.Services.Aes256;
-using EF.DataProtection.Core.Services.Sha512;
+using EF.DataProtection.Services.Aes256;
+using EF.DataProtection.Services.Sha512;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EF.DataProtection.Core.Extensions
+namespace EF.DataProtection.Extensions.Extensions
 {
     public static class ServiceCollectionExtensions
     {
@@ -53,11 +52,4 @@ public static EncryptionServicesBuilder UseSha512(this EncryptionServicesBuilder
             return builder;
         }
     }
-
-    public class EncryptionServicesOptions
-    {
-        public Dictionary<Type, IDataEncryptor> Encryptors { get; set; }
-        
-        public Dictionary<Type, IDataHasher> Hashers { get; set; }
-    }
 }
diff --git a/src/EF.DataProtection.Hashers/EF.DataProtection.Hashers.csproj b/src/EF.DataProtection.Hashers/EF.DataProtection.Hashers.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\EF.DataProtection.Abstractions\EF.DataProtection.Abstractions.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/EF.DataProtection.Sample/EF.DataProtection.Sample.csproj b/src/EF.DataProtection.Sample/EF.DataProtection.Sample.csproj
@@ -13,6 +13,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\EF.DataProtection.Core\EF.DataProtection.Core.csproj" />
+      <ProjectReference Include="..\EF.DataProtection.Extensions\EF.DataProtection.Extensions.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/EF.DataProtection.Sample/Entities/PersonalData.cs b/src/EF.DataProtection.Sample/Entities/PersonalData.cs
@@ -1,5 +1,5 @@
-﻿using EF.DataProtection.Core.Services.Aes256;
-using EF.DataProtection.Core.Services.Sha512;
+﻿using EF.DataProtection.Services.Aes256;
+using EF.DataProtection.Services.Sha512;
 
 namespace EF.DataProtection.Sample.Entities
 {
diff --git a/src/EF.DataProtection.Sample/Startup.cs b/src/EF.DataProtection.Sample/Startup.cs
@@ -1,4 +1,4 @@
-﻿using EF.DataProtection.Core.Extensions;
+﻿using EF.DataProtection.Extensions.Extensions;
 using EF.DataProtection.Sample.Dal;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
diff --git a/src/EF.DataProtection.Services/Aes256/Aes256Attribute.cs b/src/EF.DataProtection.Services/Aes256/Aes256Attribute.cs
@@ -1,6 +1,6 @@
-using EF.DataProtection.Core.Abstractions;
+using EF.DataProtection.Abstractions.Attributes;
 
-namespace EF.DataProtection.Core.Services.Aes256
+namespace EF.DataProtection.Services.Aes256
 {
     public class Aes256Attribute : DataProtectionAttribute
     {
diff --git a/src/EF.DataProtection.Services/Aes256/Aes256DataEncryptor.cs b/src/EF.DataProtection.Services/Aes256/Aes256DataEncryptor.cs
@@ -2,10 +2,10 @@
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
-using EF.DataProtection.Core.Abstractions;
+using EF.DataProtection.Abstractions.Abstractions;
 using Microsoft.Extensions.Options;
 
-namespace EF.DataProtection.Core.Services.Aes256
+namespace EF.DataProtection.Services.Aes256
 {
     public class Aes256DataEncryptor : IDataEncryptor
     {
diff --git a/src/EF.DataProtection.Services/Aes256/Aes256DataEncryptorOptions.cs b/src/EF.DataProtection.Services/Aes256/Aes256DataEncryptorOptions.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace EF.DataProtection.Core.Services.Aes256
+namespace EF.DataProtection.Services.Aes256
 {
     public class Aes256DataEncryptorOptions
     {
diff --git a/src/EF.DataProtection.Services/EF.DataProtection.Services.csproj b/src/EF.DataProtection.Services/EF.DataProtection.Services.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <AssemblyName>EF.DataProtection.Services</AssemblyName>
+        <PackageId>EF.DataProtection.Services</PackageId>
+        <Version>1.1.0</Version>
+        <PackageProjectUrl>https://github.com/qdimka/EntityFramework.DataProtection</PackageProjectUrl>
+        <IsTestProject>false</IsTestProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\EF.DataProtection.Abstractions\EF.DataProtection.Abstractions.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/EF.DataProtection.Services/Sha512/Sha512Attribute.cs b/src/EF.DataProtection.Services/Sha512/Sha512Attribute.cs
@@ -1,6 +1,6 @@
-using EF.DataProtection.Core.Abstractions;
+using EF.DataProtection.Abstractions.Attributes;
 
-namespace EF.DataProtection.Core.Services.Sha512
+namespace EF.DataProtection.Services.Sha512
 {
     public class Sha512Attribute : DataProtectionAttribute
     {
diff --git a/src/EF.DataProtection.Services/Sha512/Sha512DataHasher.cs b/src/EF.DataProtection.Services/Sha512/Sha512DataHasher.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Security.Cryptography;
 using System.Text;
-using EF.DataProtection.Core.Abstractions;
+using EF.DataProtection.Abstractions.Abstractions;
 using Microsoft.Extensions.Options;
 
-namespace EF.DataProtection.Core.Services.Sha512
+namespace EF.DataProtection.Services.Sha512
 {
     public class Sha512DataHasher : IDataHasher
     {
diff --git a/src/EF.DataProtection.Services/Sha512/Sha512DataHasherOptions.cs b/src/EF.DataProtection.Services/Sha512/Sha512DataHasherOptions.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace EF.DataProtection.Core.Services.Sha512
+namespace EF.DataProtection.Services.Sha512
 {
     public class Sha512DataHasherOptions
     {
diff --git a/src/EF.DataProtection.sln b/src/EF.DataProtection.sln
@@ -6,14 +6,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E213430D
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EF.DataProtection.Core.Tests", "EF.DataProtection.Core.Tests\EF.DataProtection.Core.Tests.csproj", "{5AFDCB29-7D49-4469-B15B-5777BC220F34}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmark", "Benchmark", "{2EDCC5FF-4F1C-44EE-896A-56C4D74BCB86}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{D3474F8F-AA94-4D17-BA9B-674C26183B50}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EF.DataProtection.Sample", "EF.DataProtection.Sample\EF.DataProtection.Sample.csproj", "{7669E472-8765-4237-96CF-04AD7AB069BF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EF.DataProtection.Sample.Tests", "EF.DataProtection.Sample.Tests\EF.DataProtection.Sample.Tests.csproj", "{04905EFA-7FB6-44FA-A55F-4F8E49DBFE97}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EF.DataProtection.Abstractions", "EF.DataProtection.Abstractions\EF.DataProtection.Abstractions.csproj", "{141AC098-FD9E-4EF0-8436-C97C73044C6D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EF.DataProtection.Services", "EF.DataProtection.Services\EF.DataProtection.Services.csproj", "{8BA100EF-8608-456E-9062-CFBE23786EAA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EF.DataProtection.Extensions", "EF.DataProtection.Extensions\EF.DataProtection.Extensions.csproj", "{E5F30E11-ADCD-4881-92E9-9E5E5714276E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,6 +40,18 @@ Global
 		{04905EFA-7FB6-44FA-A55F-4F8E49DBFE97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{04905EFA-7FB6-44FA-A55F-4F8E49DBFE97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04905EFA-7FB6-44FA-A55F-4F8E49DBFE97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{141AC098-FD9E-4EF0-8436-C97C73044C6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{141AC098-FD9E-4EF0-8436-C97C73044C6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{141AC098-FD9E-4EF0-8436-C97C73044C6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{141AC098-FD9E-4EF0-8436-C97C73044C6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8BA100EF-8608-456E-9062-CFBE23786EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BA100EF-8608-456E-9062-CFBE23786EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BA100EF-8608-456E-9062-CFBE23786EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8BA100EF-8608-456E-9062-CFBE23786EAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5F30E11-ADCD-4881-92E9-9E5E5714276E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F30E11-ADCD-4881-92E9-9E5E5714276E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5F30E11-ADCD-4881-92E9-9E5E5714276E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5F30E11-ADCD-4881-92E9-9E5E5714276E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{5AFDCB29-7D49-4469-B15B-5777BC220F34} = {E213430D-E118-400D-8EC3-670C221CFFF1}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace EF.DataProtection.Core.Abstractions`
	`1`	`+namespace EF.DataProtection.Abstractions.Abstractions`
`2`	`2`	`{`
`3`	`3`	`public interface IDataEncryptor : IDataProtector`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`using System;`
	`2`	`+using EF.DataProtection.Abstractions.Abstractions;`
`2`	`3`
`3`		`-namespace EF.DataProtection.Core.Abstractions`
	`4`	`+namespace EF.DataProtection.Abstractions.Attributes`
`4`	`5`	`{`
`5`	`6`	`[AttributeUsage(AttributeTargets.Property)]`
`6`	`7`	`public class DataProtectionAttribute: Attribute`
`7`	`8`	`{`
`8`	`9`	`public Type ProtectorType { get; }`
`9`	`10`
`10`		`- public DataProtectionAttribute(Type protectorType)`
	`11`	`+ protected DataProtectionAttribute(Type protectorType)`
`11`	`12`	`{`
`12`	`13`	`ProtectorType = typeof(IDataProtector)`
`13`	`14`	`.IsAssignableFrom(protectorType)`