Revert "fix: 仅从 Query 获取 access_token/refresh_token,简化 OnMessageReceived 逻辑"

This reverts commit 0d2f2cb826.
This commit is contained in:
ccnetcore
2025-12-11 23:31:29 +08:00
parent 0d2f2cb826
commit 8b191330b8

View File

@@ -280,14 +280,22 @@ namespace Yi.Abp.Web
};
options.Events = new JwtBearerEvents
{
OnMessageReceived = messageContext =>
OnMessageReceived = context =>
{
//优先Query中获取
var accessToken = messageContext.Request.Query["access_token"];
//优先Query中获取再去cookies中获取
var accessToken = context.Request.Query["access_token"];
if (!string.IsNullOrEmpty(accessToken))
{
messageContext.Token = accessToken;
context.Token = accessToken;
}
else
{
if (context.Request.Cookies.TryGetValue("Token", out var cookiesToken))
{
context.Token = cookiesToken;
}
}
return Task.CompletedTask;
}
};
@@ -305,13 +313,21 @@ namespace Yi.Abp.Web
};
options.Events = new JwtBearerEvents
{
OnMessageReceived = messageContext =>
OnMessageReceived = context =>
{
var refreshToken = messageContext.Request.Query["refresh_token"];
var refresh_token = context.Request.Headers["refresh_token"];
if (!string.IsNullOrEmpty(refresh_token))
{
context.Token = refresh_token;
return Task.CompletedTask;
}
var refreshToken = context.Request.Query["refresh_token"];
if (!string.IsNullOrEmpty(refreshToken))
{
messageContext.Token = refreshToken;
context.Token = refreshToken;
}
return Task.CompletedTask;
}
};