phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

#74: Added functionality to retrieve user id from the token

Browse Source
This commit is contained in:
kdeng00
2024-06-17 20:26:55 -04:00
parent d982e44576
commit 3b4799546d
1 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/Managers/TokenManager.cs
+38 -18
View File
@@ -77,11 +77,13 @@ public class TokenManager : BaseManager
public LoginResult LoginSymmetric(User user) public LoginResult LoginSymmetric(User user)
{ {
var tokenResult = new TokenTierOne(); var tokenResult = new TokenTierOne
tokenResult.TokenType = "Jwt"; {
TokenType = "JWT"
};
var payload = Payload(); var payload = Payload();
payload.Add(new System.Security.Claims.Claim("user_id", user.UserID.ToString(), ClaimValueTypes.Integer)); payload.Add(new Claim("user_id", user.UserID.ToString(), ClaimValueTypes.Integer));
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
var key = Encoding.ASCII.GetBytes(_config["JWT:Secret"]); var key = Encoding.ASCII.GetBytes(_config["JWT:Secret"]);
@@ -98,10 +100,8 @@ public class TokenManager : BaseManager
Audience = _config["Jwt:Audience"] Audience = _config["Jwt:Audience"]
}; };
var token = tokenHandler.CreateToken(tokenDescriptor); // var token =
tokenResult.AccessToken = tokenHandler.WriteToken(tokenHandler.CreateToken(tokenDescriptor));
tokenResult.AccessToken = tokenHandler.WriteToken(token);
var expClaim = payload.FirstOrDefault(cl => var expClaim = payload.FirstOrDefault(cl =>
{ {
@@ -112,6 +112,8 @@ public class TokenManager : BaseManager
var exp = Math.Floor((expiredDate - DateTime.UnixEpoch).TotalSeconds); var exp = Math.Floor((expiredDate - DateTime.UnixEpoch).TotalSeconds);
tokenResult.Expiration = Convert.ToInt32(exp); tokenResult.Expiration = Convert.ToInt32(exp);
var userId = this.RetrieveUserIdFromToken(tokenResult.AccessToken);
return new LoginResult return new LoginResult
{ {
UserID = user.UserID, Username = user.Username, Token = tokenResult.AccessToken, UserID = user.UserID, Username = user.Username, Token = tokenResult.AccessToken,
@@ -120,6 +122,23 @@ public class TokenManager : BaseManager
}; };
} }
public int RetrieveUserIdFromToken(string token)
{
var tokenHandler = new JwtSecurityTokenHandler();
var readTok = tokenHandler.ReadJwtToken(token);
var userId = -1;
foreach (var item in readTok.Payload)
{
if (item.Key == "user_id")
{
userId = Convert.ToInt32(item.Value);
}
}
return userId;
}
private string AllScopes() private string AllScopes()
{ {
@@ -157,30 +176,30 @@ public class TokenManager : BaseManager
private List<Claim> Payload() private List<Claim> Payload()
{ {
// TODO: Remove this hard coding
var expLimit = 30; var expLimit = 30;
var currentDate = DateTime.Now; var currentDate = DateTime.Now;
var expiredDate = currentDate.AddMinutes(expLimit); var expiredDate = currentDate.AddMinutes(expLimit);
var issued = Math.Floor((currentDate - DateTime.UnixEpoch).TotalSeconds); // var issuer = "https://soaricarus.auth0.com";
var expires = Math.Floor((expiredDate - DateTime.UnixEpoch).TotalSeconds); var issuer = "http://localhost:5002";
var issuer = "https://soaricarus.auth0.com"; // var audience = "https://icarus/api";
issuer = "http://localhost:5002"; var audience = "http://localhost:5002";
var audience = "https://icarus/api";
audience = "http://localhost:5002";
var subject = _config["JWT:Subject"]; var subject = _config["JWT:Subject"];
var claim = new List<System.Security.Claims.Claim>() var claim = new List<System.Security.Claims.Claim>()
{ {
new System.Security.Claims.Claim("scope", AllScopes(), "string"), new Claim("scope", AllScopes(), "string"),
new System.Security.Claims.Claim(JwtRegisteredClaimNames.Exp, expiredDate.ToString()), new Claim(JwtRegisteredClaimNames.Exp, expiredDate.ToString()),
new System.Security.Claims.Claim(JwtRegisteredClaimNames.Aud, audience), new Claim(JwtRegisteredClaimNames.Aud, audience),
new System.Security.Claims.Claim(JwtRegisteredClaimNames.Iss, issuer), new Claim(JwtRegisteredClaimNames.Iss, issuer),
new Claim(JwtRegisteredClaimNames.Sub, subject), new Claim(JwtRegisteredClaimNames.Sub, subject),
new System.Security.Claims.Claim(JwtRegisteredClaimNames.Iat, currentDate.ToString()) new Claim(JwtRegisteredClaimNames.Iat, currentDate.ToString())
}; };
return claim; return claim;
} }
[Obsolete("Deprecated function")]
private async Task<string> ReadKeyContent(string filepath) private async Task<string> ReadKeyContent(string filepath)
{ {
return await System.IO.File.ReadAllTextAsync(filepath); return await System.IO.File.ReadAllTextAsync(filepath);
@@ -234,6 +253,7 @@ public class TokenManager : BaseManager
[JsonProperty("grant_type")] [JsonProperty("grant_type")]
public string GrantType { get; set; } public string GrantType { get; set; }
} }
private class TokenTierOne private class TokenTierOne
{ {
[JsonProperty("access_token")] [JsonProperty("access_token")]