merge hotfix

Etherna · Mar 11, 2024 · d00c533 · d00c533
2 parents 0359c58 + c83ce4d
commit d00c533
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 19 deletions.
diff --git a/src/EthernaSSO.Domain/EthernaSSO.Domain.csproj b/src/EthernaSSO.Domain/EthernaSSO.Domain.csproj
@@ -16,8 +16,8 @@
     <PackageReference Include="Etherna.Authentication.AspNetCore" Version="0.3.3" />
     <PackageReference Include="Etherna.DomainEvents" Version="1.4.0" />
     <PackageReference Include="EthernaACR" Version="0.3.10" />
-    <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.98" />
-    <PackageReference Include="Nethereum.Accounts" Version="4.18.0" />
+    <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.101" />
+    <PackageReference Include="Nethereum.Accounts" Version="4.19.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/EthernaSSO.Services/EthernaSSO.Services.csproj b/src/EthernaSSO.Services/EthernaSSO.Services.csproj
@@ -18,9 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="6.3.7" />
+    <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.0.1" />
     <PackageReference Include="Etherna.DomainEvents.AspNetCore" Version="1.4.0" />
-    <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.98" />
+    <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.101" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EthernaSSO/Attributes/HideUnauthorizedExceptionFilterAttribute.cs b/src/EthernaSSO/Attributes/HideUnauthorizedExceptionFilterAttribute.cs
@@ -15,6 +15,7 @@
 using Etherna.MongODM.Core.Exceptions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Serilog;
 using System;
 using System.Collections.Generic;
 
@@ -25,7 +26,11 @@ public sealed class HideUnauthorizedExceptionFilterAttribute : ExceptionFilterAt
         public override void OnException(ExceptionContext context)
         {
             ArgumentNullException.ThrowIfNull(context, nameof(context));
+
+            // Log exception.
+            Log.Warning(context.Exception, "API exception");
 
+            // Handle exception.
             switch (context.Exception)
             {
                 case ArgumentException _:

diff --git a/src/EthernaSSO/Attributes/SimpleExceptionFilterAttribute.cs b/src/EthernaSSO/Attributes/SimpleExceptionFilterAttribute.cs
@@ -15,6 +15,7 @@
 using Etherna.MongODM.Core.Exceptions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Serilog;
 using System;
 using System.Collections.Generic;
 
@@ -25,7 +26,11 @@ public sealed class SimpleExceptionFilterAttribute : ExceptionFilterAttribute
         public override void OnException(ExceptionContext context)
         {
             ArgumentNullException.ThrowIfNull(context, nameof(context));
+
+            // Log exception.
+            Log.Warning(context.Exception, "API exception");
 
+            // Handle exception.
             switch (context.Exception)
             {
                 case ArgumentException _:

diff --git a/src/EthernaSSO/Configs/IdentityServer/IdServerConfig.cs b/src/EthernaSSO/Configs/IdentityServer/IdServerConfig.cs
@@ -104,6 +104,9 @@ public static class IdResourcesDef
         private readonly string ethernaGateway_Webapp_ClientId;
         private readonly string ethernaGateway_Webapp_Secret;
 
+        private readonly string ethernaGatewayCli_BaseUrl;
+        private readonly string ethernaGatewayCli_ClientId;
+
         private readonly string ethernaIndex_BaseUrl;
         private readonly string ethernaIndex_Sso_ClientId;
         private readonly string ethernaIndex_Sso_Secret;
@@ -139,6 +142,9 @@ public IdServerConfig(IConfiguration configuration)
             ethernaGateway_Webapp_ClientId = configuration["IdServer:Clients:EthernaGateway:Clients:Webapp:ClientId"] ?? throw new ServiceConfigurationException();
             ethernaGateway_Webapp_Secret = configuration["IdServer:Clients:EthernaGateway:Clients:Webapp:Secret"] ?? throw new ServiceConfigurationException();
 
+            ethernaGatewayCli_BaseUrl = configuration["IdServer:Clients:EthernaGatewayCli:BaseUrl"] ?? throw new ServiceConfigurationException();
+            ethernaGatewayCli_ClientId = configuration["IdServer:Clients:EthernaGatewayCli:ClientId"] ?? throw new ServiceConfigurationException();
+
             ethernaIndex_BaseUrl = configuration["IdServer:Clients:EthernaIndex:BaseUrl"] ?? throw new ServiceConfigurationException();
             ethernaIndex_Sso_ClientId = configuration["IdServer:Clients:EthernaIndex:Clients:SsoServer:ClientId"] ?? throw new ServiceConfigurationException();
             ethernaIndex_Sso_Secret = configuration["IdServer:Clients:EthernaIndex:Clients:SsoServer:Secret"] ?? throw new ServiceConfigurationException();
@@ -334,6 +340,40 @@ public IdServerConfig(IConfiguration configuration)
                 // Allow token refresh.
                 AllowOfflineAccess = true
             },
+
+            //gateway cli
+            new Client
+            {
+                ClientId = ethernaGatewayCli_ClientId,
+                ClientName = "Etherna Gateway CLI",
+                RequireClientSecret = false,
+
+                AllowedGrantTypes = GrantTypes.Code,
+
+                //where to redirect to after login
+                RedirectUris = { ethernaGatewayCli_BaseUrl },
+
+                //where to redirect to after logout
+                PostLogoutRedirectUris = { ethernaGatewayCli_BaseUrl },
+
+                AllowedCorsOrigins = { ethernaGatewayCli_BaseUrl },
+
+                AlwaysIncludeUserClaimsInIdToken = true,
+                AllowedScopes =
+                {
+                    //identity
+                    IdentityServerConstants.StandardScopes.OpenId,
+                    IdentityServerConstants.StandardScopes.Profile,
+                    IdResourcesDef.EtherAccounts.Name,
+
+                    //resource
+                    ApiScopesDef.UserInteractEthernaGateway.Name,
+                },
+
+                // Allow token refresh.
+                AllowOfflineAccess = true,
+                RefreshTokenUsage = TokenUsage.OneTimeOnly //because client have not secret
+            },
 
             //index (sso client)
             new Client

diff --git a/src/EthernaSSO/EthernaSSO.csproj b/src/EthernaSSO/EthernaSSO.csproj
@@ -20,16 +20,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.3.3"> <!--Installed only to hide warning-->
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="MongODM" Version="0.24.0-alpha.98" />
-    <PackageReference Include="MongODM.AspNetCore.UI" Version="0.24.0-alpha.98" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="MongODM" Version="0.24.0-alpha.101" />
+    <PackageReference Include="MongODM.AspNetCore.UI" Version="0.24.0-alpha.101" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />

diff --git a/src/EthernaSSO/appsettings.json b/src/EthernaSSO/appsettings.json
@@ -47,6 +47,11 @@
         }
       },
 
+      "EthernaGatewayCli": {
+        "BaseUrl": "http://127.0.0.1:11430",
+        "ClientId": "ethernaGatewayCliId"
+      },
+
       "EthernaIndex": {
         "Clients": {
           "SsoServer": {

diff --git a/src/EthernaSSO/package-lock.json b/src/EthernaSSO/package-lock.json
diff --git a/test/EthernaSSO.Persistence.Tests/EthernaSSO.Persistence.Tests.csproj b/test/EthernaSSO.Persistence.Tests/EthernaSSO.Persistence.Tests.csproj
@@ -15,10 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.6.5" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>