Get proxy now passes through web exceptions

srajko · srajko · commit e8279bfa4ef9 · 2012-09-24T16:59:36.000-07:00
[otf:9364]
diff --git a/WebApp/Controllers/ApiController.cs b/WebApp/Controllers/ApiController.cs
@@ -6,6 +6,8 @@
 using OnTimeApi;
 using System.Net;
 using APIExample.FormsAuth;
+using System.IO;
+using System.Text;
 
 namespace APIExample.Controllers
{
@@ -22,14 +24,30 @@ public ActionResult Get(string resource)
 			// make an API call to OnTime
 			var OnTime = GetOnTime();
 
-			var webClient = new WebClient();
+			var request = WebRequest.Create(OnTime.GetUrl(resource));
 
-			var resultString = webClient.DownloadString(OnTime.GetUrl(resource));
-			Response.Write(resultString);
-			Response.ContentType = "application/json";
-			Response.ContentEncoding = System.Text.Encoding.UTF8;
-			Response.Charset = "UTF-8";
+			Stream resultStream;
+			HttpWebResponse response;
+			try
+			{
+				response = (HttpWebResponse)request.GetResponse();
+			} catch (WebException e)
+			{
+				response = (HttpWebResponse)e.Response;
+			}
 
+			resultStream = response.GetResponseStream();
+			
+			Response.ContentType = response.ContentType;
+			try
+			{
+				Response.ContentEncoding = Encoding.GetEncoding(response.ContentEncoding);
+			} catch(Exception){}
+
+			Response.Charset = response.CharacterSet;
+			
+			resultStream.CopyTo(Response.OutputStream);
+			
 			return null;
 		}
 

-Original file line number
+Diff line change
 usingOnTimeApi;
 usingSystem.Net;
 usingAPIExample.FormsAuth;
 +usingSystem.IO;
 +usingSystem.Text;
 namespaceAPIExample.Controllers
+{
 // make an API call to OnTime
 varOnTime=GetOnTime();
 -varwebClient=newWebClient();
 +varrequest=WebRequest.Create(OnTime.GetUrl(resource));
 -varresultString=webClient.DownloadString(OnTime.GetUrl(resource));
 -Response.Write(resultString);
 -Response.ContentType="application/json";
 -Response.ContentEncoding=System.Text.Encoding.UTF8;
 -Response.Charset="UTF-8";
 +StreamresultStream;
 +HttpWebResponseresponse;
 +try
 +{
 +response=(HttpWebResponse)request.GetResponse();
 +}catch(WebExceptione)
 +{
 +response=(HttpWebResponse)e.Response;
 +}
 +resultStream=response.GetResponseStream();
++
 +Response.ContentType=response.ContentType;
 +try
 +{
 +Response.ContentEncoding=Encoding.GetEncoding(response.ContentEncoding);
 +}catch(Exception){}
++
 +Response.Charset=response.CharacterSet;
++
 +resultStream.CopyTo(Response.OutputStream);
++
 returnnull;
+}