kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5010 from sbwalker/dev

Browse Source 
fix #4964 - use bearer token if it already exists
This commit is contained in:
Shaun Walker 2025-01-21 16:55:19 -05:00 committed by GitHub
commit 9db2a55a5a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Oqtane.Server/Components/App.razor
View File

@ -174,7 +174,7 @@
// get jwt token for downstream APIs // get jwt token for downstream APIs
if (Context.User.Identity.IsAuthenticated) if (Context.User.Identity.IsAuthenticated)
{ {
CreateJwtToken(alias); GetJwtToken(alias);
} }
// includes resources // includes resources
@ -441,13 +441,23 @@
} }
} }
private void CreateJwtToken(Alias alias) private void GetJwtToken(Alias alias)
{ {
var sitesettings = Context.GetSiteSettings(); _authorizationToken = Context.Request.Headers[HeaderNames.Authorization];
var secret = sitesettings.GetValue("JwtOptions:Secret", ""); if (!string.IsNullOrEmpty(_authorizationToken))
if (!string.IsNullOrEmpty(secret))
{ {
_authorizationToken = JwtManager.GenerateToken(alias, (ClaimsIdentity)Context.User.Identity, secret, sitesettings.GetValue("JwtOptions:Issuer", ""), sitesettings.GetValue("JwtOptions:Audience", ""), int.Parse(sitesettings.GetValue("JwtOptions:Lifetime", "20"))); // bearer token was provided by remote Identity Provider and was persisted using SaveTokens
_authorizationToken = _authorizationToken.Replace("Bearer ", "");
}
else
{
// generate bearer token if a secret has been configured in User Settings
var sitesettings = Context.GetSiteSettings();
var secret = sitesettings.GetValue("JwtOptions:Secret", "");
if (!string.IsNullOrEmpty(secret))
{
_authorizationToken = JwtManager.GenerateToken(alias, (ClaimsIdentity)Context.User.Identity, secret, sitesettings.GetValue("JwtOptions:Issuer", ""), sitesettings.GetValue("JwtOptions:Audience", ""), int.Parse(sitesettings.GetValue("JwtOptions:Lifetime", "20")));
}
} }
} }