merge hotfix

Etherna · Jan 7, 2024 · 0359c58 · 0359c58
2 parents 1f39b7d + 5db87a4
commit 0359c58
Show file tree

Hide file tree

Showing 258 changed files with 2,147 additions and 2,102 deletions.
diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml
@@ -10,34 +10,34 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: etherna/etherna-sso
-        tags: |
-          type=semver,pattern=v{{major}}
-          type=semver,pattern=v{{major}}.{{minor}}
-          type=semver,pattern=v{{version}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: etherna/etherna-sso
+          tags: |
+            type=semver,pattern=v{{major}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{version}}
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Build and push
-      uses: docker/build-push-action@v4
-      with:
-        context: .
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/unstable-release.yml b/.github/workflows/unstable-release.yml
@@ -3,39 +3,39 @@ name: Unstable release on Docker Hub
 on:
   push:
     branches:
-    - dev
+      - dev
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: etherna/etherna-sso
-        tags: |
-          type=ref,event=branch
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: etherna/etherna-sso
+          tags: |
+            type=ref,event=branch
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Build and push
-      uses: docker/build-push-action@v4
-      with:
-        context: .
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,13 @@
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-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
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+RUN curl -SLO https://deb.nodesource.com/nsolid_setup_deb.sh
+RUN chmod 500 nsolid_setup_deb.sh
+RUN ./nsolid_setup_deb.sh 20
+RUN apt-get install nodejs -y
 WORKDIR /src
 COPY . .
 RUN dotnet restore "EthernaSSO.sln"

diff --git a/EthernaSSO.sln b/EthernaSSO.sln
@@ -25,14 +25,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		Dockerfile = Dockerfile
-		EthernaSSO.sln.licenseheader = EthernaSSO.sln.licenseheader
 		LICENSE = LICENSE
 		nuget.config = nuget.config
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EthernaSSO.Persistence.Tests", "test\EthernaSSO.Persistence.Tests\EthernaSSO.Persistence.Tests.csproj", "{7928405E-1942-4B8A-AEFB-447EEEA092B7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{E7F7EC20-07A3-43F2-ABCF-E3FCA0235CDB}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\stable-release.yml = .github\workflows\stable-release.yml
+		.github\workflows\unstable-release.yml = .github\workflows\unstable-release.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,6 +76,7 @@ Global
 		{AF83D80A-77BE-48C8-ABE3-D1373F20F2B0} = {5AE428C2-CD56-4E51-A229-3F4C137D9D83}
 		{8EE2E2BE-2FB6-4E96-8F34-08F9CDACFCFE} = {BB9B2543-8741-4D95-AC15-35923C422E60}
 		{7928405E-1942-4B8A-AEFB-447EEEA092B7} = {10DAD3ED-08F6-48B9-A298-60D0ABF3B2E2}
+		{E7F7EC20-07A3-43F2-ABCF-E3FCA0235CDB} = {1C01CDAC-366E-4F9B-8A52-25F7770FE92A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6EB5F2B3-8912-4D50-BAB1-C3884E3BF3C0}

diff --git a/EthernaSSO.sln.DotSettings b/EthernaSSO.sln.DotSettings
@@ -0,0 +1,16 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">  Copyright 2021-present Etherna Sa
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Etherna/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/EthernaSSO.sln.licenseheader b/EthernaSSO.sln.licenseheader
diff --git a/src/EthernaSSO.Domain/EthernaSSO.Domain.csproj b/src/EthernaSSO.Domain/EthernaSSO.Domain.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Etherna.SSOServer.Domain</RootNamespace>
 
-    <Authors>Etherna Sagl</Authors>
+    <Authors>Etherna Sa</Authors>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
@@ -13,11 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Etherna.Authentication.AspNetCore" Version="0.3.2" />
+    <PackageReference Include="Etherna.Authentication.AspNetCore" Version="0.3.3" />
     <PackageReference Include="Etherna.DomainEvents" Version="1.4.0" />
-    <PackageReference Include="EthernaACR" Version="0.3.9" />
+    <PackageReference Include="EthernaACR" Version="0.3.10" />
     <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.98" />
-    <PackageReference Include="Nethereum.Accounts" Version="4.16.0" />
+    <PackageReference Include="Nethereum.Accounts" Version="4.18.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/EthernaSSO.Domain/Events/EntityCreatedEvent.cs b/src/EthernaSSO.Domain/Events/EntityCreatedEvent.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+// Copyright 2021-present Etherna Sa
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/EthernaSSO.Domain/Events/EntityDeletedEvent.cs b/src/EthernaSSO.Domain/Events/EntityDeletedEvent.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+// Copyright 2021-present Etherna Sa
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/EthernaSSO.Domain/Events/UserLoginFailureEvent.cs b/src/EthernaSSO.Domain/Events/UserLoginFailureEvent.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+// Copyright 2021-present Etherna Sa
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/EthernaSSO.Domain/Events/UserLoginSuccessEvent.cs b/src/EthernaSSO.Domain/Events/UserLoginSuccessEvent.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+// Copyright 2021-present Etherna Sa
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,19 +18,16 @@
 
 namespace Etherna.SSOServer.Domain.Events
 {
-    public class UserLoginSuccessEvent : IDomainEvent
+    public class UserLoginSuccessEvent(
+        UserBase user,
+        string? clientId = null,
+        string? provider = null,
+        string? providerUserId = null)
+        : IDomainEvent
     {
-        public UserLoginSuccessEvent(UserBase user, string? clientId = null, string? provider = null, string? providerUserId = null)
-        {
-            User = user ?? throw new ArgumentNullException(nameof(user));
-            ClientId = clientId;
-            Provider = provider;
-            ProviderUserId = providerUserId;
-        }
-
-        public string? ClientId { get; }
-        public string? Provider { get; }
-        public string? ProviderUserId { get; }
-        public UserBase User { get; }
+        public string? ClientId { get; } = clientId;
+        public string? Provider { get; } = provider;
+        public string? ProviderUserId { get; } = providerUserId;
+        public UserBase User { get; } = user ?? throw new ArgumentNullException(nameof(user));
     }
 }
diff --git a/src/EthernaSSO.Domain/Events/UserLogoutSuccessEvent.cs b/src/EthernaSSO.Domain/Events/UserLogoutSuccessEvent.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+// Copyright 2021-present Etherna Sa
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.