Merge branch 'abp' into ai-hub
This commit is contained in:
@@ -290,12 +290,20 @@ namespace Yi.Abp.Web
|
|||||||
{
|
{
|
||||||
OnMessageReceived = messageContext =>
|
OnMessageReceived = messageContext =>
|
||||||
{
|
{
|
||||||
//优先Query中获取
|
//优先Query中获取,再去cookies中获取
|
||||||
var accessToken = messageContext.Request.Query["access_token"];
|
var accessToken = messageContext.Request.Query["access_token"];
|
||||||
if (!string.IsNullOrEmpty(accessToken))
|
if (!string.IsNullOrEmpty(accessToken))
|
||||||
{
|
{
|
||||||
messageContext.Token = accessToken;
|
messageContext.Token = accessToken;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (messageContext.Request.Cookies.TryGetValue("Token", out var cookiesToken))
|
||||||
|
{
|
||||||
|
messageContext.Token = cookiesToken;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -315,11 +323,19 @@ namespace Yi.Abp.Web
|
|||||||
{
|
{
|
||||||
OnMessageReceived = messageContext =>
|
OnMessageReceived = messageContext =>
|
||||||
{
|
{
|
||||||
var refreshToken = messageContext.Request.Query["refresh_token"];
|
var headerRefreshToken = messageContext.Request.Headers["refresh_token"];
|
||||||
if (!string.IsNullOrEmpty(refreshToken))
|
if (!string.IsNullOrEmpty(headerRefreshToken))
|
||||||
{
|
{
|
||||||
messageContext.Token = refreshToken;
|
messageContext.Token = headerRefreshToken;
|
||||||
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var queryRefreshToken = messageContext.Request.Query["refresh_token"];
|
||||||
|
if (!string.IsNullOrEmpty(queryRefreshToken))
|
||||||
|
{
|
||||||
|
messageContext.Token = queryRefreshToken;
|
||||||
|
}
|
||||||
|
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user