-
-
Notifications
You must be signed in to change notification settings - Fork 52
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add delete user identity server endpoint and delete profile and forms api endpoint #442
Open
irinel-nistor
wants to merge
9
commits into
code4romania:develop
Choose a base branch
from
irinel-nistor:DeleteUserEndpoint
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9d05f73
Add delete user identity server endpoint and delete profile and forms…
irinel-nistor c93d342
Add adminApi policy to the delete endpoint
irinel-nistor c33d942
Merge branch 'develop' into DeleteUserEndpoint
irinel-nistor 3f4238a
Delete only the IDP user
irinel-nistor 9173bb3
Revert user service changes
irinel-nistor 99c5588
revert config
irinel-nistor ad218d9
Merge branch 'develop' into DeleteUserEndpoint
RaduCStefanescu 7b49d6a
Merge branch 'develop' into DeleteUserEndpoint
RaduCStefanescu 542605c
Merge branch 'develop' into DeleteUserEndpoint
RaduCStefanescu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
backend/src/StamAcasa.Api/Controllers/ProfileAdminController.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
using System.Linq; | ||
using System.Threading.Tasks; | ||
using Microsoft.AspNetCore.Authorization; | ||
using Microsoft.AspNetCore.Mvc; | ||
using StamAcasa.Common.Services; | ||
|
||
namespace StamAcasa.Api.Controllers | ||
{ | ||
[Route("api/profile")] | ||
[Authorize(AuthenticationSchemes = "adminApi")] | ||
[ApiExplorerSettings(IgnoreApi = true)] | ||
[ApiController] | ||
public class ProfileAdminController : ControllerBase | ||
{ | ||
private readonly IUserService _userService; | ||
|
||
public ProfileAdminController(IUserService userService) | ||
{ | ||
_userService = userService; | ||
} | ||
|
||
/// <summary> | ||
/// Delete user profile and related data. | ||
/// </summary> | ||
/// <returns></returns> | ||
[HttpDelete] | ||
public async Task<IActionResult> DeleteProfile() | ||
{ | ||
var sub = User.Claims.FirstOrDefault(c => c.Type == "sub")?.Value; | ||
if (sub == null) | ||
return new UnauthorizedResult(); | ||
|
||
await _userService.DeleteUserAndDependentData(sub); | ||
|
||
return Ok(); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
backend/src/StamAcasa.IdentityServer/Quickstart/Account/DeleteAccountController.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
using System; | ||
using System.Linq; | ||
using System.Net.Http; | ||
using System.Threading.Tasks; | ||
using IdentityServer.Data; | ||
using IdentityServer4; | ||
using IdentityServer4.Models; | ||
using IdentityServer4.Services; | ||
using IdentityServer4.Validation; | ||
using Microsoft.AspNetCore.Authorization; | ||
using Microsoft.AspNetCore.Http; | ||
using Microsoft.AspNetCore.Identity; | ||
using Microsoft.AspNetCore.Mvc; | ||
using Microsoft.Extensions.Configuration; | ||
|
||
namespace StamAcasa.IdentityServer.Quickstart.Account | ||
{ | ||
[Route("api/[controller]")] | ||
[ApiController] | ||
[AllowAnonymous] | ||
public class DeleteAccountController : ControllerBase | ||
{ | ||
private readonly UserManager<ApplicationUser> _userManager; | ||
private readonly DefaultTokenService _tokenService; | ||
private readonly IStamAcasaIdentityConfiguration _identityConfiguration; | ||
private readonly IHttpClientFactory _clientFactory; | ||
private readonly string _apiUrl; | ||
private const string IdsrvClientId = "idsrvClient"; | ||
|
||
public DeleteAccountController(UserManager<ApplicationUser> userManager, DefaultTokenService tokenService, IStamAcasaIdentityConfiguration identityConfiguration, IHttpClientFactory clientFactory, IConfiguration configuration) | ||
{ | ||
_userManager = userManager; | ||
_tokenService = tokenService; | ||
_identityConfiguration = identityConfiguration; | ||
_clientFactory = clientFactory; | ||
_apiUrl = configuration["StamAcasaApi"]; | ||
} | ||
|
||
[HttpPost] | ||
public async Task<IActionResult> DeleteAccountAsync([FromBody] DeleteAccountModel model) | ||
{ | ||
var user = await _userManager.FindByNameAsync(model.Username); | ||
if (user == null || !await _userManager.CheckPasswordAsync(user, model.Password)) | ||
{ | ||
return new UnauthorizedResult(); | ||
} | ||
|
||
string tokenValue = await CreateAccessToken(user); | ||
var deleteResponse = await DeleteApiUserDataAsync(tokenValue); | ||
if (!deleteResponse.IsSuccessStatusCode) | ||
{ | ||
return StatusCode(StatusCodes.Status500InternalServerError, new { message = "Unexpected error occurred deleting user data" }); | ||
} | ||
|
||
var response = await _userManager.DeleteAsync(user); | ||
if (!response.Succeeded) | ||
{ | ||
return StatusCode(StatusCodes.Status500InternalServerError, $"Unexpected error occurred deleting user with ID '{user.Id}'."); | ||
} | ||
|
||
return Ok(); | ||
} | ||
|
||
private async Task<HttpResponseMessage> DeleteApiUserDataAsync(string tokenValue) | ||
{ | ||
var client = _clientFactory.CreateClient(); | ||
|
||
var request = new HttpRequestMessage(HttpMethod.Delete, | ||
$"{_apiUrl}/api/Profile"); | ||
request.Headers.Add("Authorization", $"Bearer {tokenValue}"); | ||
|
||
return await client.SendAsync(request); | ||
} | ||
|
||
private async Task<string> CreateAccessToken(ApplicationUser user) | ||
{ | ||
var IdentityUser = new IdentityServerUser(user.Id) | ||
{ | ||
IdentityProvider = IdentityServerConstants.LocalIdentityProvider, | ||
AuthenticationTime = DateTime.UtcNow, | ||
}; | ||
|
||
var request = new TokenCreationRequest | ||
{ | ||
Subject = IdentityUser.CreatePrincipal(), | ||
IncludeAllIdentityClaims = true, | ||
Resources = new Resources(_identityConfiguration.Ids, _identityConfiguration.Apis()) | ||
}; | ||
|
||
request.ValidatedRequest = new ValidatedRequest | ||
{ | ||
Subject = request.Subject | ||
}; | ||
request.ValidatedRequest.SetClient(_identityConfiguration.Clients.FirstOrDefault(c => c.ClientId == IdsrvClientId)); | ||
|
||
var accesToken = await _tokenService.CreateAccessTokenAsync(request); | ||
var token = await _tokenService.CreateSecurityTokenAsync(accesToken); | ||
return token; | ||
} | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
backend/src/StamAcasa.IdentityServer/Quickstart/Account/DeleteAccountModel.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using System.Threading.Tasks; | ||
|
||
namespace StamAcasa.IdentityServer.Quickstart.Account | ||
{ | ||
public class DeleteAccountModel | ||
{ | ||
public string Username { get; set; } | ||
|
||
public string Password { get; set; } | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should not provide info to anyone if a user with specified username exists or not
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes I agree with this one.
Can you please make the change @irinel-nistor ?