Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
464878edce | ||
|
|
aaba8b8b73 | ||
|
|
6e2ae11c54 | ||
|
|
d0a5e996c9 | ||
|
|
3b405079c1 | ||
|
|
611808787e | ||
|
|
8ee297e819 | ||
|
|
bc4195e984 | ||
|
|
4a0caa1079 |
@@ -434,3 +434,6 @@ MigrationBackup/
|
||||
# Ionide (cross platform F# VS Code tools) working folder
|
||||
.ionide/
|
||||
|
||||
|
||||
# BitFun snapshot data - auto managed
|
||||
.bitfun/
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
using SimApi.Configurations;
|
||||
using SimApi.Helpers;
|
||||
|
||||
namespace SimApi.AuthGate;
|
||||
|
||||
public class SimApiAuthGateClient(SimApiOptions apiOptions) : SimApiHttpClient
|
||||
{
|
||||
public override string Server { get; init; } = apiOptions.SimApiAuthGateOptions.Server ?? string.Empty;
|
||||
public override string AppId { get; init; } = apiOptions.SimApiAuthGateOptions.AppId ?? string.Empty;
|
||||
public override string AppKey { get; init; } = apiOptions.SimApiAuthGateOptions.AppKey ?? string.Empty;
|
||||
}
|
||||
@@ -1,15 +1,16 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Net.Http;
|
||||
using System.Net.Http.Json;
|
||||
using SimApi.Communications;
|
||||
using static SimApi.Helpers.SimApiError;
|
||||
|
||||
namespace SimApi.AuthGate;
|
||||
namespace SimApi.AuthSDK;
|
||||
|
||||
public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
public class SimApiAuthCenter(SimApiAuthClient simapi)
|
||||
{
|
||||
#region AuthGate公开接口
|
||||
public SimApiAuthClient Client { get; } = simapi;
|
||||
|
||||
#region 公共
|
||||
|
||||
/// <summary>
|
||||
/// 委托AuthCenter进行应用签名验证
|
||||
@@ -21,13 +22,68 @@ public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
public void VerifySign(string appId, string timestamp, string nonce, string sign)
|
||||
{
|
||||
var http = new HttpClient();
|
||||
var url = $"{simapi.Server}/api/auth/sign/verify?appId={appId}×tamp={timestamp}&nonce={nonce}&sign={sign}";
|
||||
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>
|
||||
@@ -35,9 +91,9 @@ public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
/// <param name="skip"></param>
|
||||
/// <param name="take"></param>
|
||||
/// <returns></returns>
|
||||
public SimApiAuthGateDto.AppAndProfileItem[]? ProfileSearch(string keyword, int skip = 0, int take = 20)
|
||||
public SimApiAuthCenterDto.AppAndProfileItem[]? ProfileSearch(string keyword, int skip = 0, int take = 20)
|
||||
{
|
||||
return simapi.SignQuery<SimApiAuthGateDto.AppAndProfileItem[]>("/api/auth/profile/search",
|
||||
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/profile/search",
|
||||
new { keyword, skip, take });
|
||||
}
|
||||
|
||||
@@ -46,9 +102,9 @@ public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
/// </summary>
|
||||
/// <param name="ids"></param>
|
||||
/// <returns></returns>
|
||||
public SimApiAuthGateDto.AppAndProfileItem[]? ProfileList(string[] ids)
|
||||
public SimApiAuthCenterDto.AppAndProfileItem[]? ProfileList(string[] ids)
|
||||
{
|
||||
return simapi.SignQuery<SimApiAuthGateDto.AppAndProfileItem[]>("/api/auth/profile/list", new { ids });
|
||||
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/profile/list", new { ids });
|
||||
}
|
||||
|
||||
#endregion
|
||||
@@ -63,7 +119,7 @@ public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
/// <returns></returns>
|
||||
public bool CheckIsAppOwner(string profileId, string applicationId)
|
||||
{
|
||||
return simapi.SignQuery<bool>("/api/auth/internal/apps/check-owner", new
|
||||
return Client.SignQuery<bool>("/api/auth/internal/app/check-owner", new
|
||||
{
|
||||
ProfileId = profileId,
|
||||
AppId = applicationId,
|
||||
@@ -76,9 +132,9 @@ public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
/// <param name="profileId"></param>
|
||||
/// <param name="appIds"></param>
|
||||
/// <returns></returns>
|
||||
public SimApiAuthGateDto.AppAndProfileItem[]? GetAppList(string profileId, IEnumerable<string> appIds)
|
||||
public SimApiAuthCenterDto.AppAndProfileItem[]? GetAppList(string profileId, IEnumerable<string> appIds)
|
||||
{
|
||||
return simapi.SignQuery<SimApiAuthGateDto.AppAndProfileItem[]>("/api/auth/internal/apps/related", new
|
||||
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/internal/app/related", new
|
||||
{
|
||||
ProfileId = profileId,
|
||||
AllowedAppIds = appIds,
|
||||
@@ -96,16 +152,17 @@ public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
/// <param name="data"></param>
|
||||
/// <param name="backUrl"></param>
|
||||
/// <returns></returns>
|
||||
public SimApiAuthGateDto.GetCodeResponse GetAuthCode(string? scene = null, Dictionary<string, object>? data = null,
|
||||
public SimApiAuthCenterDto.GetCodeResponse GetLoginCode(string? scene = null,
|
||||
Dictionary<string, object>? data = null,
|
||||
string? backUrl = null)
|
||||
{
|
||||
var code = simapi.SignQuery<string>("/api/auth/confirm/code",
|
||||
var code = Client.SignQuery<string>("/api/auth/login/code",
|
||||
new { scene, data, backUrl });
|
||||
return new SimApiAuthGateDto.GetCodeResponse()
|
||||
return new SimApiAuthCenterDto.GetCodeResponse()
|
||||
{
|
||||
Code = code!,
|
||||
Server = simapi.Server,
|
||||
FullUrl = $"{simapi.Server}/auth?code={code}"
|
||||
Server = Client.Server,
|
||||
FullUrl = $"{Client.Server}/auth?code={code}"
|
||||
};
|
||||
}
|
||||
|
||||
@@ -115,9 +172,9 @@ public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
/// <param name="code"></param>
|
||||
/// <param name="scene"></param>
|
||||
/// <returns></returns>
|
||||
public SimApiAuthGateDto.AuthInfoResponse GetAuthInfo(string code, string? scene = null)
|
||||
public SimApiAuthCenterDto.LoginInfoResponse GetLoginInfo(string code, string? scene = null)
|
||||
{
|
||||
var resp = simapi.SignQuery<SimApiAuthGateDto.AuthInfoResponse>("/api/auth/confirm/get", new { code });
|
||||
var resp = Client.SignQuery<SimApiAuthCenterDto.LoginInfoResponse>("/api/auth/login/get", new { code });
|
||||
ErrorWhenNull(resp, 400232, "登录信息获取失败");
|
||||
ErrorWhen(resp.Scene != scene, 403003, "登录场景不匹配");
|
||||
return resp;
|
||||
@@ -135,17 +192,17 @@ public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
/// <param name="data"></param>
|
||||
/// <param name="backUrl"></param>
|
||||
/// <returns></returns>
|
||||
public SimApiAuthGateDto.GetCodeResponse GetConfirmCode(string scene, string userId,
|
||||
public SimApiAuthCenterDto.GetCodeResponse GetConfirmCode(string scene, string userId,
|
||||
Dictionary<string, object>? data = null,
|
||||
string? backUrl = null)
|
||||
{
|
||||
var code = simapi.SignQuery<string>("/api/auth/confirm/code",
|
||||
var code = Client.SignQuery<string>("/api/auth/confirm/code",
|
||||
new { scene, data, backUrl, profileId = userId });
|
||||
return new SimApiAuthGateDto.GetCodeResponse()
|
||||
return new SimApiAuthCenterDto.GetCodeResponse()
|
||||
{
|
||||
Code = code!,
|
||||
Server = simapi.Server,
|
||||
FullUrl = $"{simapi.Server}/confirm?code={code}"
|
||||
Server = Client.Server,
|
||||
FullUrl = $"{Client.Server}/confirm?code={code}"
|
||||
};
|
||||
}
|
||||
|
||||
@@ -156,9 +213,9 @@ public class SimApiAuthGate(SimApiAuthGateClient simapi)
|
||||
/// <param name="scene"></param>
|
||||
/// <param name="userId"></param>
|
||||
/// <returns></returns>
|
||||
public SimApiAuthGateDto.ConfirmResponse Confirm(string code, string scene, string? userId = null)
|
||||
public SimApiAuthCenterDto.ConfirmResponse Confirm(string code, string scene, string? userId = null)
|
||||
{
|
||||
var resp = simapi.SignQuery<SimApiAuthGateDto.ConfirmResponse>("/api/auth/confirm/get", new { code });
|
||||
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, "安全确认场景不匹配");
|
||||
@@ -1,14 +1,14 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace SimApi.AuthGate;
|
||||
namespace SimApi.AuthSDK;
|
||||
|
||||
public class SimApiAuthGateDto
|
||||
public class SimApiAuthCenterDto
|
||||
{
|
||||
public class AppAndProfileItem
|
||||
{
|
||||
public string Id { get; set; } = "";
|
||||
public string Name { get; set; } = "";
|
||||
public required string Id { get; set; }
|
||||
public required string Name { get; set; }
|
||||
public string? Image { get; set; }
|
||||
public string? Description { get; set; }
|
||||
}
|
||||
@@ -21,7 +21,7 @@ public class SimApiAuthGateDto
|
||||
public Dictionary<string, object>? Data { get; set; }
|
||||
}
|
||||
|
||||
public class AuthInfoResponse
|
||||
public class LoginInfoResponse
|
||||
{
|
||||
public string? Scene { get; set; }
|
||||
public Dictionary<string, object>? Data { get; set; }
|
||||
@@ -37,4 +37,25 @@ public class SimApiAuthGateDto
|
||||
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; } = [];
|
||||
}
|
||||
}
|
||||
@@ -5,9 +5,9 @@ using SimApi.Communications;
|
||||
using SimApi.Configurations;
|
||||
using SimApi.Helpers;
|
||||
|
||||
namespace SimApi.AuthGate;
|
||||
namespace SimApi.AuthSDK;
|
||||
|
||||
public class SimApiAuthGateMiddleware(RequestDelegate next, ILogger<SimApiAuthGateMiddleware> logger)
|
||||
public class SimApiAuthCenterMiddleware(RequestDelegate next, ILogger<SimApiAuthCenterMiddleware> logger)
|
||||
{
|
||||
public Task Invoke(HttpContext httpContext, SimApiOptions simApiOptions)
|
||||
{
|
||||
@@ -16,7 +16,7 @@ public class SimApiAuthGateMiddleware(RequestDelegate next, ILogger<SimApiAuthGa
|
||||
httpContext.Request.Headers.TryGetValue("X-SimApi-Gate-Sign", out var sign))
|
||||
{
|
||||
var signStr =
|
||||
$"appId={simApiOptions.SimApiAuthGateOptions.AppId}&auth={auth}&time={time}&appKey={simApiOptions.SimApiAuthGateOptions.AppKey}";
|
||||
$"appId={simApiOptions.SimApiAuthCenterOptions.AppId}&auth={auth}&time={time}&appKey={simApiOptions.SimApiAuthCenterOptions.AppKey}";
|
||||
logger.LogDebug($"签名字符串 => {signStr}");
|
||||
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;
|
||||
}
|
||||
@@ -1,15 +1,15 @@
|
||||
using Microsoft.Extensions.Logging;
|
||||
using static SimApi.Helpers.SimApiError;
|
||||
|
||||
namespace SimApi.AuthGate;
|
||||
namespace SimApi.AuthSDK;
|
||||
|
||||
public class SimApiIam(SimApiAuthGateClient simapi, ILogger<SimApiIam> logger)
|
||||
public class SimApiAuthIam(SimApiAuthClient simapi, ILogger<SimApiAuthIam> logger)
|
||||
{
|
||||
/// <summary>
|
||||
/// 向Iam注册权限
|
||||
/// </summary>
|
||||
/// <param name="permissions"></param>
|
||||
public void RegisterPermissions(SimApiIamDto.PermissionItem[] permissions)
|
||||
public void RegisterPermissions(SimApiAuthIamDto.PermissionItem[] permissions)
|
||||
{
|
||||
var log = $"检测到 {permissions.Length} 个权限接口,正在注册..: ";
|
||||
foreach (var permission in permissions)
|
||||
@@ -26,10 +26,11 @@ public class SimApiIam(SimApiAuthGateClient simapi, ILogger<SimApiIam> logger)
|
||||
/// 获取拥有的权限标识数组
|
||||
/// </summary>
|
||||
/// <param name="profileId"></param>
|
||||
/// <param name="groupId"></param>
|
||||
/// <returns></returns>
|
||||
public string[] GetPermissionOwned(string profileId)
|
||||
public string[] GetPermissionOwned(string profileId, string? groupId = null)
|
||||
{
|
||||
return simapi.SignQuery<string[]>("/api/iam/permission/owned", new { profileId }) ?? [];
|
||||
return simapi.SignQuery<string[]>("/api/iam/permission/owned", new { profileId, groupId }) ?? [];
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -37,9 +38,10 @@ public class SimApiIam(SimApiAuthGateClient simapi, ILogger<SimApiIam> logger)
|
||||
/// </summary>
|
||||
/// <param name="profileId"></param>
|
||||
/// <param name="permission"></param>
|
||||
public void CheckPermission(string profileId, string permission)
|
||||
/// <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 });
|
||||
var ok = simapi.SignQuery<bool>("/api/iam/permission/check", new { profileId, permission, groupId });
|
||||
ErrorWhen(!ok, 403, "没有该权限");
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
namespace SimApi.AuthGate;
|
||||
namespace SimApi.AuthSDK;
|
||||
|
||||
public class SimApiIamDto
|
||||
public class SimApiAuthIamDto
|
||||
{
|
||||
public class PermissionItem
|
||||
{
|
||||
@@ -1,6 +1,6 @@
|
||||
namespace SimApi.Configurations;
|
||||
|
||||
public class SimApiAuthGateOptions
|
||||
public class SimApiAuthCenterOptions
|
||||
{
|
||||
public string? Server { get; set; }
|
||||
public string? AppId { get; set; }
|
||||
@@ -11,4 +11,5 @@ public class SimApiAuthGateOptions
|
||||
/// 注意: 只有内部应用需要开启这个,也就是api通过内部网关代理后
|
||||
/// </summary>
|
||||
public bool UseMiddleware { get; set; }
|
||||
public bool UseIam { get; set; }
|
||||
}
|
||||
@@ -56,7 +56,6 @@ public class SimApiOptions
|
||||
/// </summary>
|
||||
public bool EnableSimApiResponseFilter { get; set; } = true;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
|
||||
/// default: true
|
||||
@@ -69,24 +68,17 @@ public class SimApiOptions
|
||||
/// </summary>
|
||||
public bool EnableLowerUrl { get; set; } = true;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 应用可以通过 /versions 显示出应用版本和SimApi包版本
|
||||
/// default: true
|
||||
/// </summary>
|
||||
public bool EnableVersionUrl { get; set; } = true;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 启用格式化的 Console Logger
|
||||
/// default: false
|
||||
/// </summary>
|
||||
public bool EnableLogger { get; set; } = true;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 是否启用SimApiHttpClient
|
||||
/// </summary>
|
||||
public bool EnableSimApiHttpClient { get; set; } = false;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 配置Job
|
||||
/// </summary>
|
||||
@@ -104,12 +96,19 @@ public class SimApiOptions
|
||||
|
||||
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
|
||||
|
||||
public SimApiAuthGateOptions SimApiAuthGateOptions { get; set; } = new();
|
||||
public SimApiAuthCenterOptions SimApiAuthCenterOptions { get; set; } = new();
|
||||
|
||||
public SimApiHttpClientOptions SimApiHttpClientOptions { 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)
|
||||
{
|
||||
options?.Invoke(SimApiExceptionOptions);
|
||||
@@ -140,8 +139,8 @@ public class SimApiOptions
|
||||
options?.Invoke(SimApiJobOptions);
|
||||
}
|
||||
|
||||
public void ConfigureSimApiAuthGate(Action<SimApiAuthGateOptions>? options = null)
|
||||
public void ConfigureSimApiAuthCenter(Action<SimApiAuthCenterOptions>? options = null)
|
||||
{
|
||||
options?.Invoke(SimApiAuthGateOptions);
|
||||
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;
|
||||
|
||||
using static SimApiError;
|
||||
|
||||
public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
|
||||
{
|
||||
/// <summary>
|
||||
@@ -21,5 +19,4 @@ public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
|
||||
auth.Logout(value!);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -31,11 +31,12 @@ public class SimApiCommonController : SimApiBaseController
|
||||
{ "App", SimApiUtil.AppVersion }
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取已登录用户信息
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost("/user/info"), SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
|
||||
[HttpPost, SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
|
||||
public SimApiLoginItem UserInfo() => LoginInfo;
|
||||
}
|
||||
@@ -65,7 +65,7 @@ public static class SimApiError
|
||||
/// <param name="code">错误代码</param>
|
||||
/// <param name="message">错误描述</param>
|
||||
public static void ErrorWhenNull([NotNull] object? condition, int code = 404,
|
||||
string message = "请求的资源不存在")
|
||||
string message = "")
|
||||
{
|
||||
ErrorWhen(condition == null, code, message);
|
||||
}
|
||||
|
||||
+14
-13
@@ -12,15 +12,15 @@ namespace SimApi.Helpers;
|
||||
|
||||
public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHttpClient>? logger = null)
|
||||
{
|
||||
public virtual string Server { get; init; } = apiOptions?.SimApiHttpClientOptions.Server ?? string.Empty;
|
||||
public virtual string AppId { get; init; } = apiOptions?.SimApiHttpClientOptions.AppId ?? string.Empty;
|
||||
public virtual string AppKey { get; init; } = apiOptions?.SimApiHttpClientOptions.AppKey ?? string.Empty;
|
||||
public virtual string Server { get; init; } = apiOptions?.SimApiHttpClientOptions.Server ?? string.Empty;
|
||||
public virtual string AppId { get; init; } = apiOptions?.SimApiHttpClientOptions.AppId ?? string.Empty;
|
||||
public virtual string AppKey { get; init; } = apiOptions?.SimApiHttpClientOptions.AppKey ?? string.Empty;
|
||||
|
||||
public virtual string SignName { get; init; } = "sign";
|
||||
public virtual string TimestampName { get; init; } = "timestamp";
|
||||
public virtual string NonceName { get; init; } = "nonce";
|
||||
public virtual string? AppIdName { get; init; } = "appId";
|
||||
public virtual string[] SignFields { get; init; } = [];
|
||||
public virtual string SignName { get; init; } = "sign";
|
||||
public virtual string TimestampName { get; init; } = "timestamp";
|
||||
public virtual string NonceName { get; init; } = "nonce";
|
||||
public virtual string? AppIdName { get; init; } = "appId";
|
||||
public virtual string[] SignFields { get; init; } = [];
|
||||
|
||||
/// <summary>
|
||||
/// 发起签名请求
|
||||
@@ -30,7 +30,7 @@ public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHt
|
||||
/// <param name="queries"></param>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
/// <returns></returns>
|
||||
public T? SignQuery<T>(string url, object? body = null, Dictionary<string, string>? queries = null)
|
||||
public T SignQuery<T>(string url, object? body = null, Dictionary<string, string>? queries = null)
|
||||
{
|
||||
url = Server + url;
|
||||
var queryUrl = SignFields.Aggregate(string.Empty,
|
||||
@@ -60,7 +60,7 @@ public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHt
|
||||
/// <param name="body"></param>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
/// <returns></returns>
|
||||
public T? AesQuery<T>(string url, object body)
|
||||
public T AesQuery<T>(string url, object body)
|
||||
{
|
||||
url = Server + url;
|
||||
if (!string.IsNullOrEmpty(AppIdName))
|
||||
@@ -83,7 +83,7 @@ public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHt
|
||||
/// <param name="queries"></param>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
/// <returns></returns>
|
||||
public T? AesSignQuery<T>(string url, object body, Dictionary<string, string>? queries = null)
|
||||
public T AesSignQuery<T>(string url, object body, Dictionary<string, string>? queries = null)
|
||||
{
|
||||
var req = new SimApiOneFieldRequest<string>
|
||||
{
|
||||
@@ -100,15 +100,16 @@ public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHt
|
||||
/// <typeparam name="T"></typeparam>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="SimApiException"></exception>
|
||||
private T? Query<T>(string url, object? req)
|
||||
private T Query<T>(string url, object? req)
|
||||
{
|
||||
var http = new HttpClient();
|
||||
logger?.LogDebug($"[HTTPCLIENT请求] {url}\n{SimApiUtil.Json(req)}\n");
|
||||
var resp = http.PostAsJsonAsync(url, req).Result;
|
||||
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;
|
||||
SimApiError.ErrorWhenNull(res, 500, "请求发生错误");
|
||||
SimApiError.ErrorWhen(res.Code != 200, res.Code, res.Message);
|
||||
return res.Data;
|
||||
return res.Data!;
|
||||
}
|
||||
}
|
||||
@@ -45,11 +45,15 @@ public class SimApiExceptionMiddleware(
|
||||
response = string.IsNullOrEmpty(simEx.Message)
|
||||
? new SimApiBaseResponse(simEx.Code)
|
||||
: new SimApiBaseResponse(simEx.Code, simEx.Message);
|
||||
if (context.Response.StatusCode == 404)
|
||||
{
|
||||
response.Message = "接口不存在";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
log.LogError(ex, "服务器异常");
|
||||
response = new SimApiBaseResponse(500, "服务器错误");
|
||||
log.LogError(ex, ex.Message);
|
||||
response = new SimApiBaseResponse(500);
|
||||
}
|
||||
|
||||
await ErrorResponseAsync(context, response);
|
||||
|
||||
+5
-5
@@ -12,13 +12,13 @@
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.22" />
|
||||
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.23" />
|
||||
<PackageReference Include="Hangfire.Console" Version="1.4.3"/>
|
||||
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.12.0"/>
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.9" />
|
||||
<PackageReference Include="Minio" Version="7.0.0" />
|
||||
<PackageReference Include="MQTTnet" Version="5.0.1.1416"/>
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.0" />
|
||||
<PackageReference Include="MQTTnet" Version="5.1.0.1559" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.2.3" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.2.3" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
+37
-16
@@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SimApi.Attributes;
|
||||
using SimApi.AuthGate;
|
||||
using SimApi.AuthSDK;
|
||||
using SimApi.Configurations;
|
||||
using SimApi.Interfaces;
|
||||
using SimApi.Logger;
|
||||
@@ -331,9 +331,12 @@ public static class SimApiExtensions
|
||||
|
||||
if (simApiOptions.EnableSimApiAuthGate)
|
||||
{
|
||||
builder.AddSingleton<SimApiAuthGateClient>();
|
||||
builder.AddSingleton<SimApiAuthGate>();
|
||||
builder.AddSingleton<SimApiIam>();
|
||||
builder.AddSingleton<SimApiAuthClient>();
|
||||
builder.AddSingleton<SimApiAuthCenter>();
|
||||
if (simApiOptions.SimApiAuthCenterOptions.UseIam)
|
||||
{
|
||||
builder.AddSingleton<SimApiAuthIam>();
|
||||
}
|
||||
}
|
||||
|
||||
builder.AddSingleton(simApiOptions);
|
||||
@@ -422,16 +425,16 @@ public static class SimApiExtensions
|
||||
if (options.EnableSimApiAuthGate)
|
||||
{
|
||||
logger.LogInformation("开始配置SimApiAuthGate...");
|
||||
if (string.IsNullOrEmpty(options.SimApiAuthGateOptions.AppId) ||
|
||||
string.IsNullOrEmpty(options.SimApiAuthGateOptions.AppKey))
|
||||
if (string.IsNullOrEmpty(options.SimApiAuthCenterOptions.AppId) ||
|
||||
string.IsNullOrEmpty(options.SimApiAuthCenterOptions.AppKey))
|
||||
{
|
||||
logger.LogCritical("必须配置AuthGate的AppId和AppKey才能启用SimApiAuthGate");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (options.SimApiAuthGateOptions.UseMiddleware)
|
||||
if (options.SimApiAuthCenterOptions.UseMiddleware)
|
||||
{
|
||||
builder.UseMiddleware<SimApiAuthGateMiddleware>();
|
||||
builder.UseMiddleware<SimApiAuthCenterMiddleware>();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -440,17 +443,13 @@ public static class SimApiExtensions
|
||||
{
|
||||
logger.LogInformation("开始配置SimApiAuth...");
|
||||
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
|
||||
{
|
||||
controller = "SimApiCommon",
|
||||
@@ -458,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)
|
||||
{
|
||||
logger.LogInformation("开始配置SimApiDoc...");
|
||||
|
||||
Reference in New Issue
Block a user