Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aaba8b8b73 | ||
|
|
6e2ae11c54 | ||
|
|
d0a5e996c9 | ||
|
|
3b405079c1 | ||
|
|
611808787e | ||
|
|
8ee297e819 | ||
|
|
bc4195e984 | ||
|
|
4a0caa1079 | ||
|
|
7a2ff896b2 |
@@ -0,0 +1,226 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Net.Http.Json;
|
||||||
|
using SimApi.Communications;
|
||||||
|
using static SimApi.Helpers.SimApiError;
|
||||||
|
|
||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthCenter(SimApiAuthClient simapi)
|
||||||
|
{
|
||||||
|
public SimApiAuthClient Client { get; } = simapi;
|
||||||
|
|
||||||
|
#region 公共
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 委托AuthCenter进行应用签名验证
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="appId"></param>
|
||||||
|
/// <param name="timestamp"></param>
|
||||||
|
/// <param name="nonce"></param>
|
||||||
|
/// <param name="sign"></param>
|
||||||
|
public void VerifySign(string appId, string timestamp, string nonce, string sign)
|
||||||
|
{
|
||||||
|
var http = new HttpClient();
|
||||||
|
var url = $"{Client.Server}/api/auth/sign/verify?appId={appId}×tamp={timestamp}&nonce={nonce}&sign={sign}";
|
||||||
|
var result = http.PostAsJsonAsync(url, new { }).Result;
|
||||||
|
var resp = result.Content.ReadFromJsonAsync<SimApiBaseResponse>().Result;
|
||||||
|
ErrorWhenNull(resp, 400, "签名验证失败");
|
||||||
|
ErrorWhenFalse(resp.Code == 200, 400, "签名验证失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
#region 群组相关
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据profileId获取群组列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.GroupRelatedItem[]? GroupRelated(string profileId)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.GroupRelatedItem[]>("/api/auth/group/related", new { profileId });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据关键字搜索群组,输入群组ID精准搜索
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="keyword"></param>
|
||||||
|
/// <param name="skip"></param>
|
||||||
|
/// <param name="take"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.AppAndProfileItem[]? GroupSearch(string keyword, int skip = 0, int take = 20)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/group/search",
|
||||||
|
new { keyword, skip, take });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 使用组ID以及组内成员,管理员profile获取组的详细树结构
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="groupId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.GroupDetailTreeNode? GroupDetail(string groupId, string profileId)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.GroupDetailTreeNode>("/api/auth/group/detail",
|
||||||
|
new { profileId, groupId });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取profile在本组的所有子组
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="groupId"></param>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public string[]? GroupRelatedIndex(string groupId, string profileId)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<string[]>("/api/auth/internal/group/related-group-ids", new { groupId, profileId });
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Profile相关
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据关键字,搜索用户Profile,参数支持精准ID,用户手机号,用户邮箱,Profile名称模糊搜索
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="keyword"></param>
|
||||||
|
/// <param name="skip"></param>
|
||||||
|
/// <param name="take"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.AppAndProfileItem[]? ProfileSearch(string keyword, int skip = 0, int take = 20)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/profile/search",
|
||||||
|
new { keyword, skip, take });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 通过id,可以批量获取用户的基本信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ids"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.AppAndProfileItem[]? ProfileList(string[] ids)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/profile/list", new { ids });
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region AuthGate内部应用专用 - 注意: 只有内部应用可以调用
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取是否为App的拥有者
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="applicationId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public bool CheckIsAppOwner(string profileId, string applicationId)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<bool>("/api/auth/internal/app/check-owner", new
|
||||||
|
{
|
||||||
|
ProfileId = profileId,
|
||||||
|
AppId = applicationId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取应用列表,根据用户profileId 和 提供的appIds
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="appIds"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.AppAndProfileItem[]? GetAppList(string profileId, IEnumerable<string> appIds)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/internal/app/related", new
|
||||||
|
{
|
||||||
|
ProfileId = profileId,
|
||||||
|
AllowedAppIds = appIds,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 系统登录
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取登录授权CODE
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="scene"></param>
|
||||||
|
/// <param name="data"></param>
|
||||||
|
/// <param name="backUrl"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.GetCodeResponse GetLoginCode(string? scene = null,
|
||||||
|
Dictionary<string, object>? data = null,
|
||||||
|
string? backUrl = null)
|
||||||
|
{
|
||||||
|
var code = Client.SignQuery<string>("/api/auth/login/code",
|
||||||
|
new { scene, data, backUrl });
|
||||||
|
return new SimApiAuthCenterDto.GetCodeResponse()
|
||||||
|
{
|
||||||
|
Code = code!,
|
||||||
|
Server = Client.Server,
|
||||||
|
FullUrl = $"{Client.Server}/auth?code={code}"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 使用code获取登录信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="code"></param>
|
||||||
|
/// <param name="scene"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.LoginInfoResponse GetLoginInfo(string code, string? scene = null)
|
||||||
|
{
|
||||||
|
var resp = Client.SignQuery<SimApiAuthCenterDto.LoginInfoResponse>("/api/auth/login/get", new { code });
|
||||||
|
ErrorWhenNull(resp, 400232, "登录信息获取失败");
|
||||||
|
ErrorWhen(resp.Scene != scene, 403003, "登录场景不匹配");
|
||||||
|
return resp;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 安全验证
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取安全验证代码
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="scene"></param>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
/// <param name="data"></param>
|
||||||
|
/// <param name="backUrl"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.GetCodeResponse GetConfirmCode(string scene, string userId,
|
||||||
|
Dictionary<string, object>? data = null,
|
||||||
|
string? backUrl = null)
|
||||||
|
{
|
||||||
|
var code = Client.SignQuery<string>("/api/auth/confirm/code",
|
||||||
|
new { scene, data, backUrl, profileId = userId });
|
||||||
|
return new SimApiAuthCenterDto.GetCodeResponse()
|
||||||
|
{
|
||||||
|
Code = code!,
|
||||||
|
Server = Client.Server,
|
||||||
|
FullUrl = $"{Client.Server}/confirm?code={code}"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 使用安全验证code 获取验证结果
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="code"></param>
|
||||||
|
/// <param name="scene"></param>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.ConfirmResponse Confirm(string code, string scene, string? userId = null)
|
||||||
|
{
|
||||||
|
var resp = Client.SignQuery<SimApiAuthCenterDto.ConfirmResponse>("/api/auth/confirm/get", new { code });
|
||||||
|
ErrorWhenNull(resp, 403001, "安全确认码无效");
|
||||||
|
ErrorWhen(resp.ProfileId != userId, 403002, "安全确认身份不匹配");
|
||||||
|
ErrorWhen(resp.Scene != scene, 403003, "安全确认场景不匹配");
|
||||||
|
return resp;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthCenterDto
|
||||||
|
{
|
||||||
|
public class AppAndProfileItem
|
||||||
|
{
|
||||||
|
public required string Id { get; set; }
|
||||||
|
public required string Name { get; set; }
|
||||||
|
public string? Image { get; set; }
|
||||||
|
public string? Description { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ConfirmResponse
|
||||||
|
{
|
||||||
|
public required string ApplicationId { get; set; }
|
||||||
|
public required string ProfileId { get; set; }
|
||||||
|
public string? Scene { get; set; }
|
||||||
|
public Dictionary<string, object>? Data { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class LoginInfoResponse
|
||||||
|
{
|
||||||
|
public string? Scene { get; set; }
|
||||||
|
public Dictionary<string, object>? Data { get; set; }
|
||||||
|
public required string ProfileId { get; set; }
|
||||||
|
public required string Name { get; set; }
|
||||||
|
public string? Image { get; set; }
|
||||||
|
public string? Description { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GetCodeResponse
|
||||||
|
{
|
||||||
|
public required string Code { get; set; }
|
||||||
|
public required string Server { get; set; }
|
||||||
|
public required string FullUrl { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GroupRelatedItem
|
||||||
|
{
|
||||||
|
public required string Id { get; set; }
|
||||||
|
public required string Name { get; set; }
|
||||||
|
public string? Image { get; set; }
|
||||||
|
public string? Description { get; set; }
|
||||||
|
public bool IsOwner { get; set; }
|
||||||
|
public bool IsAdmin { get; set; }
|
||||||
|
public bool IsMember { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GroupDetailTreeNode
|
||||||
|
{
|
||||||
|
public required string Id { get; set; }
|
||||||
|
public required string Name { get; set; }
|
||||||
|
public string? Image { get; set; }
|
||||||
|
public string? Description { get; set; }
|
||||||
|
public int Sort { get; set; }
|
||||||
|
public List<GroupDetailTreeNode> Children { get; set; } = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,14 +1,13 @@
|
|||||||
using System;
|
using System.Threading.Tasks;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
using SimApi.Configurations;
|
using SimApi.Configurations;
|
||||||
using SimApi.Helpers;
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Middlewares;
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
public class SimApiGateAuthMiddleware(RequestDelegate next, ILogger<SimApiGateAuthMiddleware> logger)
|
public class SimApiAuthCenterMiddleware(RequestDelegate next, ILogger<SimApiAuthCenterMiddleware> logger)
|
||||||
{
|
{
|
||||||
public Task Invoke(HttpContext httpContext, SimApiOptions simApiOptions)
|
public Task Invoke(HttpContext httpContext, SimApiOptions simApiOptions)
|
||||||
{
|
{
|
||||||
@@ -17,7 +16,7 @@ public class SimApiGateAuthMiddleware(RequestDelegate next, ILogger<SimApiGateAu
|
|||||||
httpContext.Request.Headers.TryGetValue("X-SimApi-Gate-Sign", out var sign))
|
httpContext.Request.Headers.TryGetValue("X-SimApi-Gate-Sign", out var sign))
|
||||||
{
|
{
|
||||||
var signStr =
|
var signStr =
|
||||||
$"appId={simApiOptions.SimApiGateAuthOptions.AppId}&auth={auth}&time={time}&appKey={simApiOptions.SimApiGateAuthOptions.AppKey}";
|
$"appId={simApiOptions.SimApiAuthCenterOptions.AppId}&auth={auth}&time={time}&appKey={simApiOptions.SimApiAuthCenterOptions.AppKey}";
|
||||||
logger.LogDebug($"签名字符串 => {signStr}");
|
logger.LogDebug($"签名字符串 => {signStr}");
|
||||||
if (SimApiUtil.Md5(signStr) == sign && !string.IsNullOrEmpty(auth))
|
if (SimApiUtil.Md5(signStr) == sign && !string.IsNullOrEmpty(auth))
|
||||||
{
|
{
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using SimApi.Configurations;
|
||||||
|
using SimApi.Helpers;
|
||||||
|
|
||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthClient(SimApiOptions apiOptions, ILogger<SimApiAuthClient> logger)
|
||||||
|
: SimApiHttpClient(apiOptions, logger)
|
||||||
|
{
|
||||||
|
public override string Server { get; init; } = apiOptions.SimApiAuthCenterOptions.Server ?? string.Empty;
|
||||||
|
public override string AppId { get; init; } = apiOptions.SimApiAuthCenterOptions.AppId ?? string.Empty;
|
||||||
|
public override string AppKey { get; init; } = apiOptions.SimApiAuthCenterOptions.AppKey ?? string.Empty;
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using static SimApi.Helpers.SimApiError;
|
||||||
|
|
||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthIam(SimApiAuthClient simapi, ILogger<SimApiAuthIam> logger)
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 向Iam注册权限
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="permissions"></param>
|
||||||
|
public void RegisterPermissions(SimApiAuthIamDto.PermissionItem[] permissions)
|
||||||
|
{
|
||||||
|
var log = $"检测到 {permissions.Length} 个权限接口,正在注册..: ";
|
||||||
|
foreach (var permission in permissions)
|
||||||
|
{
|
||||||
|
log += $"\n |- {permission.Identifier} => [{permission.Group}]{permission.Name} ({permission.Description})";
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.LogInformation(log);
|
||||||
|
simapi.SignQuery<string>("/api/iam/permission/register", new { permissions });
|
||||||
|
logger.LogInformation("权限注册完成");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取拥有的权限标识数组
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="groupId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public string[] GetPermissionOwned(string profileId, string? groupId = null)
|
||||||
|
{
|
||||||
|
return simapi.SignQuery<string[]>("/api/iam/permission/owned", new { profileId, groupId }) ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检测profileId是否有这个权限
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="permission"></param>
|
||||||
|
/// <param name="groupId"></param>
|
||||||
|
public void CheckPermission(string profileId, string permission, string? groupId = null)
|
||||||
|
{
|
||||||
|
var ok = simapi.SignQuery<bool>("/api/iam/permission/check", new { profileId, permission, groupId });
|
||||||
|
ErrorWhen(!ok, 403, "没有该权限");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthIamDto
|
||||||
|
{
|
||||||
|
public class PermissionItem
|
||||||
|
{
|
||||||
|
public required string Identifier { get; init; }
|
||||||
|
public required string Name { get; init; }
|
||||||
|
public required string Group { get; init; }
|
||||||
|
public required string Description { get; init; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
public class SimApiAuthCenterOptions
|
||||||
|
{
|
||||||
|
public string? Server { get; set; }
|
||||||
|
public string? AppId { get; set; }
|
||||||
|
public string? AppKey { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 开启则使用内部网关透传的Middleware
|
||||||
|
/// 注意: 只有内部应用需要开启这个,也就是api通过内部网关代理后
|
||||||
|
/// </summary>
|
||||||
|
public bool UseMiddleware { get; set; }
|
||||||
|
public bool UseIam { get; set; }
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace SimApi.Configurations;
|
|
||||||
|
|
||||||
public class SimApiGateAuthOptions
|
|
||||||
{
|
|
||||||
public string? AppId { get; set; }
|
|
||||||
|
|
||||||
public string? AppKey { get; set; }
|
|
||||||
}
|
|
||||||
@@ -20,12 +20,7 @@ public class SimApiOptions
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 启用SimApi网关授权, 基于上层网关透传的身份令牌验证
|
/// 启用SimApi网关授权, 基于上层网关透传的身份令牌验证
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableSimApiGateAuth { get; set; }
|
public bool EnableSimApiAuthGate { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 是否使用CoceSdk
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableCoceSdk { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 开启S3兼容的存储系统。
|
/// 开启S3兼容的存储系统。
|
||||||
@@ -61,7 +56,6 @@ public class SimApiOptions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableSimApiResponseFilter { get; set; } = true;
|
public bool EnableSimApiResponseFilter { get; set; } = true;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
|
/// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
|
||||||
/// default: true
|
/// default: true
|
||||||
@@ -74,24 +68,17 @@ public class SimApiOptions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableLowerUrl { get; set; } = true;
|
public bool EnableLowerUrl { get; set; } = true;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 应用可以通过 /versions 显示出应用版本和SimApi包版本
|
|
||||||
/// default: true
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableVersionUrl { get; set; } = true;
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 启用格式化的 Console Logger
|
/// 启用格式化的 Console Logger
|
||||||
/// default: false
|
/// default: false
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableLogger { get; set; } = true;
|
public bool EnableLogger { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否启用SimApiHttpClient
|
||||||
|
/// </summary>
|
||||||
public bool EnableSimApiHttpClient { get; set; } = false;
|
public bool EnableSimApiHttpClient { get; set; } = false;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 配置Job
|
/// 配置Job
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -109,12 +96,19 @@ public class SimApiOptions
|
|||||||
|
|
||||||
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
|
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
|
||||||
|
|
||||||
public SimApiGateAuthOptions SimApiGateAuthOptions { get; set; } = new();
|
public SimApiAuthCenterOptions SimApiAuthCenterOptions { get; set; } = new();
|
||||||
|
|
||||||
public SimApiHttpClientOptions SimApiHttpClientOptions { get; set; } = new();
|
public SimApiHttpClientOptions SimApiHttpClientOptions { get; set; } = new();
|
||||||
|
|
||||||
public SimApiExceptionOptions SimApiExceptionOptions { get; set; } = new();
|
public SimApiExceptionOptions SimApiExceptionOptions { get; set; } = new();
|
||||||
|
|
||||||
|
public SimApiRouteOptions SimApiRouteOptions { get; set; } = new();
|
||||||
|
|
||||||
|
public void ConfigureSimApiRoute(Action<SimApiRouteOptions>? options = null)
|
||||||
|
{
|
||||||
|
options?.Invoke(SimApiRouteOptions);
|
||||||
|
}
|
||||||
|
|
||||||
public void ConfigureSimApiException(Action<SimApiExceptionOptions>? options = null)
|
public void ConfigureSimApiException(Action<SimApiExceptionOptions>? options = null)
|
||||||
{
|
{
|
||||||
options?.Invoke(SimApiExceptionOptions);
|
options?.Invoke(SimApiExceptionOptions);
|
||||||
@@ -145,8 +139,8 @@ public class SimApiOptions
|
|||||||
options?.Invoke(SimApiJobOptions);
|
options?.Invoke(SimApiJobOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ConfigureSimApiGateAuth(Action<SimApiGateAuthOptions>? options = null)
|
public void ConfigureSimApiAuthCenter(Action<SimApiAuthCenterOptions>? options = null)
|
||||||
{
|
{
|
||||||
options?.Invoke(SimApiGateAuthOptions);
|
options?.Invoke(SimApiAuthCenterOptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
public class SimApiRouteOptions
|
||||||
|
{
|
||||||
|
public string? VersionRoute = "/versions";
|
||||||
|
public string? LogoutRoute = "/auth/logout";
|
||||||
|
public string? UserInfoRoute = "/user/info";
|
||||||
|
}
|
||||||
@@ -5,8 +5,6 @@ using SimApi.Helpers;
|
|||||||
|
|
||||||
namespace SimApi.Controllers;
|
namespace SimApi.Controllers;
|
||||||
|
|
||||||
using static SimApiError;
|
|
||||||
|
|
||||||
public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
|
public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -32,10 +32,11 @@ public class SimApiCommonController : SimApiBaseController
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取已登录用户信息
|
/// 获取已登录用户信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost("/user/info"), SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
|
[HttpPost, SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
|
||||||
public SimApiLoginItem UserInfo() => LoginInfo;
|
public SimApiLoginItem UserInfo() => LoginInfo;
|
||||||
}
|
}
|
||||||
@@ -65,7 +65,7 @@ public static class SimApiError
|
|||||||
/// <param name="code">错误代码</param>
|
/// <param name="code">错误代码</param>
|
||||||
/// <param name="message">错误描述</param>
|
/// <param name="message">错误描述</param>
|
||||||
public static void ErrorWhenNull([NotNull] object? condition, int code = 404,
|
public static void ErrorWhenNull([NotNull] object? condition, int code = 404,
|
||||||
string message = "请求的资源不存在")
|
string message = "")
|
||||||
{
|
{
|
||||||
ErrorWhen(condition == null, code, message);
|
ErrorWhen(condition == null, code, message);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,15 +12,15 @@ namespace SimApi.Helpers;
|
|||||||
|
|
||||||
public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHttpClient>? logger = null)
|
public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHttpClient>? logger = null)
|
||||||
{
|
{
|
||||||
public string Server { get; init; } = apiOptions?.SimApiHttpClientOptions.Server ?? string.Empty;
|
public virtual string Server { get; init; } = apiOptions?.SimApiHttpClientOptions.Server ?? string.Empty;
|
||||||
public string AppId { get; init; } = apiOptions?.SimApiHttpClientOptions.AppId ?? string.Empty;
|
public virtual string AppId { get; init; } = apiOptions?.SimApiHttpClientOptions.AppId ?? string.Empty;
|
||||||
public string AppKey { get; init; } = apiOptions?.SimApiHttpClientOptions.AppKey ?? string.Empty;
|
public virtual string AppKey { get; init; } = apiOptions?.SimApiHttpClientOptions.AppKey ?? string.Empty;
|
||||||
|
|
||||||
public string SignName { get; init; } = "sign";
|
public virtual string SignName { get; init; } = "sign";
|
||||||
public string TimestampName { get; init; } = "timestamp";
|
public virtual string TimestampName { get; init; } = "timestamp";
|
||||||
public string NonceName { get; init; } = "nonce";
|
public virtual string NonceName { get; init; } = "nonce";
|
||||||
public string? AppIdName { get; init; } = "appId";
|
public virtual string? AppIdName { get; init; } = "appId";
|
||||||
public string[] SignFields { get; init; } = [];
|
public virtual string[] SignFields { get; init; } = [];
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 发起签名请求
|
/// 发起签名请求
|
||||||
@@ -106,6 +106,7 @@ public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHt
|
|||||||
logger?.LogDebug($"[HTTPCLIENT请求] {url}\n{SimApiUtil.Json(req)}\n");
|
logger?.LogDebug($"[HTTPCLIENT请求] {url}\n{SimApiUtil.Json(req)}\n");
|
||||||
var resp = http.PostAsJsonAsync(url, req).Result;
|
var resp = http.PostAsJsonAsync(url, req).Result;
|
||||||
logger?.LogDebug($"[HTTPCLIENT响应] {resp.Content.ReadAsStringAsync().Result}\n");
|
logger?.LogDebug($"[HTTPCLIENT响应] {resp.Content.ReadAsStringAsync().Result}\n");
|
||||||
|
SimApiError.ErrorWhenFalse(resp.IsSuccessStatusCode, (int)resp.StatusCode, $"HTTP ERROR: {resp.StatusCode}");
|
||||||
var res = resp.Content.ReadFromJsonAsync<SimApiBaseResponse<T>>().Result;
|
var res = resp.Content.ReadFromJsonAsync<SimApiBaseResponse<T>>().Result;
|
||||||
SimApiError.ErrorWhenNull(res, 500, "请求发生错误");
|
SimApiError.ErrorWhenNull(res, 500, "请求发生错误");
|
||||||
SimApiError.ErrorWhen(res.Code != 200, res.Code, res.Message);
|
SimApiError.ErrorWhen(res.Code != 200, res.Code, res.Message);
|
||||||
|
|||||||
@@ -45,11 +45,15 @@ public class SimApiExceptionMiddleware(
|
|||||||
response = string.IsNullOrEmpty(simEx.Message)
|
response = string.IsNullOrEmpty(simEx.Message)
|
||||||
? new SimApiBaseResponse(simEx.Code)
|
? new SimApiBaseResponse(simEx.Code)
|
||||||
: new SimApiBaseResponse(simEx.Code, simEx.Message);
|
: new SimApiBaseResponse(simEx.Code, simEx.Message);
|
||||||
|
if (context.Response.StatusCode == 404)
|
||||||
|
{
|
||||||
|
response.Message = "接口不存在";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
log.LogError(ex, "服务器异常");
|
log.LogError(ex, ex.Message);
|
||||||
response = new SimApiBaseResponse(500, "服务器错误");
|
response = new SimApiBaseResponse(500);
|
||||||
}
|
}
|
||||||
|
|
||||||
await ErrorResponseAsync(context, response);
|
await ErrorResponseAsync(context, response);
|
||||||
|
|||||||
+46
-14
@@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Mvc;
|
|||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using SimApi.Attributes;
|
using SimApi.Attributes;
|
||||||
|
using SimApi.AuthSDK;
|
||||||
using SimApi.Configurations;
|
using SimApi.Configurations;
|
||||||
using SimApi.Interfaces;
|
using SimApi.Interfaces;
|
||||||
using SimApi.Logger;
|
using SimApi.Logger;
|
||||||
@@ -328,6 +329,16 @@ public static class SimApiExtensions
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (simApiOptions.EnableSimApiAuthGate)
|
||||||
|
{
|
||||||
|
builder.AddSingleton<SimApiAuthClient>();
|
||||||
|
builder.AddSingleton<SimApiAuthCenter>();
|
||||||
|
if (simApiOptions.SimApiAuthCenterOptions.UseIam)
|
||||||
|
{
|
||||||
|
builder.AddSingleton<SimApiAuthIam>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
builder.AddSingleton(simApiOptions);
|
builder.AddSingleton(simApiOptions);
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
@@ -411,17 +422,20 @@ public static class SimApiExtensions
|
|||||||
logger.LogInformation(msg);
|
logger.LogInformation(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.EnableSimApiGateAuth)
|
if (options.EnableSimApiAuthGate)
|
||||||
{
|
{
|
||||||
logger.LogInformation("开始配置SimApiGateAuth...");
|
logger.LogInformation("开始配置SimApiAuthGate...");
|
||||||
if (string.IsNullOrEmpty(options.SimApiGateAuthOptions.AppId) ||
|
if (string.IsNullOrEmpty(options.SimApiAuthCenterOptions.AppId) ||
|
||||||
string.IsNullOrEmpty(options.SimApiGateAuthOptions.AppKey))
|
string.IsNullOrEmpty(options.SimApiAuthCenterOptions.AppKey))
|
||||||
{
|
{
|
||||||
logger.LogCritical("必须配置Gate的AppId和AppKey才能启用SimApiGateAuth");
|
logger.LogCritical("必须配置AuthGate的AppId和AppKey才能启用SimApiAuthGate");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
builder.UseMiddleware<SimApiGateAuthMiddleware>();
|
if (options.SimApiAuthCenterOptions.UseMiddleware)
|
||||||
|
{
|
||||||
|
builder.UseMiddleware<SimApiAuthCenterMiddleware>();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -429,17 +443,13 @@ public static class SimApiExtensions
|
|||||||
{
|
{
|
||||||
logger.LogInformation("开始配置SimApiAuth...");
|
logger.LogInformation("开始配置SimApiAuth...");
|
||||||
builder.UseMiddleware<SimApiAuthMiddleware>();
|
builder.UseMiddleware<SimApiAuthMiddleware>();
|
||||||
builder.MapControllerRoute(name: "Logout", pattern: "/auth/logout",
|
|
||||||
defaults: new
|
|
||||||
{
|
|
||||||
controller = "SimApiAuth",
|
|
||||||
action = "Logout"
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.EnableVersionUrl)
|
|
||||||
|
if (options.SimApiRouteOptions.VersionRoute != null)
|
||||||
{
|
{
|
||||||
builder.MapControllerRoute(name: "Versions", pattern: "/versions",
|
logger.LogInformation("注册内置Route: Versions => {}", options.SimApiRouteOptions.LogoutRoute);
|
||||||
|
builder.MapControllerRoute(name: "Versions", pattern: options.SimApiRouteOptions.VersionRoute,
|
||||||
defaults: new
|
defaults: new
|
||||||
{
|
{
|
||||||
controller = "SimApiCommon",
|
controller = "SimApiCommon",
|
||||||
@@ -447,6 +457,28 @@ public static class SimApiExtensions
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (options.SimApiRouteOptions.UserInfoRoute != null)
|
||||||
|
{
|
||||||
|
logger.LogInformation("注册内置Route: UserInfo => {}", options.SimApiRouteOptions.UserInfoRoute);
|
||||||
|
builder.MapControllerRoute(name: "UserInfo", pattern: options.SimApiRouteOptions.UserInfoRoute,
|
||||||
|
defaults: new
|
||||||
|
{
|
||||||
|
controller = "SimApiCommon",
|
||||||
|
action = "UserInfo"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options.SimApiRouteOptions.LogoutRoute != null)
|
||||||
|
{
|
||||||
|
logger.LogInformation("注册内置Route: Logout => {}", options.SimApiRouteOptions.LogoutRoute);
|
||||||
|
builder.MapControllerRoute(name: "Logout", pattern: options.SimApiRouteOptions.LogoutRoute,
|
||||||
|
defaults: new
|
||||||
|
{
|
||||||
|
controller = "SimApiAuth",
|
||||||
|
action = "Logout"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (options.EnableSimApiDoc)
|
if (options.EnableSimApiDoc)
|
||||||
{
|
{
|
||||||
logger.LogInformation("开始配置SimApiDoc...");
|
logger.LogInformation("开始配置SimApiDoc...");
|
||||||
|
|||||||
Reference in New Issue
Block a user