Merge pull request #298 from jeffreysSharp/develop

jeffreysSharp · web-flow · commit 54531feec85b · 2025-01-14T18:36:02.000-03:00
#278 - Implementando o JWK nas demais API's - feature/sp8/#278
diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@
 - NetDevPack
 - Facade
 - Elastic Search
+- JWK e JWKS
 
 # Ferramentas
 - Visual Studio 2022 - Version 17.11.4 ++
@@ -51,4 +52,4 @@
 - [x] API Gateway / BFF - Compras 
 - [X] Aplicação de Voucher
 - [X] Pedidos
-- [ ] Pagamentos
+- [x] Pagamentos
diff --git a/src/api gateways/JSE.Bff.Compras/appsettings.Development.json b/src/api gateways/JSE.Bff.Compras/appsettings.Development.json
@@ -19,9 +19,7 @@
   },
 
   "AppSettings": {
-    "Secret": "F9F52344-59C3-4EAC-90E6-CB47935038BE",
-    "ExpirationHours": 2,
-    "Issuer": "MeuSistema",
-    "ValidOn": "https://localhost"
+    "AutenticacaoJwksUrl": "https://localhost:44396/jwks"
   }
+
 }
diff --git a/src/building blocks/JSE.WebAPI.Core/IdentityConfiguration/AppSettings.cs b/src/building blocks/JSE.WebAPI.Core/IdentityConfiguration/AppSettings.cs
@@ -2,9 +2,6 @@
 {
     public class AppSettings
     {
-        public string Secret { get; set; }
-        public int ExpirationHours { get; set; }
-        public string Issuer { get; set; }
-        public string ValidOn { get; set; }
+        public string AutenticacaoJwksUrl{ get; set; }
     }
 }
diff --git a/src/building blocks/JSE.WebAPI.Core/IdentityConfiguration/JwtConfiguration.cs b/src/building blocks/JSE.WebAPI.Core/IdentityConfiguration/JwtConfiguration.cs
@@ -2,8 +2,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.IdentityModel.Tokens;
-using System.Text;
+using NetDevPack.Security.JwtExtensions;
 
 namespace JSE.WebAPI.Core.IdentityConfiguration
 {
@@ -16,7 +15,6 @@ public static void AddJwtConfiguration(this IServiceCollection services,
             services.Configure<AppSettings>(appSettingsSection);
 
             var appSettings = appSettingsSection.Get<AppSettings>();
-            var key = Encoding.ASCII.GetBytes(appSettings.Secret);
 
             services.AddAuthentication(x =>
             {
@@ -26,15 +24,7 @@ public static void AddJwtConfiguration(this IServiceCollection services,
             {
                 x.RequireHttpsMetadata = true;
                 x.SaveToken = true;
-                x.TokenValidationParameters = new TokenValidationParameters
-                {
-                    ValidateIssuerSigningKey = true,
-                    IssuerSigningKey = new SymmetricSecurityKey(key),
-                    ValidateIssuer = true,
-                    ValidateAudience = true,
-                    ValidAudience = appSettings.ValidOn,
-                    ValidIssuer = appSettings.Issuer
-                };
+                x.SetJwksOptions(new JwkOptions(appSettings.AutenticacaoJwksUrl));
             });
         }
 
diff --git a/src/building blocks/JSE.WebAPI.Core/JSE.WebAPI.Core.csproj b/src/building blocks/JSE.WebAPI.Core/JSE.WebAPI.Core.csproj
@@ -12,6 +12,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.10" />
+    <PackageReference Include="NetDevPack.Security.JwtExtensions" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/services/JSE.Carrinho.API/appsettings.Development.json b/src/services/JSE.Carrinho.API/appsettings.Development.json
@@ -2,19 +2,19 @@
   "ConnectionStrings": {
     "DefaultConnection": "Server=.\\SQLEXPRESS;Database=JeffStoreEnterprise;User Id=sa;Password=Asd123!!;Trusted_Connection=true;MultipleActiveResultSets=true;TrustServerCertificate=True;"
   },
+
   "MessageQueueConnection": {
     "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10"
   },
+
   "Logging": {
     "LogLevel": {
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
   },
+
   "AppSettings": {
-    "Secret": "F9F52344-59C3-4EAC-90E6-CB47935038BE",
-    "ExpirationHours": 2,
-    "Issuer": "MeuSistema",
-    "ValidOn": "https://localhost"
+    "AutenticacaoJwksUrl": "https://localhost:44396/jwks"
   }
 }
diff --git a/src/services/JSE.Catalogo.API/appsettings.Development.json b/src/services/JSE.Catalogo.API/appsettings.Development.json
@@ -15,9 +15,7 @@
   },
 
   "AppSettings": {
-    "Secret": "F9F52344-59C3-4EAC-90E6-CB47935038BE",
-    "ExpirationHours": 2,
-    "Issuer": "MeuSistema",
-    "ValidOn": "https://localhost"
+    "AutenticacaoJwksUrl": "https://localhost:44396/jwks"
   }
+
 }
diff --git a/src/services/JSE.Clientes.API/appsettings.Development.json b/src/services/JSE.Clientes.API/appsettings.Development.json
@@ -1,20 +1,20 @@
 {
-  "ConnectionStrings": {
-    "DefaultConnection": "Server=.\\SQLEXPRESS;Database=JeffStoreEnterprise;User Id=sa;Password=Asd123!!;Trusted_Connection=true;MultipleActiveResultSets=true;TrustServerCertificate=True;"
-  },
-  "MessageQueueConnection": {
-    "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10"
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
   },
+
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=.\\SQLEXPRESS;Database=JeffStoreEnterprise;User Id=sa;Password=Asd123!!;Trusted_Connection=true;MultipleActiveResultSets=true;TrustServerCertificate=True;"
+  },
+
+  "MessageQueueConnection": {
+    "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10"
+  },
+
   "AppSettings": {
-    "Secret": "F9F52344-59C3-4EAC-90E6-CB47935038BE",
-    "ExpirationHours": 2,
-    "Issuer": "MeuSistema",
-    "ValidOn": "https://localhost"
+    "AutenticacaoJwksUrl": "https://localhost:44396/jwks"
   }
 }
