fix

AuthSDK/SimApiAuthCenter.cs

@@ -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}&timestamp={timestamp}&nonce={nonce}&sign={sign}";
+        var url = $"{Client.Server}/api/auth/sign/verify?appId={appId}&timestamp={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/login/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,
+            Server = Client.Server,
-            FullUrl = $"{simapi.Server}/auth?code={code}"
+            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/login/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,
+            Server = Client.Server,
-            FullUrl = $"{simapi.Server}/confirm?code={code}"
+            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, "安全确认场景不匹配");

AuthSDK/SimApiAuthCenterDto.cs

@@ -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 required string Id { get; set; }
-        public string Name { 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; } = [];
+    }
 }

AuthSDK/SimApiAuthCenterMiddleware.cs

@@ -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))
             {

AuthSDK/SimApiAuthClient.cs

@@ -2,12 +2,12 @@
 using SimApi.Configurations;
 using SimApi.Helpers;
 
-namespace SimApi.AuthGate;
+namespace SimApi.AuthSDK;
 
-public class SimApiAuthGateClient(SimApiOptions apiOptions, ILogger<SimApiAuthGateClient> logger)
+public class SimApiAuthClient(SimApiOptions apiOptions, ILogger<SimApiAuthClient> logger)
     : SimApiHttpClient(apiOptions, logger)
 {
-    public override string Server { get; init; } = apiOptions.SimApiAuthGateOptions.Server ?? string.Empty;
+    public override string Server { get; init; } = apiOptions.SimApiAuthCenterOptions.Server ?? string.Empty;
-    public override string AppId { get; init; } = apiOptions.SimApiAuthGateOptions.AppId ?? string.Empty;
+    public override string AppId { get; init; } = apiOptions.SimApiAuthCenterOptions.AppId ?? string.Empty;
-    public override string AppKey { get; init; } = apiOptions.SimApiAuthGateOptions.AppKey ?? string.Empty;
+    public override string AppKey { get; init; } = apiOptions.SimApiAuthCenterOptions.AppKey ?? string.Empty;
 }

AuthSDK/SimApiAuthIam.cs

@@ -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, "没有该权限");
     }
 }

AuthSDK/SimApiAuthIamDto.cs

@@ -1,6 +1,6 @@
-namespace SimApi.AuthGate;
+namespace SimApi.AuthSDK;
 
-public class SimApiIamDto
+public class SimApiAuthIamDto
 {
     public class PermissionItem
     {

Configurations/SimApiAuthCenterOptions.cs

@@ -1,6 +1,6 @@
 namespace SimApi.Configurations;
 
-public class SimApiAuthGateOptions
+public class SimApiAuthCenterOptions
 {
     public string? Server { get; set; }
     public string? AppId { get; set; }

Configurations/SimApiOptions.cs

@@ -96,7 +96,7 @@ 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();
 
@@ -139,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);
     }
 }

Controllers/SimApiAuthController.cs

@@ -19,11 +19,4 @@ public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
             auth.Logout(value!);
         }
     }
-
-    /// <summary>
-    /// 获取已登录用户信息
-    /// </summary>
-    /// <returns></returns>
-    [HttpPost, SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
-    public SimApiLoginItem UserInfo() => LoginInfo;
 }

Controllers/SimApiCommonController.cs

@@ -31,4 +31,12 @@ public class SimApiCommonController : SimApiBaseController
             { "App", SimApiUtil.AppVersion }
         };
     }
+    
+    
+    /// <summary>
+    /// 获取已登录用户信息
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost, SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
+    public SimApiLoginItem UserInfo() => LoginInfo;
 }

Helpers/SimApiError.cs

@@ -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);
     }

Helpers/SimApiHttpClient.cs

@@ -106,6 +106,7 @@ public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHt
         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);

Middlewares/SimApiExceptionMiddleware.cs

@@ -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, "服务器异常");
+                log.LogError(ex, ex.Message);
-                response = new SimApiBaseResponse(500, "服务器错误");
+                response = new SimApiBaseResponse(500);
             }
 
             await ErrorResponseAsync(context, response);

SimApiExtensions.cs

@@ -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,11 +331,11 @@ public static class SimApiExtensions
 
         if (simApiOptions.EnableSimApiAuthGate)
         {
-            builder.AddSingleton<SimApiAuthGateClient>();
+            builder.AddSingleton<SimApiAuthClient>();
-            builder.AddSingleton<SimApiAuthGate>();
+            builder.AddSingleton<SimApiAuthCenter>();
-            if (simApiOptions.SimApiAuthGateOptions.UseIam)
+            if (simApiOptions.SimApiAuthCenterOptions.UseIam)
             {
-                builder.AddSingleton<SimApiIam>();
+                builder.AddSingleton<SimApiAuthIam>();
             }
         }
 
@@ -425,16 +425,16 @@ public static class SimApiExtensions
         if (options.EnableSimApiAuthGate)
         {
             logger.LogInformation("开始配置SimApiAuthGate...");
-            if (string.IsNullOrEmpty(options.SimApiAuthGateOptions.AppId) ||
+            if (string.IsNullOrEmpty(options.SimApiAuthCenterOptions.AppId) ||
-                string.IsNullOrEmpty(options.SimApiAuthGateOptions.AppKey))
+                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>();
                 }
             }
         }
@@ -463,7 +463,7 @@ public static class SimApiExtensions
             builder.MapControllerRoute(name: "UserInfo", pattern: options.SimApiRouteOptions.UserInfoRoute,
                 defaults: new
                 {
-                    controller = "SimApiAuth",
+                    controller = "SimApiCommon",
                     action = "UserInfo"
                 });
         }