Skip to content

Commit 915a439

Browse files
skorubaskoruba
authored
Merge pull request #161 from skoruba/feature/sts-profile-management
Add profile management to STS, change int to default guid for Identity
2 parents e2bf905 + b5e2e08 commit 915a439

File tree

162 files changed

+7441
-1056
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+7441
-1056
lines changed

‎README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Migrations are not a part of the repository - they are ignored in `.gitignore`.
164164

165165
- STS:
166166

167-
- `Skoruba.IdentityServer4.STS.Identity` - [Quickstart UI for the IdentityServer4 with Asp.Net Core Identity and EF Core storage](https://github.com/IdentityServer/IdentityServer4.Samples/tree/master/Quickstarts/Combined_AspId_and_EFStorage)
167+
- `Skoruba.IdentityServer4.STS.Identity` - project that contains the instance of IdentityServer4 and combine these samples - [Quickstart UI for the IdentityServer4 with Asp.Net Core Identity and EF Core storage](https://github.com/IdentityServer/IdentityServer4.Samples/tree/master/Quickstarts/Combined_AspId_and_EFStorage) and [damienbod - IdentityServer4 and Identity template](https://github.com/damienbod/IdentityServer4AspNetCoreIdentityTemplate)
168168

169169
- Admin UI:
170170

@@ -225,12 +225,14 @@ It is possible to define the configuration according the client type - by defaul
225225
- Api Scopes
226226
- Api Scope Claims
227227
- Api Secrets
228+
- Api Properties
228229

229230
**Identity Resources**
230231

231232
- Actions: Add, Update, Remove
232233
- Entities:
233234
- Identity Claims
235+
- Identity Properties
234236

235237
## Asp.Net Core Identity
236238

@@ -266,15 +268,17 @@ It is possible to define the configuration according the client type - by defaul
266268
- [x] English
267269
- [x] Chinese
268270
- [x] Russian
271+
- [x] Manage profile
272+
- [x] Password reset
273+
- [x] Account linking
274+
- [x] Two-Factor Authentication (2FA)
275+
- [ ] User registration
269276

270277
### 1.1.0:
271278

272279
- [ ] Add audit logs to track changes ([#61](https://github.com/skoruba/IdentityServer4.Admin/issues/61))
273280
- [ ] Create a project template using dotnet CLI - `dotnet new template`
274281
- [ ] Second template: The administration of the IdentityServer4 (without Asp.Net Core Identity) ([#79](https://github.com/skoruba/IdentityServer4.Admin/issues/79))
275-
- [ ] User registration / Password reset
276-
- [ ] Account linking
277-
- [ ] Manage profile
278282

279283
### 2.0.0:
280284

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.DbContexts/AdminDbContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Skoruba.IdentityServer4.Admin.EntityFramework.DbContexts
1515
{
16-
public class AdminDbContext : IdentityDbContext<UserIdentity, UserIdentityRole, int, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken>,
16+
public class AdminDbContext : IdentityDbContext<UserIdentity, UserIdentityRole, string, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken>,
1717
IAdminConfigurationDbContext, IAdminLogDbContext, IAdminPersistedGrantDbContext, IAdminPersistedGrantIdentityDbContext
1818
{
1919
private readonly ConfigurationStoreOptions _storeOptions;

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Entities/Identity/UserIdentity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Entities.Identity
44
{
5-
public class UserIdentity : IdentityUser<int>
5+
public class UserIdentity : IdentityUser
66
{
77

88
}

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Entities/Identity/UserIdentityClaim.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Entities.Identity
44
{
5-
public class UserIdentityUserClaim : IdentityUserClaim<int>
5+
public class UserIdentityUserClaim : IdentityUserClaim<string>
66
{
77
}
88
}

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Entities/Identity/UserIdentityRole.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Entities.Identity
44
{
5-
public class UserIdentityRole : IdentityRole<int>
5+
public class UserIdentityRole : IdentityRole
66
{
77

88
}

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Entities/Identity/UserIdentityRoleClaim.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Entities.Identity
44
{
5-
public class UserIdentityRoleClaim : IdentityRoleClaim<int>
5+
public class UserIdentityRoleClaim : IdentityRoleClaim<string>
66
{
77

88
}

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Entities/Identity/UserIdentityUserLogin.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Entities.Identity
44
{
5-
public class UserIdentityUserLogin : IdentityUserLogin<int>
5+
public class UserIdentityUserLogin : IdentityUserLogin<string>
66
{
77

88
}

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Entities/Identity/UserIdentityUserRole.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Entities.Identity
44
{
5-
public class UserIdentityUserRole : IdentityUserRole<int>
5+
public class UserIdentityUserRole : IdentityUserRole<string>
66
{
77

88
}

‎src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Entities/Identity/UserIdentityUserToken.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Entities.Identity
44
{
5-
public class UserIdentityUserToken : IdentityUserToken<int>
5+
public class UserIdentityUserToken : IdentityUserToken<string>
66
{
77

88
}

‎src/Skoruba.IdentityServer4.Admin/Controllers/GrantController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ namespace Skoruba.IdentityServer4.Admin.Controllers
1717
[TypeFilter(typeof(ControllerExceptionFilterAttribute))]
1818
public class GrantController : BaseController
1919
{
20-
private readonly IPersistedGrantAspNetIdentityService<AdminDbContext, UserIdentity, UserIdentityRole, int, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken> _persistedGrantService;
20+
private readonly IPersistedGrantAspNetIdentityService<AdminDbContext, UserIdentity, UserIdentityRole, string, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken> _persistedGrantService;
2121
private readonly IStringLocalizer<GrantController> _localizer;
2222

23-
public GrantController(IPersistedGrantAspNetIdentityService<AdminDbContext, UserIdentity, UserIdentityRole, int, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken> persistedGrantService,
23+
public GrantController(IPersistedGrantAspNetIdentityService<AdminDbContext, UserIdentity, UserIdentityRole, string, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken> persistedGrantService,
2424
ILogger<ConfigurationController> logger,
2525
IStringLocalizer<GrantController> localizer) : base(logger)
2626
{

‎src/Skoruba.IdentityServer4.Admin/Controllers/IdentityController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ namespace Skoruba.IdentityServer4.Admin.Controllers
1414
{
1515
[Authorize(Policy = AuthorizationConsts.AdministrationPolicy)]
1616
[TypeFilter(typeof(ControllerExceptionFilterAttribute))]
17-
public class IdentityController : BaseIdentityController<AdminDbContext, UserDto<int>, int, RoleDto<int>, int, int, int, UserIdentity, UserIdentityRole, int, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken>
17+
public class IdentityController : BaseIdentityController<AdminDbContext, UserDto<string>, string, RoleDto<string>, string, string, string, UserIdentity, UserIdentityRole, string, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken>
1818
{
19-
public IdentityController(IIdentityService<AdminDbContext, UserDto<int>, int, RoleDto<int>, int, int, int, UserIdentity, UserIdentityRole, int, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken> identityService, ILogger<ConfigurationController> logger, IStringLocalizer<IdentityController> localizer)
19+
public IdentityController(IIdentityService<AdminDbContext, UserDto<string>, string, RoleDto<string>, string, string, string, UserIdentity, UserIdentityRole, string, UserIdentityUserClaim, UserIdentityUserRole, UserIdentityUserLogin, UserIdentityRoleClaim, UserIdentityUserToken> identityService, ILogger<ConfigurationController> logger, IStringLocalizer<IdentityController> localizer)
2020
: base(identityService, logger, localizer)
2121
{
2222
}

0 commit comments

Comments
 (0)