Update DB

LucHeart · LucHeart · commit e819edb9d2ea · 2024-03-07T03:59:34.000+01:00
diff --git a/API/API.csproj b/API/API.csproj
@@ -23,6 +23,7 @@
 
     <ItemGroup>
         <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.0.0" />
+        <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
         <PackageReference Include="Fluid.Core" Version="2.5.0" />
         <PackageReference Include="MailKit" Version="4.3.0" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.1" />
diff --git a/Common/Models/PasswordEncryptionType.cs b/Common/Models/PasswordEncryptionType.cs
@@ -0,0 +1,9 @@
+&#65279;using NpgsqlTypes;
+
+namespace OpenShock.Common.Models;
+
+public enum PasswordEncryptionType
+{
+    [PgName("pbkdf2")] Pbkdf2,
+    [PgName("bcrypt_enhanced")] BcryptEnhanced
+}
diff --git a/Common/OpenShockDb/OpenShockContext.cs b/Common/OpenShockDb/OpenShockContext.cs
@@ -37,11 +37,14 @@ public OpenShockContext(DbContextOptions<OpenShockContext> options)
 
     public virtual DbSet<User> Users { get; set; }
 
+    public virtual DbSet<UsersActivation> UsersActivations { get; set; }
+    
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder
             .HasPostgresEnum("control_type", new[] { "sound", "vibrate", "shock", "stop" })
             .HasPostgresEnum("ota_update_status", new[] { "started", "running", "finished", "error", "timeout" })
+            .HasPostgresEnum("password_encryption_type", new[] { "pbkdf2", "bcrypt_enhanced" })
             .HasPostgresEnum("permission_type", new[] { "shockers.use" })
             .HasPostgresEnum("rank_type", new[] { "user", "support", "staff", "admin", "system" })
             .HasPostgresEnum("shocker_model_type", new[] { "caiXianlin", "petTrainer" });
@@ -372,6 +375,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.Rank)
                 .HasColumnType("rank_type")
                 .HasColumnName("rank");
+            entity.Property(e => e.PasswordEncryption)
+                .HasColumnType("password_encryption_type")
+                .HasColumnName("password_encryption");
         });
 
         modelBuilder.Entity<UsersActivation>(entity =>
diff --git a/Common/OpenShockDb/User.cs b/Common/OpenShockDb/User.cs
@@ -18,6 +18,7 @@ public partial class User
 
     public bool EmailActived { get; set; }
     public RankType Rank { get; set; }
+    public PasswordEncryptionType PasswordEncryption { get; set; }
 
     public virtual ICollection<ApiToken> ApiTokens { get; set; } = new List<ApiToken>();
 
diff --git a/ServicesCommon/Utils/SecurePasswordHasher.cs b/ServicesCommon/Utils/SecurePasswordHasher.cs
