Merge pull request #6 from AshleyPoole/automatic-analyzer

Merge automatic-analyzer improvements into master

Author: AshleyPoole

SSLLabsApiWrapper/Domain/ResponsePopulation.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using Newtonsoft.Json;
 using SSLLabsApiWrapper.Models;
 using SSLLabsApiWrapper.Models.Response;
@@ -23,7 +22,7 @@ public Info InfoModel(WebResponseModel webResponse, Info infoModel)
 
 			infoModel = JsonConvert.DeserializeObject<Info>(webResponse.Payloay, JsonSerializerSettings);
 			infoModel.Header = PopulateHeader(infoModel.Header, webResponse);
-			infoModel.Wrapper.ApiCommandUrl = webResponse.Url;
+			infoModel.Wrapper = PopulateWrapper(infoModel.Wrapper, webResponse);
 
 			return infoModel;
 		}
@@ -32,7 +31,7 @@ public Analyze AnalyzeModel(WebResponseModel webResponse, Analyze analyzeModel)
 		{
 			analyzeModel = JsonConvert.DeserializeObject<Analyze>(webResponse.Payloay, JsonSerializerSettings);
 			analyzeModel.Header = PopulateHeader(analyzeModel.Header, webResponse);
-			analyzeModel.Wrapper.ApiCommandUrl = webResponse.Url;
+			analyzeModel.Wrapper = PopulateWrapper(analyzeModel.Wrapper, webResponse);
 
 			if (analyzeModel.status == "ERROR") { analyzeModel.Errors.Add(new Error() { message = analyzeModel.statusMessage }); }
 
@@ -43,7 +42,7 @@ public Endpoint EndpointModel(WebResponseModel webResponse, Endpoint endpointMod
 		{
 			endpointModel = JsonConvert.DeserializeObject<Endpoint>(webResponse.Payloay, JsonSerializerSettings);
 			endpointModel.Header = PopulateHeader(endpointModel.Header, webResponse);
-			endpointModel.Wrapper.ApiCommandUrl = webResponse.Url;
+			endpointModel.Wrapper = PopulateWrapper(endpointModel.Wrapper, webResponse);
 
 			return endpointModel;
 		}
@@ -52,7 +51,7 @@ public StatusCodes StatusCodesModel(WebResponseModel webResponse, StatusCodes st
 		{
 			statusCodes = JsonConvert.DeserializeObject<StatusCodes>(webResponse.Payloay, JsonSerializerSettings);
 			statusCodes.Header = PopulateHeader(statusCodes.Header, webResponse);
-			statusCodes.Wrapper.ApiCommandUrl = webResponse.Url;
+			statusCodes.Wrapper = PopulateWrapper(statusCodes.Wrapper, webResponse);
 
 			return statusCodes;
 		}
@@ -64,5 +63,13 @@ public Header PopulateHeader(Header header, WebResponseModel webResponse)
 
 			return header;
 		}
+
+		public Wrapper PopulateWrapper(Wrapper wrapper, WebResponseModel webResponse)
+		{
+			wrapper.ApiCommandUrl = webResponse.Url;
+			wrapper.ApiRawResponse = webResponse.Payloay;
+
+			return wrapper;
+		}
 	}
 }

SSLLabsApiWrapper/Models/Response/BaseSubModels/Wrapper.cs

@@ -0,0 +1,9 @@
+namespace SSLLabsApiWrapper.Models.Response.BaseSubModels
+{
+	public class Wrapper
+	{
+		public int ApiPassCount { get; set; }
+		public string ApiCommandUrl { get; set; }
+		public string ApiRawResponse { get; set; }
+	}
+}