refactoring api key parser

Author: david-schrenker

…onApi/Core/Enum/ApiKeyParseResultCode.cs …s/InjectionApi/Core/ApiKeyParseResult.cssrc/SocketLabs/InjectionApi/Core/Enum/ApiKeyParseResultCode.cs renamed to src/SocketLabs/InjectionApi/Core/ApiKeyParseResult.cs src/SocketLabs/InjectionApi/Core/Enum/ApiKeyParseResultCode.cs renamed to src/SocketLabs/InjectionApi/Core/ApiKeyParseResult.cs

@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace SocketLabs.InjectionApi.Core.Enum
+namespace SocketLabs.InjectionApi.Core
 {
     /// <summary>
     /// A code describing the result of an attempt to parse an Api key.
     /// </summary>
-    public enum ApiKeyParseResultCode
+    public enum ApiKeyParseResult
     {
 
         /// <summary>

src/SocketLabs/InjectionApi/Core/ApiKeyParser.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using SocketLabs.InjectionApi.Core.Enum;
-using SocketLabs.InjectionApi.Core.Models;
 
 namespace SocketLabs.InjectionApi.Core
 {
@@ -18,37 +14,21 @@ public class ApiKeyParser : IApiKeyParser
         /// <returns>An ApiKeyParseResult with the api key data and result code from the parse.</returns>
         public ApiKeyParseResult Parse(string wholeApiKey)
         {
-            var key = new ApiKey { IsValidFormat = false };
             if (string.IsNullOrWhiteSpace(wholeApiKey))
-                return new ApiKeyParseResult { ApiKey = null, ResultCode = ApiKeyParseResultCode.InvalidEmptyOrWhitespace };
-
-            //if (!wholeApiKey.StartsWith("SL.", StringComparison.InvariantCulture))
-            //    return new ApiKeyParseResult {ApiKey = null, ResultCode = ApiKeyParseResultCode.InvalidMissingProperPrefix};
-
+                return ApiKeyParseResult.InvalidEmptyOrWhitespace;
+            
             //extract public part
             var maxCount = Math.Min(50, wholeApiKey.Length);
             var publicPartEnd = wholeApiKey.IndexOf('.', startIndex: 0, maxCount); //don't check more than 50 chars
             if (publicPartEnd == -1)
-                return new ApiKeyParseResult { ApiKey = null, ResultCode = ApiKeyParseResultCode.InvalidUnableToExtractPublicPart };
-            var publicPart = wholeApiKey.Substring(0, publicPartEnd);
-
-
+                return ApiKeyParseResult.InvalidUnableToExtractPublicPart;
+            
             //now extract the private part
             if (wholeApiKey.Length <= publicPartEnd + 1)
-                return new ApiKeyParseResult { ApiKey = null, ResultCode = ApiKeyParseResultCode.InvalidUnableToExtractSecretPart };
-            var privatePart = wholeApiKey.Substring(publicPartEnd + 1);
+                return ApiKeyParseResult.InvalidUnableToExtractSecretPart;
 
             //success
-            return new ApiKeyParseResult
-            {
-                ApiKey = new ApiKey
-                {
-                    PublicPart = publicPart,
-                    PrivatePart = privatePart,
-                    IsValidFormat = true,
-                },
-                ResultCode = ApiKeyParseResultCode.Success
-            };
+            return ApiKeyParseResult.Success;
         }
     }
 }

src/SocketLabs/InjectionApi/Core/IApiKeyParser.cs

@@ -1,8 +1,4 @@
-using SocketLabs.InjectionApi.Core.Enum;
-using SocketLabs.InjectionApi.Core.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
+
 
 namespace SocketLabs.InjectionApi.Core
 {

src/SocketLabs/InjectionApi/Core/Models/ApiKey.cs

@@ -7,7 +7,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using SocketLabs.InjectionApi.Core;
-using SocketLabs.InjectionApi.Core.Enum;
 using SocketLabs.InjectionApi.Message;
 
 namespace SocketLabs.InjectionApi
@@ -234,7 +233,7 @@ public async Task<SendResponse> SendAsync(IBasicMessage message, CancellationTok
             var apiKeyParser = new ApiKeyParser();
             var parseResult = apiKeyParser.Parse(_apiKey);
 
-            if (parseResult.ResultCode == ApiKeyParseResultCode.Success)
+            if (parseResult == ApiKeyParseResult.Success)
             {
                 _httpClient.DefaultRequestHeaders.Authorization =
                     new AuthenticationHeaderValue("Bearer", _apiKey);
@@ -293,12 +292,11 @@ public async Task<SendResponse> SendAsync(IBulkMessage message, CancellationToke
 
             validationResult = validator.ValidateMessage(message);
             if (validationResult.Result != SendResult.Success) return validationResult;
-
-
+            
             var apiKeyParser = new ApiKeyParser();
             var parseResult = apiKeyParser.Parse(_apiKey);
 
-            if (parseResult.ResultCode == ApiKeyParseResultCode.Success)
+            if (parseResult == ApiKeyParseResult.Success)
             {
                 _httpClient.DefaultRequestHeaders.Authorization =
                     new AuthenticationHeaderValue("Bearer", _apiKey);