Merge pull request #167 from SpectraLogic/ESCP-5280-response-status-code

ESCP-5280: Bump version, accept OK and Created for token

Author: david-limbach

SpectraLogic.SpectraRioBrokerClient/Properties/AssemblyInfo.cs

@@ -47,8 +47,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.2")]
-[assembly: AssemblyFileVersion("3.2.2")]
+[assembly: AssemblyVersion("3.2.3")]
+[assembly: AssemblyFileVersion("3.2.3")]
 
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
 [assembly: InternalsVisibleTo("SpectraLogic.SpectraRioBrokerClient.Test")]

SpectraLogic.SpectraRioBrokerClient/ResponseParsers/Authentication/CreateTokenResponseParser.cs

@@ -25,7 +25,8 @@ internal class CreateTokenResponseParser : IResponseParser<IToken>
 
         public IToken Parse(IHttpWebResponse response)
         {
-            return Parser<BearerToken>.Parse(response, HttpStatusCode.Created);
+            HttpStatusCode[] expected = { HttpStatusCode.Created, HttpStatusCode.OK };
+            return Parser<BearerToken>.Parse(response, expected);
         }
 
         #endregion Public Methods

SpectraLogic.SpectraRioBrokerClient/ResponseParsers/Parser.cs

@@ -45,9 +45,9 @@ public static T Parse(IHttpWebResponse response, params HttpStatusCode[] expecte
 
                     var requestId = response.Headers.GetRequestIdFromHeader();
 #if DEBUG
-                    Log.Debug($"Request: {requestId}\n{responseString.JsonFormat()}");
+                    Log.Debug($"Request: id='{requestId}' status='{response.StatusCode}'\n{responseString.JsonFormat()}");
 #else
-                    Log.Debug($"Request: {requestId} {response.StatusCode}");
+                    Log.Debug($"Request: id='{requestId}' status='{response.StatusCode}'");
 #endif
                     return JsonConvert.DeserializeObject<T>(responseString);
                 }

SpectraLogic.SpectraRioBrokerClient/Utils/ResponseParseUtils.cs

@@ -40,6 +40,11 @@ internal static class ResponseParseUtils
         internal static void HandleStatusCode(IHttpWebResponse response, params HttpStatusCode[] expectedStatusCodes)
         {
             var actualStatusCode = response.StatusCode;
+            Log.Debug($"HandleStatusCode: actual='{actualStatusCode}'");
+            for (int i=0; i<expectedStatusCodes.Length; i++)
+            {
+                Log.Debug($"HandleStatusCode: expected {i}: {expectedStatusCodes[i]}");
+            }
             if (expectedStatusCodes.Contains(actualStatusCode))
             {
                 return;
@@ -57,7 +62,7 @@ private static ErrorResponse GetErrorResponse(IHttpWebResponse response)
                 var responseString = reader.ReadToEnd();
 
                 var requestId = response.Headers.GetRequestIdFromHeader();
-                Log.Debug($"Request: {requestId}\n{responseString}");
+                Log.Debug($"Request: id='{requestId}' status='{response.StatusCode}'\n{responseString}");
 
                 switch (response.StatusCode)
                 {