last ...

Providers/XApplicationProvider/XApplicationProvider+Custom.cs

@@ -8,7 +8,8 @@ using xExceptions.Constants;
 using System.Threading.Tasks;
 using xIdentityModels.Models;
 using System.Collections.Generic;
-using System.Security.Cryptography;
+using xIdentityModels.Extensions;
+using Microsoft.EntityFrameworkCore;
 
 namespace xIds.Providers
 {
@@ -85,7 +86,7 @@ namespace xIds.Providers
 
             //
             // Generate New Key ...
-            (string plainKey, string keyHash, string prefix) = XApiKeyHelper.Generate();
+            (string plainKey, string keyHash, string prefix) = XApiKeyHelper.Generate(apiKeyConfiguration.ApiKeyPrefix);
             var expireAt = DateTime.UtcNow.Add(expiration.Value);
 
             //
@@ -112,7 +113,7 @@ namespace xIds.Providers
             //
             // Add Item to Database ...
             result = await AddApiKeyAsync(
-                item: item,
+                item: result,
                 userInfo: userInfo,
                 cancellationToken: cancellationToken
             );
@@ -303,7 +304,7 @@ namespace xIds.Providers
             {
                 XException.NotAllowed.Throw();
             }
-            
+
             //
             var result = await FindManyApiKeyAsync(
                 userInfo: userInfo,
@@ -323,18 +324,158 @@ namespace xIds.Providers
         /// </summary>
         /// <param name="apiKey"></param>
         /// <param name="clientIP"></param>
+        /// <param name="requiredScope"></param>
         /// <param name="userInfo"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task<bool> ValidateApiKey(
+        public async Task<XApiKeyValidationResult> ValidateApiKey(
             string apiKey,
             string clientIP,
+            string requiredScope = null,
             XUserClaimsInfoDto userInfo = null,
             CancellationToken cancellationToken = default
         )
         {
             //
-                        
+            var result = new XApiKeyValidationResult();
+
+            //
+            // Validate ...
+            var isValid =
+                !apiKey.IsNullOrEmpty() &&
+                !clientIP.IsNullOrEmpty();
+            if (!isValid)
+            {
+                return result;
+            }
+
+            //
+            // Detect Specified Api Key ...
+            var apiKeyHash = XApiKeyHelper.ComputeHash(apiKey);
+            var keyModel = await dbContext.ApiKeys
+                .FirstOrDefaultAsync(
+                    ak => ak.KeyHash == apiKeyHash,
+                    cancellationToken: cancellationToken
+                );
+            isValid = !keyModel.IsNullOrDefault();
+            if (!isValid)
+            {
+                //
+                result.Errors.Add("ApiKey not found ...");
+                return result;
+            }
+
+            //
+            // Here we Have to Parse Allowed Ips and Scopes ...
+            var allowedIps = (keyModel.AllowedIPs ?? string.Empty)
+                .ParseListString<string>();
+            var allowedScopes = (keyModel.AllowedScopes ?? string.Empty)
+                .FromJSON<IEnumerable<string>>();
+            result.Scopes = [..allowedScopes];
+            
+            //
+            // Check Application is Exists and Active ...
+            var application = await dbContext.Applications
+                .FirstOrDefaultAsync(x => x.Id == keyModel.ApplicationId);
+            if (!application.IsNullOrDefault())
+            {
+                result.OwnerId = application.OwnerId;
+                result.ApplicationId = application.Id;
+            }
+
+            //
+            // Check Application is Exists and Active or not ...
+            var isApplicationActive =
+                //
+                // Application Exists ...
+                !application.IsNullOrDefault() &&
+                //
+                // Check Application is Active ...
+                application.IsActive
+                //
+                ;
+            if (!isApplicationActive)
+            {
+                result.Errors.Add("Related Application is Inactive ...");
+            }
+
+            //
+            // Check Key is Active or not ...
+            var isKeyActive =
+                //
+                // Check Api Key is Active ...
+                // Not Revoked ...
+                // Not Expired ...
+                keyModel.IsActive()
+                //
+                ;
+            if (!isKeyActive)
+            {
+                //
+                if (keyModel.IsExpired())
+                {
+                    result.Errors.Add("ApiKey is Expired ...");
+                }
+
+                //
+                if (keyModel.IsRevoked())
+                {
+                    result.Errors.Add("ApiKey is Revoked ...");
+                }
+            }
+
+            //
+            // Checking Rate Limit ...
+            var isRateLimitPassed = CheckRateLimit(keyModel.Id, keyModel.RateLimitPerMinute);
+            if (!isRateLimitPassed)
+            {
+                result.Errors.Add("ApiKey Rate Limit Reached ...");
+            }
+
+            //
+            // Audit Log ...
+
+            //
+            // Check Scope and IP is Valid or not ...
+            var isIpValid =
+                !allowedIps.HasChild() ||
+                    allowedIps.Contains(clientIP);
+            var isScopeValid =
+            !allowedScopes.HasChild() ||
+                    requiredScope.IsNullOrEmpty() ||
+                    allowedScopes.Contains(requiredScope);
+            var isScopeIpValid =
+                isIpValid &&
+                isScopeValid
+                ;
+            if (!isScopeIpValid)
+            {
+                //
+                if (!isIpValid)
+                {
+                    result.Errors.Add("Client IP not Allowed to Use Resource ...");
+                }
+
+                //
+                if (!isScopeValid)
+                {
+                    result.Errors.Add("Required Scoped is Invalid ...");
+                }
+            }
+
+            //
+            isValid =
+                isKeyActive &&
+                isScopeIpValid &&
+                isRateLimitPassed &&
+                isApplicationActive;
+            if (isValid)
+            {
+                result.Errors.Clear();
+            }
+
+            //
+            return result;
         }
         #endregion        
     }