merge hotfix

Etherna · Feb 23, 2023 · 9daedc2 · 9daedc2
2 parents bff2374 + b921fd9
commit 9daedc2
Show file tree

Hide file tree

Showing 82 changed files with 1,263 additions and 9,474 deletions.
diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml
@@ -11,13 +11,13 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Docker meta
       id: meta
-      uses: docker/metadata-action@v3
+      uses: docker/metadata-action@v4
       with:
         images: etherna/etherna-sso
         tags: |
@@ -26,16 +26,16 @@ jobs:
           type=semver,pattern=v{{version}}
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
 
     - name: Login to DockerHub
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Build and push
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
         push: true

diff --git a/.github/workflows/unstable-release.yml b/.github/workflows/unstable-release.yml
@@ -11,29 +11,29 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Docker meta
       id: meta
-      uses: docker/metadata-action@v3
+      uses: docker/metadata-action@v4
       with:
         images: etherna/etherna-sso
         tags: |
           type=ref,event=branch
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
 
     - name: Login to DockerHub
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Build and push
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
         push: true

diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
 RUN apt-get install -y nodejs
 WORKDIR /src

diff --git a/src/EthernaSSO.Domain/EthernaSSO.Domain.csproj b/src/EthernaSSO.Domain/EthernaSSO.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Etherna.SSOServer.Domain</RootNamespace>
 
     <Authors>Etherna Sagl</Authors>
@@ -14,10 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Etherna.DomainEvents" Version="1.4.0" />
-    <PackageReference Include="EthernaACR" Version="0.3.5" />
+    <PackageReference Include="EthernaACR" Version="0.3.8" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Etherna" Version="0.3.0-alpha.7" />
-    <PackageReference Include="MongODM.Core" Version="0.23.1" />
-    <PackageReference Include="Nethereum.Accounts" Version="4.8.0" />
+    <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.80" />
+    <PackageReference Include="Nethereum.Accounts" Version="4.13.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/EthernaSSO.Domain/Helpers/UsernameHelper.cs b/src/EthernaSSO.Domain/Helpers/UsernameHelper.cs
@@ -18,7 +18,7 @@
 
 namespace Etherna.SSOServer.Domain.Helpers
 {
-    public static class UsernameHelper
+    public static partial class UsernameHelper
     {
         // Consts.
         public const string AllowedUsernameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._";
@@ -27,7 +27,7 @@ public static class UsernameHelper
 
         // Methods.
         public static bool IsValidUsername(string username) =>
-            Regex.IsMatch(username, UsernameRegex);
+            UsernameRegexHelper().IsMatch(username);
 
         public static string NormalizeUsername(string username)
         {
@@ -38,5 +38,9 @@ public static string NormalizeUsername(string username)
 
             return username;
         }
+
+        // Helpers.
+        [GeneratedRegex(UsernameRegex)]
+        private static partial Regex UsernameRegexHelper();
     }
 }
diff --git a/src/EthernaSSO.Domain/ISharedDbContext.cs b/src/EthernaSSO.Domain/ISharedDbContext.cs
@@ -20,6 +20,6 @@ namespace Etherna.SSOServer.Domain
 {
     public interface ISharedDbContext : IDbContext
     {
-        ICollectionRepository<UserSharedInfo, string> UsersInfo { get; }
+        IRepository<UserSharedInfo, string> UsersInfo { get; }
     }
 }
diff --git a/src/EthernaSSO.Domain/ISsoDbContext.cs b/src/EthernaSSO.Domain/ISsoDbContext.cs
@@ -20,11 +20,11 @@ namespace Etherna.SSOServer.Domain
 {
     public interface ISsoDbContext : IDbContext
     {
-        ICollectionRepository<AlphaPassRequest, string> AlphaPassRequests { get; }
-        ICollectionRepository<DailyStats, string> DailyStats { get; }
-        ICollectionRepository<Invitation, string> Invitations { get; }
-        ICollectionRepository<Role, string> Roles { get; }
-        ICollectionRepository<UserBase, string> Users { get; }
-        ICollectionRepository<Web3LoginToken, string> Web3LoginTokens { get; }
+        IRepository<AlphaPassRequest, string> AlphaPassRequests { get; }
+        IRepository<DailyStats, string> DailyStats { get; }
+        IRepository<Invitation, string> Invitations { get; }
+        IRepository<Role, string> Roles { get; }
+        IRepository<UserBase, string> Users { get; }
+        IRepository<Web3LoginToken, string> Web3LoginTokens { get; }
     }
 }
