Skip to content

Commit e6f0969

Browse files
scottbrady91scottbrady91
committed
Updated to ASP.NET Core 3.1
1 parent c4f3aff commit e6f0969

5 files changed

Lines changed: 32 additions & 35 deletions

File tree

‎src/Host/Host.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.App" />
8+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.1" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.1" />
910
</ItemGroup>
1011

1112
<ItemGroup>

‎src/Host/Program.cs‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using System.Linq;
5-
using System.Threading.Tasks;
6-
using Microsoft.AspNetCore;
7-
using Microsoft.AspNetCore.Hosting;
8-
using Microsoft.Extensions.Configuration;
9-
using Microsoft.Extensions.Logging;
1+
using Microsoft.AspNetCore.Hosting;
2+
using Microsoft.Extensions.Hosting;
103

114
namespace Host
125
{
136
public class Program
147
{
158
public static void Main(string[] args)
169
{
17-
CreateWebHostBuilder(args).Build().Run();
10+
CreateHostBuilder(args).Build().Run();
1811
}
1912

20-
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
21-
WebHost.CreateDefaultBuilder(args)
22-
.UseStartup<Startup>();
13+
public static IHostBuilder CreateHostBuilder(string[] args) =>
14+
Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args).ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
2315
}
2416
}

‎src/Host/Startup.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using IdentityManager2.AspNetIdentity;
2-
using IdentityManager2.Configuration;
32
using Microsoft.AspNetCore.Builder;
4-
using Microsoft.AspNetCore.Hosting;
53
using Microsoft.AspNetCore.Identity;
64
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
75
using Microsoft.EntityFrameworkCore;
@@ -23,11 +21,18 @@ public void ConfigureServices(IServiceCollection services)
2321
.AddIdentityMangerService<AspNetCoreIdentityManagerService<IdentityUser, string, IdentityRole, string>>();
2422
}
2523

26-
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
24+
public void Configure(IApplicationBuilder app)
2725
{
2826
app.UseDeveloperExceptionPage();
2927

28+
app.UseRouting();
29+
30+
app.UseAuthentication();
31+
app.UseAuthorization();
32+
3033
app.UseIdentityManager();
34+
35+
app.UseEndpoints(x => x.MapDefaultControllerRoute());
3136
}
3237
}
3338
}

‎src/IdentityManager2.AspNetIdentity/AspNetCoreIdentityManagerService.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ internal AspNetCoreIdentityManagerService(UserManager<TUser> userManager, RoleMa
3232
var email = userManager.Options.Tokens.EmailConfirmationTokenProvider; // TODO: and for rest...
3333
if (!userManager.Options.Tokens.ProviderMap.ContainsKey(email)) { }
3434

35-
RoleClaimType = Constants.ClaimTypes.Role;
35+
RoleClaimType = IdentityManagerConstants.ClaimTypes.Role;
3636
}
3737

