Merge branch 'master' of https://github.com/RallyTools/RallyRestToolk…

…itFor.NET
RallyTools · Nov 7, 2013 · 0f13faa · 0f13faa
2 parents eb378d8 + af41a3f
commit 0f13faa
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,7 +50,7 @@ local.properties
 *.meta
 *.obj
 *.pch
-*.pdb
+#*.pdb
 *.pgc
 *.pgd
 *.rsp

diff --git a/Rally.RestApi.Test/SSOHelperTest.cs b/Rally.RestApi.Test/SSOHelperTest.cs
@@ -80,7 +80,6 @@ public void ParseSSOTokenPage()
             Assert.AreEqual(cookie.Value, "khkjhkhkhkhkjhh");
             Assert.AreEqual(cookie.Domain, "us1.rallydev.com");
             Assert.AreEqual(cookie.Path, "/");
-            Assert.IsTrue(cookie.Secure);
         }
 
         private String getDataFromFile(String filename)

diff --git a/Rally.RestApi.Test/data/SSOTokenPage.html b/Rally.RestApi.Test/data/SSOTokenPage.html
@@ -9,7 +9,6 @@
             <input type="hidden" name="authCookieValue" value="khkjhkhkhkhkjhh"/>
             <input type="hidden" name="authCookieDomain" value="us1.rallydev.com"/>
             <input type="hidden" name="authCookiePath" value="/"/>
-            <input type="hidden" name="authCookieSecure" value="true"/>
         </form>
     </body>
 </html>
diff --git a/Rally.RestApi/SSOHelper.cs b/Rally.RestApi/SSOHelper.cs
@@ -421,12 +421,12 @@ public static Cookie parsSSOLandingPage(String htmlPage)
                             authCookie.Value = inputNode.GetAttributeValue("value", "");
                             continue;
                         case "authCookieDomain":
-                            authCookie.Domain = "";
-                            //authCookie.Domain = inputNode.GetAttributeValue("value", "");
+                            String domain = inputNode.GetAttributeValue("value", "");
+                            authCookie.Domain = domain == null || domain == "null" ?  "" : domain;
                             continue;
                         case "authCookiePath":
-                            authCookie.Path = "";
-                            //authCookie.Path = inputNode.GetAttributeValue("value", "");
+                            String path = inputNode.GetAttributeValue("value", "");
+                            authCookie.Path = path == null || path == "null" ? "" : path;
                             continue;
                     }
                 }

diff --git a/Rally.RestApi/lib/HtmlAgilityPack.dll b/Rally.RestApi/lib/HtmlAgilityPack.dll
diff --git a/Rally.RestApi/lib/HtmlAgilityPack.pdb b/Rally.RestApi/lib/HtmlAgilityPack.pdb
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,7 @@ local.properties @@
     *.meta
     *.obj
     *.pch
-    *.pdb
+    #*.pdb
     *.pgc
     *.pgd
     *.rsp
@@ Expand Down @@