last ...

2026-10-06 17:47:27 +03:30
parent e379faaa07
commit 48395457e6
11 changed files with 606 additions and 84 deletions
@@ -194,7 +194,7 @@ namespace xIds.Interfaces
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        Task<XApiKeyDto> UpdateApiKeyAsync(
-            int id,
+            Guid id,
            XApiKeyDto item,
            XUserClaimsInfoDto userInfo = null,
            CancellationToken cancellationToken = default
@@ -209,7 +209,7 @@ namespace xIds.Interfaces
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        Task<XApiKeyDto> RemoveApiKeyAsync(
-            int id,
+            Guid id,
            bool softDelete = true,
            XUserClaimsInfoDto userInfo = null,
            CancellationToken cancellationToken = default
@@ -225,7 +225,7 @@ namespace xIds.Interfaces
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        Task<XApiKeyDto> GetApiKeyAsync(
-            int id,
+            Guid id,
            bool ignoreSoftDeleteds = true,
            XUserClaimsInfoDto userInfo = null,
            Func<IQueryable<XApiKey>, IIncludableQueryable<XApiKey, object>> includeBuilder = null,
@@ -348,7 +348,7 @@ namespace xIds.Interfaces
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        Task<XApiKeyUsageDto> UpdateApiKeyUsageAsync(
-            int id,
+            long id,
            XApiKeyUsageDto item,
            XUserClaimsInfoDto userInfo = null,
            CancellationToken cancellationToken = default
@@ -363,7 +363,7 @@ namespace xIds.Interfaces
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        Task<XApiKeyUsageDto> RemoveApiKeyUsageAsync(
-            int id,
+            long id,
            bool softDelete = true,
            XUserClaimsInfoDto userInfo = null,
            CancellationToken cancellationToken = default
@@ -379,7 +379,7 @@ namespace xIds.Interfaces
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        Task<XApiKeyUsageDto> GetApiKeyUsageAsync(
-            int id,
+            long id,
            bool ignoreSoftDeleteds = true,
            XUserClaimsInfoDto userInfo = null,
            Func<IQueryable<XApiKeyUsage>, IIncludableQueryable<XApiKeyUsage, object>> includeBuilder = null,
@@ -547,12 +547,14 @@ namespace xIds.Interfaces
        /// </summary>
        /// <param name="apiKey"></param>
        /// <param name="clientIP"></param>
+        /// <param name="requiredScope"></param>
        /// <param name="userInfo"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
-        Task<bool> ValidateApiKey(
+        Task<XApiKeyValidationResult> ValidateApiKey(
            string apiKey,
            string clientIP,
+            string requiredScope = null,
            XUserClaimsInfoDto userInfo = null,
            CancellationToken cancellationToken = default
        );
@@ -632,7 +634,7 @@ namespace xIds.Interfaces
        /// <param name="sources"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
-        Task<XApiKeyDto> EnrichRangeAsync(
+        Task<IEnumerable<XApiKeyDto>> EnrichRangeAsync(
            IEnumerable<XApiKey> sources,
            CancellationToken cancellationToken = default
        );
@@ -643,7 +645,7 @@ namespace xIds.Interfaces
        /// <param name="sources"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
-        Task<XApiKeyDto> EnrichRangeAsync(
+        Task<IEnumerable<XApiKeyDto>> EnrichRangeAsync(
            IEnumerable<XApiKeyDto> sources,
            CancellationToken cancellationToken = default
        );
@@ -654,7 +656,7 @@ namespace xIds.Interfaces
        /// <param name="sources"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
-        Task<XApiKeyUsageDto> EnrichRangeAsync(
+        Task<IEnumerable<XApiKeyUsageDto>> EnrichRangeAsync(
            IEnumerable<XApiKeyUsage> sources,
            CancellationToken cancellationToken = default
        );
@@ -665,7 +667,7 @@ namespace xIds.Interfaces
        /// <param name="sources"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
-        Task<XApplicationDto> EnrichRangeAsync(
+        Task<IEnumerable<XApplicationDto>> EnrichRangeAsync(
            IEnumerable<XApplication> sources,
            CancellationToken cancellationToken = default
        );
@@ -676,7 +678,7 @@ namespace xIds.Interfaces
        /// <param name="sources"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
-        Task<XApiKeyUsageDto> EnrichRangeAsync(
+        Task<IEnumerable<XApiKeyUsageDto>> EnrichRangeAsync(
            IEnumerable<XApiKeyUsageDto> sources,
            CancellationToken cancellationToken = default
        );
@@ -687,7 +689,7 @@ namespace xIds.Interfaces
        /// <param name="sources"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
-        Task<XApplicationDto> EnrichRangeAsync(
+        Task<IEnumerable<XApplicationDto>> EnrichRangeAsync(
            IEnumerable<XApplicationDto> sources,
            CancellationToken cancellationToken = default
        );