|
|
@@ -239,6 +239,9 @@ namespace TEAMModelOS.Controllers
|
|
|
{
|
|
|
callback = $"https://www.teammodel.cn/login?code={code}&callback=https%3A%2F%2Fwww.teammodel.cn%2Flogin";
|
|
|
}
|
|
|
+ else {
|
|
|
+ callback = $"https://account.teammodel.cn/?code={code}&callback={HttpUtility.UrlEncode(sso.callback, Encoding.UTF8)}";
|
|
|
+ }
|
|
|
//rurl.Append($"?status={status}&msg={HttpUtility.UrlEncode(msg, Encoding.UTF8)}&callback={HttpUtility.UrlEncode(callback)}&id_token={implicit_token?.id_token}&access_token={implicit_token?.access_token}&expires_in={HttpUtility.UrlEncode(implicit_token?.expires_in)}&token_type={HttpUtility.UrlEncode(implicit_token?.token_type)}").ToString();
|
|
|
|
|
|
// rurl.Append($"?status={status}&msg={HttpUtility.UrlEncode(msg, Encoding.UTF8)}&callback={HttpUtility.UrlEncode(callback)}").ToString();
|
|
|
@@ -399,6 +402,10 @@ namespace TEAMModelOS.Controllers
|
|
|
{
|
|
|
callback = $"https://www.teammodel.cn/login?code={code}&callback=https%3A%2F%2Fwww.teammodel.cn%2Flogin";
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ callback = $"https://account.teammodel.cn/?code={code}&callback={HttpUtility.UrlEncode(sso.callback, Encoding.UTF8)}";
|
|
|
+ }
|
|
|
// rurl.Append($"?status={status}&msg={HttpUtility.UrlEncode("登录成功", Encoding.UTF8)}&callback={callback}&id_token={implicit_token?.id_token}&access_token={implicit_token?.access_token}&expires_in={HttpUtility.UrlEncode(implicit_token?.expires_in)}&token_type={HttpUtility.UrlEncode(implicit_token?.token_type)}").ToString();
|
|
|
// return Ok(new { url = rurl.ToString() });
|
|
|
return Ok(new { url = callback });
|
CrazyIter_Bin