Merge pull request #28 from titanium007/breaking-change

Breaking change
justcoding121 · Jan 6, 2016 · e888c00 · e888c00
2 parents 0cc53a6 + cff7a93
commit e888c00
Show file tree

Hide file tree

Showing 19 changed files with 803 additions and 453 deletions.
diff --git a/.build/default.ps1 b/.build/default.ps1
@@ -23,6 +23,10 @@ if(!$Configuration) { $Configuration = "Release" }
 if(!$Version) { $Version = $env:APPVEYOR_BUILD_VERSION }
 if(!$Version) { $Version = "1.0.$BuildNumber" }
 
+if(!$Branch) { $Branch = $env:APPVEYOR_REPO_BRANCH }
+if(!$Branch) { $Branch = "local" }
+if($Branch -eq "release" ) { $Version = "$Version-beta" }
+
 Import-Module "$Here\Common" -DisableNameChecking
 
 $NuGet = Join-Path $SolutionRoot ".nuget\nuget.exe"

diff --git a/README.md b/README.md
@@ -58,12 +58,12 @@ Sample request and response event handlers
 		//Test On Request, intercept requests
         public void OnRequest(object sender, SessionEventArgs e)
         {
-           Console.WriteLine(e.RequestURL);
-		   
+            Console.WriteLine(e.ProxySession.Request.RequestUrl);
+
             //read request headers
-            var requestHeaders = e.RequestHeaders;
+            var requestHeaders = e.ProxySession.Request.RequestHeaders;
 
-            if ((e.RequestMethod.ToUpper() == "POST" || e.RequestMethod.ToUpper() == "PUT") && e.RequestContentLength > 0)
+            if ((e.RequestMethod.ToUpper() == "POST" || e.RequestMethod.ToUpper() == "PUT"))
             {
                 //Get/Set request body bytes
                 byte[] bodyBytes = e.GetRequestBody();
@@ -78,18 +78,19 @@ Sample request and response event handlers
             //To cancel a request with a custom HTML content
             //Filter URL
 
-            if (e.RequestURL.Contains("google.com"))
+            if (e.ProxySession.Request.RequestUrl.Contains("google.com"))
             {
                 e.Ok("<!DOCTYPE html><html><body><h1>Website Blocked</h1><p>Blocked by titanium web proxy.</p></body></html>");
             }
         }
 
 	 public void OnResponse(object sender, SessionEventArgs e)
 	{
-            //read response headers
-            var responseHeaders = e.ResponseHeaders;
+            ////read response headers
+            var responseHeaders = e.ProxySession.Response.ResponseHeaders;
+
 
-            if (e.ResponseStatusCode == HttpStatusCode.OK)
+            if (e.ResponseStatusCode == "200")
             {
                 if (e.ResponseContentType.Trim().ToLower().Contains("text/html"))
                 {

diff --git a/Titanium.Web.Proxy.Test/App.config b/Titanium.Web.Proxy.Test/App.config
@@ -4,4 +4,17 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
 </configuration>
diff --git a/Titanium.Web.Proxy.Test/ProxyTestController.cs b/Titanium.Web.Proxy.Test/ProxyTestController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 using Titanium.Web.Proxy.EventArguments;
 
 namespace Titanium.Web.Proxy.Test
@@ -43,10 +44,10 @@ public void Stop()
         //Read browser URL send back to proxy by the injection script in OnResponse event
         public void OnRequest(object sender, SessionEventArgs e)
         {
-            Console.WriteLine(e.RequestUrl);
+            Console.WriteLine(e.ProxySession.Request.RequestUrl);
 
             ////read request headers
-            //var requestHeaders = e.RequestHeaders;
+            //var requestHeaders = e.ProxySession.Request.RequestHeaders;
 
             //if ((e.RequestMethod.ToUpper() == "POST" || e.RequestMethod.ToUpper() == "PUT"))
             //{
@@ -63,7 +64,7 @@ public void OnRequest(object sender, SessionEventArgs e)
             ////To cancel a request with a custom HTML content
             ////Filter URL
 
-            //if (e.RequestURL.Contains("google.com"))
+            //if (e.ProxySession.Request.RequestUrl.Contains("google.com"))
             //{
             //    e.Ok("<!DOCTYPE html><html><body><h1>Website Blocked</h1><p>Blocked by titanium web proxy.</p></body></html>");
             //}
@@ -74,10 +75,10 @@ public void OnRequest(object sender, SessionEventArgs e)
         public void OnResponse(object sender, SessionEventArgs e)
         {
             ////read response headers
-            //var responseHeaders = e.ResponseHeaders;
+            var responseHeaders = e.ProxySession.Response.ResponseHeaders;
 
 
-            //if (e.ResponseStatusCode == HttpStatusCode.OK)
+            //if (e.ResponseStatusCode == "200")
             //{
             //    if (e.ResponseContentType.Trim().ToLower().Contains("text/html"))
             //    {