diff --git a/src/services/JSE.Identidade.API/Configuration/IdentityConfig.cs b/src/services/JSE.Identidade.API/Configuration/IdentityConfig.cs
@@ -1,6 +1,5 @@
 ﻿using JSE.Identidade.API.Data;
 using JSE.Identidade.API.Extensions;
-using JSE.WebAPI.Core.IdentityConfiguration;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using NetDevPack.Security.JwtSigningCredentials;
@@ -25,8 +24,6 @@ public static IServiceCollection AddIdentityConfiguration(this IServiceCollectio
                 .AddEntityFrameworkStores<ApplicationDbContext>()
                 .AddDefaultTokenProviders();
 
-            services.AddJwtConfiguration(configuration);
-
             return services;
         }
     }
diff --git a/src/services/JSE.Identidade.API/Controllers/AuthController.cs b/src/services/JSE.Identidade.API/Controllers/AuthController.cs
@@ -155,7 +155,7 @@ private UsuarioRespostaLoginViewModel ObterRespostaToken(string encodedToken, Id
             return new UsuarioRespostaLoginViewModel
             {
                 AccessToken = encodedToken,
-                ExpiresIn = TimeSpan.FromHours(_appSettings.ExpirationHours).TotalSeconds,
+                ExpiresIn = TimeSpan.FromHours(1).TotalSeconds,
                 UsuarioToken = new UsuarioTokenViewModel
                 {
                     Id = user.Id,
diff --git a/src/services/JSE.Identidade.API/appsettings.Development.json b/src/services/JSE.Identidade.API/appsettings.Development.json
@@ -1,20 +1,16 @@
 {
-  "ConnectionStrings": {
-    "DefaultConnection": "Server=.\\SQLEXPRESS;Database=JeffStoreEnterprise;User Id=sa;Password=Asd123!!;Trusted_Connection=true;MultipleActiveResultSets=true;TrustServerCertificate=True;"
-  },
-  "MessageQueueConnection": {
-    "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10"
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AppSettings": {
-    "Secret": "F9F52344-59C3-4EAC-90E6-CB47935038BE",
-    "ExpirationHours": 2,
-    "Issuer": "MeuSistema",
-    "ValidOn": "https://localhost"
+
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=.\\SQLEXPRESS;Database=JeffStoreEnterprise;User Id=sa;Password=Asd123!!;Trusted_Connection=true;MultipleActiveResultSets=true;TrustServerCertificate=True;"
+  },
+
+  "MessageQueueConnection": {
+    "MessageBus": "host=localhost:5672;publisherConfirms=true;timeout=10"
   }
 }
diff --git a/src/services/JSE.Pagamento.API/appsettings.Development.json b/src/services/JSE.Pagamento.API/appsettings.Development.json
@@ -15,10 +15,7 @@
   },
 
   "AppSettings": {
-    "Secret": "F9F52344-59C3-4EAC-90E6-CB47935038BE",
-    "ExpirationHours": 2,
-    "Issuer": "MeuSistema",
-    "ValidOn": "https://localhost"
+    "AutenticacaoJwksUrl": "https://localhost:44396/jwks"
   },
 
   "PagamentoConfig": {
diff --git a/src/services/JSE.Pedido.API/appsettings.Development.json b/src/services/JSE.Pedido.API/appsettings.Development.json
@@ -15,9 +15,6 @@
   },
 
   "AppSettings": {
-    "Secret": "F9F52344-59C3-4EAC-90E6-CB47935038BE",
-    "ExpirationHours": 2,
-    "Issuer": "MeuSistema",
-    "ValidOn": "https://localhost"
+    "AutenticacaoJwksUrl": "https://localhost:44396/jwks"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,7 @@`
`19`	`19`	`},`
`20`	`20`
`21`	`21`	`"AppSettings": {`
`22`		`- "Secret": "F9F52344-59C3-4EAC-90E6-CB47935038BE",`
`23`		`- "ExpirationHours": 2,`
`24`		`- "Issuer": "MeuSistema",`
`25`		`- "ValidOn": "https://localhost"`
	`22`	`+ "AutenticacaoJwksUrl": "https://localhost:44396/jwks"`
`26`	`23`	`}`
	`24`	`+`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`public class AppSettings`
`4`	`4`	`{`
`5`		`- public string Secret { get; set; }`
`6`		`- public int ExpirationHours { get; set; }`
`7`		`- public string Issuer { get; set; }`
`8`		`- public string ValidOn { get; set; }`
	`5`	`+ public string AutenticacaoJwksUrl{ get; set; }`
`9`	`6`	`}`
`10`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,7 @@`
`15`	`15`	`},`
`16`	`16`
`17`	`17`	`"AppSettings": {`
`18`		`- "Secret": "F9F52344-59C3-4EAC-90E6-CB47935038BE",`
`19`		`- "ExpirationHours": 2,`
`20`		`- "Issuer": "MeuSistema",`
`21`		`- "ValidOn": "https://localhost"`
	`18`	`+ "AutenticacaoJwksUrl": "https://localhost:44396/jwks"`
`22`	`19`	`}`
	`20`	`+`
`23`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using JSE.Identidade.API.Data;`
`2`	`2`	`using JSE.Identidade.API.Extensions;`
`3`		`-using JSE.WebAPI.Core.IdentityConfiguration;`
`4`	`3`	`using Microsoft.AspNetCore.Identity;`
`5`	`4`	`using Microsoft.EntityFrameworkCore;`
`6`	`5`	`using NetDevPack.Security.JwtSigningCredentials;`
`@@ -25,8 +24,6 @@ public static IServiceCollection AddIdentityConfiguration(this IServiceCollectio`
`25`	`24`	`.AddEntityFrameworkStores<ApplicationDbContext>()`
`26`	`25`	`.AddDefaultTokenProviders();`
`27`	`26`
`28`		`- services.AddJwtConfiguration(configuration);`
`29`		`-`
`30`	`27`	`return services;`
`31`	`28`	`}`
`32`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private UsuarioRespostaLoginViewModel ObterRespostaToken(string encodedToken, Id`
`155`	`155`	`return new UsuarioRespostaLoginViewModel`
`156`	`156`	`{`
`157`	`157`	`AccessToken = encodedToken,`
`158`		`- ExpiresIn = TimeSpan.FromHours(_appSettings.ExpirationHours).TotalSeconds,`
	`158`	`+ ExpiresIn = TimeSpan.FromHours(1).TotalSeconds,`
`159`	`159`	`UsuarioToken = new UsuarioTokenViewModel`
`160`	`160`	`{`
`161`	`161`	`Id = user.Id,`