Update samples

Author: Eastrall

samples/AesSample.Fluent/DatabaseContext.cs

@@ -26,10 +26,14 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         userEntityBuilder.Property(x => x.FirstName).IsRequired();
         userEntityBuilder.Property(x => x.LastName).IsRequired();
         userEntityBuilder.Property(x => x.Email).IsRequired().IsEncrypted();
+        userEntityBuilder.Property(x => x.Notes).IsRequired().HasColumnType("BLOB").IsEncrypted(StorageFormat.Binary);
         userEntityBuilder.Property(x => x.EncryptedData).IsRequired().IsEncrypted();
         userEntityBuilder.Property(x => x.EncryptedDataAsString).IsRequired().HasColumnType("TEXT").IsEncrypted(StorageFormat.Base64);
 
-        modelBuilder.UseEncryption(_encryptionProvider);
+        if (_encryptionProvider is not null)
+        {
+            modelBuilder.UseEncryption(_encryptionProvider);
+        }
 
         base.OnModelCreating(modelBuilder);
     }

samples/AesSample.Fluent/EncryptedDatabaseContext.cs

@@ -0,0 +1,11 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace AesSample.Fluent;
+
+public class EncryptedDatabaseContext : DatabaseContext
+{
+    public EncryptedDatabaseContext(DbContextOptions<DatabaseContext> options)
+        : base(options, null)
+    {
+    }
+}

samples/AesSample.Fluent/Program.cs

@@ -23,25 +23,38 @@ static void Main(string[] args)
         byte[] encryptionIV = keyInfo.IV;
         var encryptionProvider = new AesProvider(encryptionKey, encryptionIV);
 
-        using var context = new DatabaseContext(options, encryptionProvider);
-        context.Database.EnsureCreated();
-
-        var user = new UserEntity
+        using (var context = new DatabaseContext(options, encryptionProvider))
         {
-            FirstName = "John",
-            LastName = "Doe",
-            Email = "john@doe.com",
-            EncryptedData = new byte[2] { 1, 2 },
-            EncryptedDataAsString = new byte[2] { 3, 4 }
-        };
+            context.Database.EnsureCreated();
+
+            var user = new UserEntity
+            {
+                FirstName = "John",
+                LastName = "Doe",
+                Email = "john@doe.com",
+                Notes = "Hello world!",
+                EncryptedData = new byte[2] { 1, 2 },
+                EncryptedDataAsString = new byte[2] { 3, 4 }
+            };
+
+            context.Users.Add(user);
+            context.SaveChanges();
 
-        context.Users.Add(user);
-        context.SaveChanges();
+            Console.WriteLine($"Users count: {context.Users.Count()}");
+        }
 
-        Console.WriteLine($"Users count: {context.Users.Count()}");
+        using (var context = new EncryptedDatabaseContext(options))
+        {
+            UserEntity user = context.Users.First();
+
+            Console.WriteLine($"Encrypted User: {user.FirstName} {user.LastName} - {user.Email} (Notes: {user.Notes})");
+        }
 
-        user = context.Users.First();
+        using (var context = new DatabaseContext(options, encryptionProvider))
+        {
+            UserEntity user = context.Users.First();
 
-        Console.WriteLine($"User: {user.FirstName} {user.LastName} - {user.Email}");
+            Console.WriteLine($"User: {user.FirstName} {user.LastName} - {user.Email} (Notes: {user.Notes})");
+        }
     }
 }

samples/AesSample.Fluent/UserEntity.cs

@@ -12,6 +12,8 @@ public class UserEntity
 
     public string Email { get; set; }
 
+    public string Notes { get; set; }
+
     public byte[] EncryptedData { get; set; }
 
     public byte[] EncryptedDataAsString { get; set; }

samples/AesSample/Program.cs

@@ -23,25 +23,31 @@ static void Main()
         byte[] encryptionIV = keyInfo.IV;
         var encryptionProvider = new AesProvider(encryptionKey, encryptionIV);
 
-        using var context = new DatabaseContext(options, encryptionProvider);
-        context.Database.EnsureCreated();
-
-        var user = new UserEntity
+        using (var context = new DatabaseContext(options, encryptionProvider))
         {
-            FirstName = "John",
-            LastName = "Doe",
-            Email = "john@doe.com",
-            EncryptedData = new byte[2] { 1, 2 },
-            EncryptedDataAsString = new byte[2] { 3, 4 }
-        };
+            context.Database.EnsureCreated();
+
+            var user = new UserEntity
+            {
+                FirstName = "John",
+                LastName = "Doe",
+                Email = "john@doe.com",
+                Notes = "Hello world!",
+                EncryptedData = new byte[2] { 1, 2 },
+                EncryptedDataAsString = new byte[2] { 3, 4 }
+            };
 
-        context.Users.Add(user);
-        context.SaveChanges();
+            context.Users.Add(user);
+            context.SaveChanges();
 
-        Console.WriteLine($"Users count: {context.Users.Count()}");
+            Console.WriteLine($"Users count: {context.Users.Count()}");
+        }
 
-        user = context.Users.First();
+        using (var context = new DatabaseContext(options, encryptionProvider))
+        {
+            UserEntity user = context.Users.First();
 
-        Console.WriteLine($"User: {user.FirstName} {user.LastName} - {user.Email}");
+            Console.WriteLine($"User: {user.FirstName} {user.LastName} - {user.Email} (Notes: {user.Notes})");
+        }
     }
 }

samples/AesSample/UserEntity.cs

@@ -20,6 +20,10 @@ public class UserEntity
     [Encrypted]
     public string Email { get; set; }
 
+    [Required]
+    [Encrypted(StorageFormat.Binary)]
+    public string Notes { get; set; }
+
     [Required]
     [Encrypted]
     public byte[] EncryptedData { get; set; }