Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob

sunpengfei

16 分钟以前 8cc3bff6979c8e3d66e9d4caa91398c3f0e58f0a

 FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs

@@ -1,7 +1,10 @@
using Furion;
using Azure.Core;
using Furion;
using Furion.DatabaseAccessor;
using Furion.DataEncryption;
using Furion.FriendlyException;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
@@ -29,19 +32,87 @@
            // 生成 token
            logier.AccessToken = JWTEncryption.Encrypt(new Dictionary<string, object>()
            {
                { "UserInfoId", logier.UserInfoId },
                { "Id", logier.Id },
                { "Avatar",logier.Avatar },
                { "Name",logier.Name },
                { "UserName",logier.UserName },
                { "PhoneNumber",logier.PhoneNumber },
                { "Level",logier.Level },
                { "Type",logier.Type },
                { "ClientType",logier.ClientType },
                { "EnterpriseId",logier.EnterpriseId },
            });
            // 获取刷新 token
            logier.RefreshToken = JWTEncryption.GenerateRefreshToken(logier.AccessToken, 60 * 24);

            // 设置响应报文头
            httpContextAccessor.HttpContext.Response.Headers["access-token"] = logier.AccessToken;
            httpContextAccessor.HttpContext.Response.Headers["x-access-token"] = logier.RefreshToken;
            if (httpContextAccessor.HttpContext != null)
            {
                httpContextAccessor.HttpContext.Response.Headers["access-token"] = logier.AccessToken;
                httpContextAccessor.HttpContext.Response.Headers["x-access-token"] = logier.RefreshToken;
            }
        }

        /// <summary>
        /// 获取当前登录用户
        /// </summary>
        /// <param name="user"></param>
        /// <param name="clientType"></param>
        /// <param name="session_key"></param>
        /// <returns></returns>
        public static LoginCommandCallback GetCurrentLogier(this User user, EnumClientType clientType, string session_key = null)
        {
            var logier = new CurrentLogier
            {
                Id = user.Id,
                Avatar = user.Avatar,
                Name = user.Name,
                UserName = user.UserName,
                PhoneNumber = user.PhoneNumber,
                Level = user.Level,
                Type = user.Type,
                ClientType = clientType,
                EnterpriseId = user.EnterpriseId,
            };
            GenerateToken(logier);

            return new LoginCommandCallback
            {
                Id = logier.Id,
                AccessToken = logier.AccessToken,
                RefreshToken = logier.RefreshToken,
                SessionKey = session_key,
                IsBindPhoneNumber = logier.PhoneNumber.IsNotNull()
            };
        }

        public static async Task<LoginCommandCallback> GetCurrentLogier(this string accessToken)
        {
            if (accessToken.IsNotNull())
            {
                accessToken = accessToken.Replace("Bearer ", null);
                var claims = JWTEncryption.ReadJwtToken(accessToken)?.Claims;
                if (claims != null)
                {
                    var claimIdentity = new ClaimsIdentity("AuthenticationTypes.Federation");
                    claimIdentity.AddClaims(claims);
                    var claimsPrincipal = new ClaimsPrincipal(claimIdentity);
                    var userId = claimsPrincipal.FindFirstValue("Id").ToGuid();
                    var clientType = claimsPrincipal.FindFirstValue("ClientType").ToEnum<EnumClientType>();
                    if (userId.HasValue && clientType.HasValue)
                    {
                        var user = await Db.GetRepository<User>().AsQueryable().AsNoTracking()
                            .Where(it => it.Id == userId)
                            .FirstOrDefaultAsync();
                        if (user != null)
                        {
                            var logier = user.GetCurrentLogier(clientType.Value);
                            return logier;
                        }
                    }
                }
            }
            return null;
        }

        /// <summary>
@@ -53,13 +124,15 @@
            if (App.User != null && App.User.Identity.IsAuthenticated)
            {
                var logier = new CurrentLogier();
                if (Guid.TryParse(App.User?.FindFirstValue("UserInfoId"), out var userInfoId)) logier.UserInfoId = userInfoId;
                else return null;
                logier.Level = App.User?.FindFirstValue("Level")?.ToInt() ?? 0;
                logier.Avatar = App.User?.FindFirstValue("Avatar");
                logier.Name = App.User?.FindFirstValue("Name");
                logier.UserName = App.User?.FindFirstValue("UserName");
                logier.PhoneNumber = App.User?.FindFirstValue("PhoneNumber");
                logier.Id = App.User.FindFirstValue("Id").ToGuid("缺失用户Id，请重新登录").Value;
                logier.Level = App.User.FindFirstValue("Level")?.ToInt() ?? 0;
                logier.Avatar = App.User.FindFirstValue("Avatar");
                logier.Name = App.User.FindFirstValue("Name");
                logier.UserName = App.User.FindFirstValue("UserName");
                logier.PhoneNumber = App.User.FindFirstValue("PhoneNumber");
                logier.Type = App.User.FindFirstValue("Type").ToEnum<EnumUserType>("缺失用户类型，请重新登录").Value;
                logier.ClientType = App.User.FindFirstValue("ClientType").ToEnum<EnumClientType>("缺失客户端类型，请重新登录").Value;
                logier.EnterpriseId = App.User.FindFirstValue("EnterpriseId").ToGuid();
                return logier;
            }
            return null;