MyGet login tested

fsprojects · Sep 25, 2014 · faf6d2c · faf6d2c
1 parent 0186415
commit faf6d2c
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 5 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-#### 0.3.0-alpha011 - 23.09.2014
+#### 0.3.0-alpha012 - 23.09.2014
 * New command: paket add [--interactive] - http://fsprojects.github.io/Paket/paket-add.html
 * New command: paket simplify - http://fsprojects.github.io/Paket/paket-simplify.html
 * Better Visual Studio integration by using paket.targets file - http://fsprojects.github.io/Paket/paket-init-auto-restore.html

diff --git a/integration-tests/private-feeds/expected/paket.dependencies b/integration-tests/private-feeds/expected/paket.dependencies
@@ -0,0 +1,3 @@
+source https://www.myget.org/F/paket-test/ username: "paket" password: "[REPLACEME]"
+
+nuget GoogleAnalyticsTracker.Core
diff --git a/integration-tests/private-feeds/expected/paket.lock b/integration-tests/private-feeds/expected/paket.lock
@@ -0,0 +1,4 @@
+NUGET
+  remote: https://www.myget.org/F/paket-test username: "paket" password: "[REPLACEME]"
+  specs:
+    GoogleAnalyticsTracker.Core (3.0.22)
diff --git a/integration-tests/private-feeds/original/paket.dependencies b/integration-tests/private-feeds/original/paket.dependencies
@@ -0,0 +1,3 @@
+source https://www.myget.org/F/paket-test/ username: "paket" password: "[REPLACEME]"
+
+nuget GoogleAnalyticsTracker.Core
diff --git a/integration-tests/private-feeds/original/run.bat b/integration-tests/private-feeds/original/run.bat
@@ -0,0 +1 @@
+paket install
diff --git a/src/Paket/Nuget.fs b/src/Paket/Nuget.fs
@@ -9,6 +9,7 @@ open Ionic.Zip
 open System.Xml
 open System.Text.RegularExpressions
 open Paket.Logging
+open System.Text
 
 let private loadNuGetOData raw =
     let doc = XmlDocument()
@@ -254,6 +255,20 @@ let DownloadPackage(auth, url, name, version, force) =
 
                 let request = HttpWebRequest.Create(Uri nugetPackage.Url) :?> HttpWebRequest
                 request.AutomaticDecompression <- DecompressionMethods.GZip ||| DecompressionMethods.Deflate
+
+                match auth with
+                | None -> ()
+                | Some auth -> 
+                    // htttp://stackoverflow.com/questions/16044313/webclient-httpwebrequest-with-basic-authentication-returns-404-not-found-for-v/26016919#26016919
+                    //this works ONLY if the server returns 401 first
+                    //client DOES NOT send credentials on first request
+                    //ONLY after a 401
+                    //client.Credentials <- new NetworkCredential(auth.Username,auth.Password)
+
+                    //so use THIS instead to send credenatials RIGHT AWAY
+                    let credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(auth.Username + ":" + auth.Password))
+                    request.Headers.[HttpRequestHeader.Authorization] <- String.Format("Basic {0}", credentials)
+
                 use! httpResponse = request.AsyncGetResponse()
 
                 use httpResponseStream = httpResponse.GetResponseStream()
@@ -347,7 +362,7 @@ let GetPackageDetails force sources package version =
                     getDetailsFromLocalFile path package version |> Async.RunSynchronously
                 |> fun x -> source,x
             with _ -> tryNext rest
-        | [] -> failwithf "Couldn't get package details for package %s on %A" package sources
+        | [] -> failwithf "Couldn't get package details for package %s on %A." package (sources |> List.map (fun (s:PackageSource) -> s.ToString()))
 
     let source, nugetObject = tryNext sources
     { Name = nugetObject.Name

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -25,12 +25,12 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
     <DocumentationFile>..\..\bin\Paket.xml</DocumentationFile>
-    <StartArguments>update</StartArguments>
+    <StartArguments>update -f</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>
     </StartWorkingDirectory>
-    <StartWorkingDirectory>D:\code\paket</StartWorkingDirectory>
+    <StartWorkingDirectory>D:\code\Paket\integration-tests\private-feeds\original</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/src/Paket/Utils.fs b/src/Paket/Utils.fs
@@ -73,7 +73,7 @@ let getFromUrl (auth:Auth option, url : string) =
             return! client.AsyncDownloadString(Uri(url))
         with
         | exn -> 
-            failwithf "Could not retrieve data from %s%s  Message: %s" url Environment.NewLine exn.Message
+            failwithf "Could not retrieve data from %s%s Message: %s" url Environment.NewLine exn.Message
             return ""
     }