refactor helpers usage into extensions usage; /me endpoint
This commit is contained in:
parent
c84da9336a
commit
3d9ef0de95
89
Auth.cs
89
Auth.cs
@ -30,83 +30,108 @@ public static class Auth
|
|||||||
internal static void Handle(IApplicationBuilder App)
|
internal static void Handle(IApplicationBuilder App)
|
||||||
{
|
{
|
||||||
App
|
App
|
||||||
.Map("/logout", logout =>{
|
.Map("/logout", logout =>
|
||||||
logout.Run(async runner=>{
|
{
|
||||||
if(!HttpMethods.IsGet(runner.Request.Method) || runner.Request.HasJsonContentType() || runner.Request.HasFormContentType)
|
logout.Run(async runner =>
|
||||||
|
{
|
||||||
|
if (!HttpMethods.IsGet(runner.Request.Method) || runner.Request.HasJsonContentType() || runner.Request.HasFormContentType)
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status400BadRequest,"Improper request to log out.");
|
await runner.WriteJsonResponse(StatusCodes.Status400BadRequest, "Improper request to log out.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
runner.Response.Cookies.Append("session", "", Delete);
|
runner.Response.Cookies.Append("session", "", Delete);
|
||||||
if(runner.Items.ContainsKey("AuthorizedUser"))
|
if (runner.Items.ContainsKey("AuthorizedUser"))
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status200OK,"Log out successful. Authorisation token deleted.");
|
await runner.WriteJsonResponse(StatusCodes.Status200OK, "Log out successful. Authorisation token deleted.");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status200OK,"No user to log out. Authorisation token does not exists.");
|
await runner.WriteJsonResponse(StatusCodes.Status200OK, "No user to log out. Authorisation token does not exists.");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.Map("/login", login =>{
|
.Map("/login", login =>
|
||||||
login.Run(async runner=>{
|
{
|
||||||
if(runner.Items.ContainsKey("AuthorizedUser"))
|
login.Run(async runner =>
|
||||||
|
{
|
||||||
|
if (runner.Items.ContainsKey("AuthorizedUser"))
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status409Conflict,"Log in not allowed when an authorized user is already logged in.");
|
await runner.WriteJsonResponse(StatusCodes.Status409Conflict, "Log in not allowed when an authorized user is already logged in.");
|
||||||
}
|
}
|
||||||
else if(runner.Request.ContentType != "application/json")
|
else if (runner.Request.ContentType != "application/json")
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status400BadRequest,"Request Content-Type mismatch.");
|
await runner.WriteJsonResponse(StatusCodes.Status400BadRequest, "Request Content-Type mismatch.");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LoginUser LoginInfo = (await runner.Request.ReadFromJsonAsync(SGContext.Default.LoginUser))!;
|
LoginUser LoginInfo = (await runner.Request.ReadFromJsonAsync(SGContext.Default.LoginUser))!;
|
||||||
if(LoginInfo.Username is null || LoginInfo.Password is null)
|
if (LoginInfo.Username is null || LoginInfo.Password is null)
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status401Unauthorized,"No valid user information provided.");
|
await runner.WriteJsonResponse(StatusCodes.Status401Unauthorized, "No valid user information provided.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
string SHA256Pass = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(LoginInfo.Password)));
|
string SHA256Pass = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(LoginInfo.Password)));
|
||||||
if (UserAccounts.TryGetValue(LoginInfo.Username, out User? FoundUser) && FoundUser.Password.Equals(SHA256Pass,StringComparison.InvariantCultureIgnoreCase) && FoundUser.Active)
|
if (UserAccounts.TryGetValue(LoginInfo.Username, out User? FoundUser) && FoundUser.Password.Equals(SHA256Pass, StringComparison.InvariantCultureIgnoreCase) && FoundUser.Active)
|
||||||
{
|
{
|
||||||
SafeUser LoggedIn = SafeUser.FromUser(FoundUser);
|
SafeUser LoggedIn = SafeUser.FromUser(FoundUser);
|
||||||
string LoggedInBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonSerializer.Serialize(LoggedIn,SGContext.Default.SafeUser)));
|
string LoggedInBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonSerializer.Serialize(LoggedIn, SGContext.Default.SafeUser)));
|
||||||
string Signature = Convert.ToBase64String(SHA256.HashData(Encoding.UTF8.GetBytes(LoggedInBase64+SecretKey)));
|
string Signature = Convert.ToBase64String(SHA256.HashData(Encoding.UTF8.GetBytes(LoggedInBase64 + SecretKey)));
|
||||||
runner.Response.Cookies.Append("session", $"{LoggedInBase64}.{Signature}", HttpOnly);
|
runner.Response.Cookies.Append("session", $"{LoggedInBase64}.{Signature}", HttpOnly);
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status200OK,"User authorised. Authorisation token created.",LoggedIn);
|
await runner.WriteJsonResponse(StatusCodes.Status200OK, "User authorised. Authorisation token created.", LoggedIn);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status401Unauthorized,"Provided user information cannot be authorized");
|
await runner.WriteJsonResponse(StatusCodes.Status401Unauthorized, "Provided user information cannot be authorized");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.Map("/gate", auth =>{
|
.Map("/gate", auth =>
|
||||||
auth.Run(async runner=>{
|
{
|
||||||
if(runner.Request.ContentType != "application/json")
|
auth.Run(async runner =>
|
||||||
|
{
|
||||||
|
if (runner.Request.ContentType != "application/json")
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status400BadRequest,"Request Content-Type mismatch.");
|
await runner.WriteJsonResponse(StatusCodes.Status400BadRequest, "Request Content-Type mismatch.");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LoginUser LoginInfo = (await runner.Request.ReadFromJsonAsync(SGContext.Default.LoginUser))!;
|
LoginUser LoginInfo = (await runner.Request.ReadFromJsonAsync(SGContext.Default.LoginUser))!;
|
||||||
if(LoginInfo.Username is null || LoginInfo.Password is null)
|
if (LoginInfo.Username is null || LoginInfo.Password is null)
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status401Unauthorized,"No valid user information provided.");
|
await runner.WriteJsonResponse(StatusCodes.Status401Unauthorized, "No valid user information provided.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
string SHA256Pass = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(LoginInfo.Password)));
|
string SHA256Pass = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(LoginInfo.Password)));
|
||||||
if (UserAccounts.TryGetValue(LoginInfo.Username, out User? FoundUser) && FoundUser.Password.Equals(SHA256Pass,StringComparison.InvariantCultureIgnoreCase) && FoundUser.Active)
|
if (UserAccounts.TryGetValue(LoginInfo.Username, out User? FoundUser) && FoundUser.Password.Equals(SHA256Pass, StringComparison.InvariantCultureIgnoreCase) && FoundUser.Active)
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status200OK,"User authorised. Operation may continue.",SafeUser.FromUser(FoundUser));
|
await runner.WriteJsonResponse(StatusCodes.Status200OK, "User authorised. Operation may continue.", SafeUser.FromUser(FoundUser));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
await WriteJsonResponse(runner,StatusCodes.Status401Unauthorized,"Provided user information cannot be authorized");
|
await runner.WriteJsonResponse(StatusCodes.Status401Unauthorized, "Provided user information cannot be authorized");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
})
|
||||||
|
.Map("/me", me =>
|
||||||
|
{
|
||||||
|
me.Run(async runner =>
|
||||||
|
{
|
||||||
|
if (TryGetUser(runner, out SafeUser user))
|
||||||
|
{
|
||||||
|
await runner.WriteJsonResponse(StatusCodes.Status200OK, "Success.", user);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await runner.WriteJsonResponse(StatusCodes.Status401Unauthorized, "No user session token is included with the request.");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.Run(async runner=>
|
||||||
|
{
|
||||||
|
await runner.WriteJsonResponse(StatusCodes.Status404NotFound);
|
||||||
|
})
|
||||||
|
;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user