diff --git a/src/EthernaSSO.Domain/Models/UserAgg/UserLoginInfo.cs b/src/EthernaSSO.Domain/Models/UserAgg/UserLoginInfo.cs
@@ -20,7 +20,7 @@ public class UserLoginInfo : ModelBase
         public UserLoginInfo(
             string loginProvider,
             string providerKey,
-            string providerDisplayName)
+            string? providerDisplayName)
         {
             LoginProvider = loginProvider;
             ProviderKey = providerKey;
@@ -30,7 +30,7 @@ protected UserLoginInfo() { }
 
         // Properties.
         public virtual string LoginProvider { get; protected set; } = default!;
-        public virtual string ProviderDisplayName { get; protected set; } = default!;
+        public virtual string? ProviderDisplayName { get; protected set; } = default!;
         public virtual string ProviderKey { get; protected set; } = default!;
 
         // Methods.
@@ -47,7 +47,7 @@ public override bool Equals(object? obj)
 
         public override int GetHashCode() =>
             LoginProvider.GetHashCode() ^
-            ProviderDisplayName.GetHashCode() ^
+            ProviderDisplayName?.GetHashCode() ?? 0 ^
             ProviderKey.GetHashCode();
     }
 }
diff --git a/src/EthernaSSO.Persistence/EthernaSSO.Persistence.csproj b/src/EthernaSSO.Persistence/EthernaSSO.Persistence.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Etherna.SSOServer.Persistence</RootNamespace>
 
     <Authors>Etherna Sagl</Authors>

