Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit 09c6f82

Browse files
brunobritodevbrunobritodev
committed
Renaming some methods to improve knowledge about config
1 parent 017c5d7 commit 09c6f82

File tree

22 files changed

+62
-64
lines changed

22 files changed

+62
-64
lines changed

‎src/Backend/Jp.Infra.CrossCutting.Database/DbSettingsConfig.cs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
using Jp.Infra.Data.MySql.Configuration;
1+
using Jp.Infra.CrossCutting.Identity.Context;
2+
using Jp.Infra.CrossCutting.Identity.Entities.Identity;
3+
using Jp.Infra.Data.MySql.Configuration;
24
using Jp.Infra.Data.PostgreSQL.Configuration;
35
using Jp.Infra.Data.Sql.Configuration;
46
using Jp.Infra.Data.Sqlite.Configuration;
7+
using Microsoft.AspNetCore.Identity;
58
using Microsoft.Extensions.Configuration;
69
using Microsoft.Extensions.DependencyInjection;
710

811
namespace Jp.Infra.CrossCutting.Database
912
{
1013
public static class DbSettingsConfig
1114
{
12-
public static void ConfigureDatabase(this IServiceCollection services, IConfiguration configuration)
15+
public static void AddAuthentication(this IServiceCollection services, IConfiguration configuration)
1316
{
1417
var database = configuration["ApplicationSettings:DatabaseType"].ToUpper();
1518
var connString = configuration.GetConnectionString("SSOConnection");
@@ -28,6 +31,12 @@ public static void ConfigureDatabase(this IServiceCollection services, IConfigur
2831
services.AddIdentitySqlite(connString);
2932
break;
3033
}
34+
35+
services.AddIdentity<UserIdentity, UserIdentityRole>()
36+
.AddEntityFrameworkStores<ApplicationIdentityContext>()
37+
.AddDefaultTokenProviders();
38+
39+
services.UpgradePasswordSecurity().UseArgon2<IdentityUser>();
3140
}
3241

3342
public static void ConfigureIdentityServerDatabase(this IIdentityServerBuilder builder, IConfiguration configuration)

‎src/Backend/Jp.Infra.CrossCutting.Database/Jp.Infra.CrossCutting.Database.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8+
<PackageReference Include="JpProject.AspNetCore.PasswordHasher.Argon2" Version="1.0.2" />
89
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
910
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
1011
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4">

‎src/Backend/Jp.Infra.CrossCutting.Identity/Services/MessageServices.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System.Threading.Tasks;
2-
using MailKit.Net.Smtp;
1+
using MailKit.Net.Smtp;
32
using MimeKit;
43
using MimeKit.Text;
4+
using System.Threading.Tasks;
55

66
namespace Jp.Infra.CrossCutting.Identity.Services
77
{
@@ -16,9 +16,9 @@ public AuthEmailMessageSender(IEmailConfiguration emailConfiguration)
1616
}
1717
public async Task SendEmailAsync(string email, string subject, string message)
1818
{
19-
if(!_emailConfiguration.SendEmail)
19+
if (!_emailConfiguration.SendEmail)
2020
return;
21-
21+
2222
var mimeMessage = new MimeMessage();
2323
mimeMessage.To.Add(new MailboxAddress(email));
2424
mimeMessage.From.Add(new MailboxAddress(_emailConfiguration.FromName, _emailConfiguration.FromAddress));

‎src/Backend/Jp.Infra.CrossCutting.IdentityServer/Configuration/IdentityServerConfig.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Jp.Infra.CrossCutting.IdentityServer.Configuration
88
{
99
public static class IdentityServerConfig
1010
{
11-
public static IIdentityServerBuilder AddIdentityServer(this IServiceCollection services,
11+
public static IIdentityServerBuilder AddOAuth2(this IServiceCollection services,
1212
IConfiguration configuration, IHostingEnvironment environment, ILogger logger)
1313
{
1414

‎src/Backend/Jp.Infra.Data.MySql/Configuration/IdentityConfig.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
using System.Reflection;
2-
using IdentityServer4.EntityFramework.Options;
1+
using IdentityServer4.EntityFramework.Options;
32
using Jp.Infra.CrossCutting.Identity.Context;
4-
using Jp.Infra.CrossCutting.Identity.Entities.Identity;
53
using Jp.Infra.Data.Context;
6-
using Microsoft.AspNetCore.Identity;
74
using Microsoft.EntityFrameworkCore;
85
using Microsoft.Extensions.DependencyInjection;
6+
using System.Reflection;
97

108
namespace Jp.Infra.Data.MySql.Configuration
119
{
@@ -25,9 +23,6 @@ public static IServiceCollection AddIdentityMySql(this IServiceCollection servic
2523
services.AddDbContext<JpContext>(options => options.UseMySql(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2624
services.AddDbContext<EventStoreContext>(options => options.UseMySql(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2725

28-
services.AddIdentity<UserIdentity, UserIdentityRole>()
29-
.AddEntityFrameworkStores<ApplicationIdentityContext>()
30-
.AddDefaultTokenProviders();
3126
return services;
3227
}
3328
}

‎src/Backend/Jp.Infra.Data.PostgreSQL/Configuration/IdentityConfig.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using IdentityServer4.EntityFramework.Options;
22
using Jp.Infra.CrossCutting.Identity.Context;
3-
using Jp.Infra.CrossCutting.Identity.Entities.Identity;
43
using Jp.Infra.Data.Context;
5-
using Microsoft.AspNetCore.Identity;
64
using Microsoft.EntityFrameworkCore;
75
using Microsoft.Extensions.DependencyInjection;
86
using System.Reflection;
@@ -25,9 +23,6 @@ public static IServiceCollection AddIdentityPostgreSql(this IServiceCollection s
2523
services.AddDbContext<JpContext>(options => options.UseNpgsql(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2624
services.AddDbContext<EventStoreContext>(options => options.UseNpgsql(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2725

28-
services.AddIdentity<UserIdentity, UserIdentityRole>()
29-
.AddEntityFrameworkStores<ApplicationIdentityContext>()
30-
.AddDefaultTokenProviders();
3126
return services;
3227
}
3328
}

‎src/Backend/Jp.Infra.Data.Sql/Configuration/IdentityConfig.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using IdentityServer4.EntityFramework.Options;
22
using Jp.Infra.CrossCutting.Identity.Context;
3-
using Jp.Infra.CrossCutting.Identity.Entities.Identity;
43
using Jp.Infra.Data.Context;
5-
using Microsoft.AspNetCore.Identity;
64
using Microsoft.EntityFrameworkCore;
75
using Microsoft.Extensions.DependencyInjection;
86
using System.Reflection;
@@ -25,9 +23,6 @@ public static IServiceCollection AddIdentitySqlServer(this IServiceCollection se
2523
services.AddDbContext<JpContext>(options => options.UseSqlServer(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2624
services.AddDbContext<EventStoreContext>(options => options.UseSqlServer(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2725

28-
services.AddIdentity<UserIdentity, UserIdentityRole>()
29-
.AddEntityFrameworkStores<ApplicationIdentityContext>()
30-
.AddDefaultTokenProviders();
3126
return services;
3227
}
3328
}

‎src/Backend/Jp.Infra.Data.Sqlite/Configuration/IdentityConfig.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ public static IServiceCollection AddIdentitySqlite(this IServiceCollection servi
2525
services.AddDbContext<JpContext>(options => options.UseSqlite(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2626
services.AddDbContext<EventStoreContext>(options => options.UseSqlite(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
2727

28-
services.AddIdentity<UserIdentity, UserIdentityRole>()
29-
.AddEntityFrameworkStores<ApplicationIdentityContext>()
30-
.AddDefaultTokenProviders();
28+
3129
return services;
3230
}
3331
}

‎src/Backend/Jp.UserManagement/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void ConfigureServices(IServiceCollection services)
4040
services.AddMvc();
4141

4242
// Identity Database
43-
services.ConfigureDatabase(Configuration);
43+
services.AddAuthentication(Configuration);
4444

4545
services.ConfigureCors();
4646

‎src/Backend/Jp.UserManagement/appsettings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// Postgre Connection
44
//"SSOConnection": "Server=localhost;Port=5432;Database=jpproject;User Id=postgres;Password=@Password1;"
55
// Sql Server Connection
6-
//"SSOConnection": "Server=.;Initial Catalog=JpProject;Persist Security Info=False;User ID=sa;Password=@Password1;MultipleActiveResultSets=False;Connection Timeout=30;"
6+
"SSOConnection": "Server=.;Initial Catalog=JpProject;Persist Security Info=False;User ID=sa;Password=@Password1;MultipleActiveResultSets=False;Connection Timeout=30;"
77
// MySql Connection
88
// "SSOConnection": "server=localhost,port=3306;database=jpproject;user=bruno;password=10203040"
99
// SQLite Connection
10-
"SSOConnection": "Data Source=jpproject.db"
10+
//"SSOConnection": "Data Source=jpproject.db"
1111
},
1212
"Logging": {
1313
"IncludeScopes": false,
@@ -32,7 +32,7 @@
3232
"SendEmail": "false"
3333
},
3434
"ApplicationSettings": {
35-
"DatabaseType": "SQLITE",
35+
"DatabaseType": "SqlServer",
3636
"Authority": "https://localhost:5001"
3737
}
3838
}

0 commit comments

Comments
 (0)