Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Changes to authentication endpoint #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changes to authentication endpoint #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f4f9f9
Changes to authentication endpoint
Nicholas-Mc Jun 7, 2022
863b295
extend adduser endpoint in administrationcontroller
Nicholas-Mc Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 58 additions & 17 deletions src/MDD4All.SpecIF.Microservice/Controllers/AdministrationController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace MDD4All.SpecIF.Microservice.Controllers
[Produces("application/json")]
[Route("specif/v{version:apiVersion}")]
[ApiController]
[ApiExplorerSettings(IgnoreApi = true)]
// [ApiExplorerSettings(IgnoreApi = true)]
public class AdministrationController : Controller
{
private readonly IUserStore<ApplicationUser> _userStore;
Expand All @@ -41,38 +41,61 @@ public class AdministrationController : Controller
/// <param name="roleStore"></param>
/// <param name="jwtConfigurationReader"></param>
public AdministrationController(IUserStore<ApplicationUser> userStore,
IUserRoleStore<ApplicationUser> roleStore,
IJwtConfigurationReader jwtConfigurationReader)
IUserRoleStore<ApplicationUser> roleStore
/* IJwtConfigurationReader jwtConfigurationReader*/)
{
_userStore = userStore;
_roleStore = roleStore;
_jwtConfigurationReader = jwtConfigurationReader;
// _jwtConfigurationReader = jwtConfigurationReader;
}

///// <summary>
///// Returns a Jwt token to access some SpecIF API endpoints.
///// </summary>
///// <param name="loginData">The user login data.</param>
///// <returns></returns>
//[AllowAnonymous]
//[HttpPost("oauth/token")]
//[ProducesResponseType(typeof(JwtAccessToken), 200)]
//public async Task<ActionResult> GetJwtToken([FromBody]LoginData loginData)
//{
// ActionResult result = new UnauthorizedResult();

// ApplicationUser checkUser = await CheckUser(loginData);

// if (checkUser != null)
// {
// object tokenObject = await GenerateToken(checkUser);

// result = new OkObjectResult(tokenObject);
// }

// return result;
//}

/// <summary>
/// Returns a Jwt token to access some SpecIF API endpoints.
/// Returns an API-KEY to access some SpecIF API endpoints.
/// </summary>
/// <param name="loginData">The user login data.</param>
/// <returns></returns>
[AllowAnonymous]
[HttpPost("oauth/token")]
[ProducesResponseType(typeof(JwtAccessToken), 200)]
public async Task<ActionResult> GetJwtToken([FromBody]LoginData loginData)
{
[HttpPost("auth/apikey")]
[ProducesResponseType(typeof(string), 200)]
public async Task<ActionResult> GetOwnApiKey([FromBody] LoginData loginData)
{
ActionResult result = new UnauthorizedResult();

ApplicationUser checkUser = await CheckUser(loginData);

if (checkUser != null)
{
object tokenObject = await GenerateToken(checkUser);
object tokenObject = await GetApiKey(checkUser);

result = new OkObjectResult(tokenObject);
}

return result;
}

/// <summary>
/// Returns the list of registered users.
/// </summary>
Expand All @@ -92,7 +115,6 @@ public async Task<ActionResult<List<ApplicationUser>>> GetUsers()
result = new OkObjectResult(users);
}


return result;
}

Expand All @@ -104,7 +126,7 @@ public async Task<ActionResult<List<ApplicationUser>>> GetUsers()
[Authorize(Roles = "Administrator")]
[HttpPost("users")]
[ProducesResponseType(200)]
public async Task<ActionResult> AddUser([FromBody] LoginData user)
public async Task<ActionResult> AddUser([FromBody] LoginData user, [FromQuery] List<string>? userRoles)
{
ActionResult result = BadRequest();

Expand All @@ -119,16 +141,24 @@ public async Task<ActionResult> AddUser([FromBody] LoginData user)
NormalizedUserName = lookupNormalizer.NormalizeName(user.UserName),
Roles = new List<string>()
};
if (userRoles != null)
{
foreach (string role in userRoles)
{
if (!String.IsNullOrEmpty(role))
{
applicationUser.Roles.Add(role);
}
}
}

applicationUser.PasswordHash = passwordHasher.HashPassword(applicationUser, user.Password);

if(await _userStore.FindByNameAsync(applicationUser.NormalizedUserName, CancellationToken.None) == null)
{
await _userStore.CreateAsync(applicationUser, CancellationToken.None);
result = new OkResult();
}


}
}

return result;
Expand Down Expand Up @@ -297,7 +327,18 @@ private async Task<ApplicationUser> CheckUser(LoginData loginData)

return result;
}
private async Task<string> GetApiKey(ApplicationUser user)
{
string result = "";

if (user != null)
{
result = "X-API-KEY " + user.ApiKey.ToString();
}

return result;

}
private async Task<JwtAccessToken> GenerateToken(ApplicationUser user, int expireMinutes = 480)
{

Expand Down
8 changes: 4 additions & 4 deletions src/MDD4All.SpecIF.Microservice/MDD4All.SpecIF.Microservice.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/MDD4All.SpecIF.Microservice/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"commandName": "Project",
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"metadataReadAuthRequired": "true"
}
},
"Docker": {
Expand Down