diff --git a/src/EthernaSSO.Persistence/ModelMaps/Shared/ModelBaseMap.cs b/src/EthernaSSO.Persistence/ModelMaps/Shared/ModelBaseMap.cs
@@ -21,14 +21,14 @@
 
 namespace Etherna.SSOServer.Persistence.ModelMaps.Shared
 {
-    class ModelBaseMap : IModelMapsCollector
+    internal sealed class ModelBaseMap : IModelMapsCollector
     {
         public void Register(IDbContext dbContext)
         {
             // register class maps.
-            dbContext.SchemaRegistry.AddModelMapsSchema<ModelBase>("d517f32d-cc45-4d21-8a99-27dca658bde5");
-            dbContext.SchemaRegistry.AddModelMapsSchema<EntityModelBase>("4c17bb54-af84-4a21-83ae-cb1050b721f5");
-            dbContext.SchemaRegistry.AddModelMapsSchema<EntityModelBase<string>>("e5e834e0-30cc-42a8-a1a2-9d5c79d35485",
+            dbContext.MapRegistry.AddModelMap<ModelBase>("d517f32d-cc45-4d21-8a99-27dca658bde5");
+            dbContext.MapRegistry.AddModelMap<EntityModelBase>("4c17bb54-af84-4a21-83ae-cb1050b721f5");
+            dbContext.MapRegistry.AddModelMap<EntityModelBase<string>>("e5e834e0-30cc-42a8-a1a2-9d5c79d35485",
                 modelMap =>
                 {
                     modelMap.AutoMap();

diff --git a/src/EthernaSSO.Persistence/ModelMaps/Shared/UserSharedInfoMap.cs b/src/EthernaSSO.Persistence/ModelMaps/Shared/UserSharedInfoMap.cs
@@ -18,11 +18,11 @@
 
 namespace Etherna.SSOServer.Persistence.ModelMaps.Shared
 {
-    class UserSharedInfoMap : IModelMapsCollector
+    internal sealed class UserSharedInfoMap : IModelMapsCollector
     {
         public void Register(IDbContext dbContext)
         {
-            dbContext.SchemaRegistry.AddModelMapsSchema<UserSharedInfo>("6d0d2ee1-6aa3-42ea-9833-ac592bfc6613", mm =>
+            dbContext.MapRegistry.AddModelMap<UserSharedInfo>("6d0d2ee1-6aa3-42ea-9833-ac592bfc6613", mm =>
             {
                 mm.AutoMap();
 

diff --git a/src/EthernaSSO.Persistence/ModelMaps/Sso/AlphaPassRequestMap.cs b/src/EthernaSSO.Persistence/ModelMaps/Sso/AlphaPassRequestMap.cs
@@ -18,11 +18,11 @@
 
 namespace Etherna.SSOServer.Persistence.ModelMaps.Sso
 {
-    internal class AlphaPassRequestMap : IModelMapsCollector
+    internal sealed class AlphaPassRequestMap : IModelMapsCollector
     {
         public void Register(IDbContext dbContext)
         {
-            dbContext.SchemaRegistry.AddModelMapsSchema<AlphaPassRequest>("cdfb69bd-b70c-4736-9210-737b675333bc");
+            dbContext.MapRegistry.AddModelMap<AlphaPassRequest>("cdfb69bd-b70c-4736-9210-737b675333bc");
         }
     }
 }
diff --git a/src/EthernaSSO.Persistence/ModelMaps/Sso/DailyStatsMap.cs b/src/EthernaSSO.Persistence/ModelMaps/Sso/DailyStatsMap.cs
@@ -18,11 +18,11 @@
 
 namespace Etherna.SSOServer.Persistence.ModelMaps.Sso
 {
-    class DailyStatsMap : IModelMapsCollector
+    internal sealed class DailyStatsMap : IModelMapsCollector
     {
         public void Register(IDbContext dbContext)
         {
-            dbContext.SchemaRegistry.AddModelMapsSchema<DailyStats>("375a3f26-9219-4ae4-86cf-32b9ba0ac703");
+            dbContext.MapRegistry.AddModelMap<DailyStats>("375a3f26-9219-4ae4-86cf-32b9ba0ac703");
         }
     }
 }
diff --git a/src/EthernaSSO.Persistence/ModelMaps/Sso/InvitationMap.cs b/src/EthernaSSO.Persistence/ModelMaps/Sso/InvitationMap.cs
@@ -19,11 +19,11 @@
 
 namespace Etherna.SSOServer.Persistence.ModelMaps.Sso
 {
-    class InvitationMap : IModelMapsCollector
+    internal sealed class InvitationMap : IModelMapsCollector
     {
         public void Register(IDbContext dbContext)
         {
-            dbContext.SchemaRegistry.AddModelMapsSchema<Invitation>("a51c7ca1-b53e-43d2-b1ab-7efb7f5e735b", mm =>
+            dbContext.MapRegistry.AddModelMap<Invitation>("a51c7ca1-b53e-43d2-b1ab-7efb7f5e735b", mm =>
             {
                 mm.AutoMap();
 

diff --git a/src/EthernaSSO.Persistence/ModelMaps/Sso/ModelBaseMap.cs b/src/EthernaSSO.Persistence/ModelMaps/Sso/ModelBaseMap.cs
@@ -21,14 +21,14 @@
 
 namespace Etherna.SSOServer.Persistence.ModelMaps.Sso
 {
-    class ModelBaseMap : IModelMapsCollector
+    internal sealed class ModelBaseMap : IModelMapsCollector
     {
         public void Register(IDbContext dbContext)
         {
             // register class maps.
-            dbContext.SchemaRegistry.AddModelMapsSchema<ModelBase>("eff57bde-15fb-44ba-ab38-e600ad2835e2");
-            dbContext.SchemaRegistry.AddModelMapsSchema<EntityModelBase>("d8ead46c-ba33-4587-b478-16aab83ffb47");
-            dbContext.SchemaRegistry.AddModelMapsSchema<EntityModelBase<string>>("7ddc64f6-3459-4641-957a-7c1dce83d56e",
+            dbContext.MapRegistry.AddModelMap<ModelBase>("eff57bde-15fb-44ba-ab38-e600ad2835e2");
+            dbContext.MapRegistry.AddModelMap<EntityModelBase>("d8ead46c-ba33-4587-b478-16aab83ffb47");
+            dbContext.MapRegistry.AddModelMap<EntityModelBase<string>>("7ddc64f6-3459-4641-957a-7c1dce83d56e",
                 modelMap =>
                 {
                     modelMap.AutoMap();

diff --git a/src/EthernaSSO.Persistence/ModelMaps/Sso/RoleMap.cs b/src/EthernaSSO.Persistence/ModelMaps/Sso/RoleMap.cs
@@ -21,30 +21,27 @@
 
 namespace Etherna.SSOServer.Persistence.ModelMaps.Sso
 {
-    class RoleMap : IModelMapsCollector
+    internal sealed class RoleMap : IModelMapsCollector
     {
         public void Register(IDbContext dbContext)
         {
-            dbContext.SchemaRegistry.AddModelMapsSchema<Role>("82413cc7-9f38-4ea2-a841-4d9479ab4f11");
+            dbContext.MapRegistry.AddModelMap<Role>("82413cc7-9f38-4ea2-a841-4d9479ab4f11");
         }
 
         /// <summary>
         /// A minimal serialized with only id and normalized name
         /// </summary>
-        public static ReferenceSerializer<Role, string> ReferenceSerializer(
-            IDbContext dbContext,
-            bool useCascadeDelete = false) =>
+        public static ReferenceSerializer<Role, string> ReferenceSerializer(IDbContext dbContext) =>
             new(dbContext, config =>
             {
-                config.UseCascadeDelete = useCascadeDelete;
-                config.AddModelMapsSchema<ModelBase>("884090cd-f82f-48cd-973f-8c061d67f0cb");
-                config.AddModelMapsSchema<EntityModelBase>("ff37854c-9437-43dc-8e4f-cc07f421e4f8", mm => { });
-                config.AddModelMapsSchema<EntityModelBase<string>>("a5f3bf0d-a5f8-4574-b73a-f4637fc8ea92", mm =>
+                config.AddModelMap<ModelBase>("884090cd-f82f-48cd-973f-8c061d67f0cb");
+                config.AddModelMap<EntityModelBase>("ff37854c-9437-43dc-8e4f-cc07f421e4f8", mm => { });
+                config.AddModelMap<EntityModelBase<string>>("a5f3bf0d-a5f8-4574-b73a-f4637fc8ea92", mm =>
                 {
                     mm.MapIdMember(m => m.Id);
                     mm.IdMemberMap.SetSerializer(new StringSerializer(BsonType.ObjectId));
                 });
-                config.AddModelMapsSchema<Role>("cc9c6902-edd5-491d-acb5-07ca02fa71d0", mm =>
+                config.AddModelMap<Role>("cc9c6902-edd5-491d-acb5-07ca02fa71d0", mm =>
                 {
                     mm.MapMember(m => m.NormalizedName);
                 });

diff --git a/src/EthernaSSO.Persistence/ModelMaps/Sso/UserClaimMap.cs b/src/EthernaSSO.Persistence/ModelMaps/Sso/UserClaimMap.cs
@@ -18,11 +18,11 @@
 
 namespace Etherna.SSOServer.Persistence.ModelMaps.Sso
 {
-    class UserClaimMap : IModelMapsCollector
+    internal sealed class UserClaimMap : IModelMapsCollector
     {
         public void Register(IDbContext dbContext)
         {
-            dbContext.SchemaRegistry.AddModelMapsSchema<UserClaim>("f7831985-dc0c-439f-b118-d7c511619a87");
+            dbContext.MapRegistry.AddModelMap<UserClaim>("f7831985-dc0c-439f-b118-d7c511619a87");
         }
     }
 }
diff --git a/src/EthernaSSO.Persistence/ModelMaps/Sso/UserLoginInfoMap.cs b/src/EthernaSSO.Persistence/ModelMaps/Sso/UserLoginInfoMap.cs
@@ -18,11 +18,11 @@
 
 namespace Etherna.SSOServer.Persistence.ModelMaps.Sso
 {
-    class UserLoginInfoMap : IModelMapsCollector
+    internal sealed class UserLoginInfoMap : IModelMapsCollector
     {
         public void Register(IDbContext dbContext)
         {
-            dbContext.SchemaRegistry.AddModelMapsSchema<UserLoginInfo>("6cec179b-807a-4ff9-977b-9314a60725a7");
+            dbContext.MapRegistry.AddModelMap<UserLoginInfo>("6cec179b-807a-4ff9-977b-9314a60725a7");
         }
     }
 }