3838
public AspNetCoreIdentityManagerService(
@@ -65,13 +65,13 @@ public AspNetCoreIdentityManagerService(
6565

6666
public async Task<IdentityManagerResult<CreateResult>> CreateUserAsync(IEnumerable<PropertyValue> properties)
6767
{
68-
var usernameClaim = properties.Single(x => x.Type == Constants.ClaimTypes.Username);
69-
var passwordClaim = properties.Single(x => x.Type == Constants.ClaimTypes.Password);
68+
var usernameClaim = properties.Single(x => x.Type == IdentityManagerConstants.ClaimTypes.Username);
69+
var passwordClaim = properties.Single(x => x.Type == IdentityManagerConstants.ClaimTypes.Password);
7070

7171
var username = usernameClaim.Value;
7272
var password = passwordClaim.Value;
7373

74-
var exclude = new[] { Constants.ClaimTypes.Username, Constants.ClaimTypes.Password };
74+
var exclude = new[] { IdentityManagerConstants.ClaimTypes.Username, IdentityManagerConstants.ClaimTypes.Password };
7575
var otherProperties = properties.Where(x => !exclude.Contains(x.Type)).ToArray();
7676

7777
var metadata = await GetMetadataAsync();
@@ -237,10 +237,10 @@ public async Task<IdentityManagerResult<CreateResult>> CreateRoleAsync(IEnumerab
237237
{
238238
ValidateSupportsRoles();
239239

240-
var nameClaim = properties.Single(x => x.Type == Constants.ClaimTypes.Name);
240+
var nameClaim = properties.Single(x => x.Type == IdentityManagerConstants.ClaimTypes.Name);
241241
var name = nameClaim.Value;
242242

243-
var exclude = new[] { Constants.ClaimTypes.Name };
243+
var exclude = new[] { IdentityManagerConstants.ClaimTypes.Name };
244244
var otherProperties = properties.Where(x => !exclude.Contains(x.Type)).ToArray();
245245

246246
var metadata = await GetMetadataAsync();
@@ -377,15 +377,15 @@ public virtual Task<IdentityManagerMetadata> GetStandardMetadata(bool includeAcc
377377
var update = new List<PropertyMetadata>();
378378
if (UserManager.SupportsUserPassword)
379379
{
380-
update.Add(PropertyMetadata.FromFunctions<TUser, string>(Constants.ClaimTypes.Password, u => Task.FromResult<string>(null), SetPassword, "Password", PropertyDataType.Password, true));
380+
update.Add(PropertyMetadata.FromFunctions<TUser, string>(IdentityManagerConstants.ClaimTypes.Password, u => Task.FromResult<string>(null), SetPassword, "Password", PropertyDataType.Password, true));
381381
}
382382
if (UserManager.SupportsUserEmail)
383383
{
384-
update.Add(PropertyMetadata.FromFunctions<TUser, string>(Constants.ClaimTypes.Email, u => GetEmail(u), SetEmail, "Email", PropertyDataType.Email));
384+
update.Add(PropertyMetadata.FromFunctions<TUser, string>(IdentityManagerConstants.ClaimTypes.Email, u => GetEmail(u), SetEmail, "Email", PropertyDataType.Email));
385385
}
386386
if (UserManager.SupportsUserPhoneNumber)
387387
{
388-
update.Add(PropertyMetadata.FromFunctions<TUser, string>(Constants.ClaimTypes.Phone, u => GetPhone(u), SetPhone, "Phone", PropertyDataType.String));
388+
update.Add(PropertyMetadata.FromFunctions<TUser, string>(IdentityManagerConstants.ClaimTypes.Phone, u => GetPhone(u), SetPhone, "Phone", PropertyDataType.String));
389389
}
390390
if (UserManager.SupportsUserTwoFactor)
391391
{
@@ -403,8 +403,8 @@ public virtual Task<IdentityManagerMetadata> GetStandardMetadata(bool includeAcc
403403
}
404404

405405
var create = new List<PropertyMetadata>();
406-
create.Add(PropertyMetadata.FromProperty<TUser>(x => x.UserName, name: Constants.ClaimTypes.Username, required: true));
407-
create.Add(PropertyMetadata.FromFunctions<TUser, string>(Constants.ClaimTypes.Password, u => Task.FromResult<string>(null), SetPassword, "Password", PropertyDataType.Password, true));
406+
create.Add(PropertyMetadata.FromProperty<TUser>(x => x.UserName, name: IdentityManagerConstants.ClaimTypes.Username, required: true));
407+
create.Add(PropertyMetadata.FromFunctions<TUser, string>(IdentityManagerConstants.ClaimTypes.Password, u => Task.FromResult<string>(null), SetPassword, "Password", PropertyDataType.Password, true));
408408

409409
var user = new UserMetadata
410410
{
@@ -421,7 +421,7 @@ public virtual Task<IdentityManagerMetadata> GetStandardMetadata(bool includeAcc
421421
SupportsCreate = true,
422422
SupportsDelete = true,
423423
CreateProperties = new[] {
424-
PropertyMetadata.FromProperty<TRole>(x=>x.Name, name: Constants.ClaimTypes.Name, required: true),
424+
PropertyMetadata.FromProperty<TRole>(x=>x.Name, name: IdentityManagerConstants.ClaimTypes.Name, required: true),
425425
}
426426
};
427427

@@ -604,7 +604,7 @@ protected virtual async Task<string> DisplayNameFromUser(TUser user)
604604
if (UserManager.SupportsUserClaim)
605605
{
606606
var claims = await UserManager.GetClaimsAsync(user);
607-
var name = claims.Where(x => x.Type == Constants.ClaimTypes.Name).Select(x => x.Value).FirstOrDefault();
607+
var name = claims.Where(x => x.Type == IdentityManagerConstants.ClaimTypes.Name).Select(x => x.Value).FirstOrDefault();
608608
if (!string.IsNullOrWhiteSpace(name)) return name;
609609
}
610610

‎src/IdentityManager2.AspNetIdentity/IdentityManager2.AspNetIdentity.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<Description>IdentityManager is an user management tool for ASP.NET Core Identity. Maintained by Rock Solid Knowledge.</Description>
66
<VersionPrefix>1.0.0</VersionPrefix>
7-
<VersionSuffix>beta3</VersionSuffix>
87
<Authors>Scott Brady</Authors>
98
<AssemblyName>IdentityManager2.AspNetIdentity</AssemblyName>
109
<PackageId>IdentityManager2.AspNetIdentity</PackageId>
@@ -16,8 +15,8 @@
1615
</PropertyGroup>
1716

1817
<ItemGroup>
19-
<PackageReference Include="IdentityManager2" Version="1.0.0-beta5" />
20-
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.1.0" />
18+
<PackageReference Include="IdentityManager2" Version="1.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.1.0" />
2120
</ItemGroup>
2221

2322
</Project>

0 commit comments

Comments
 (0)