updated TurnstileWeb to 8-24

stormpath · Aug 26, 2016 · 3b1a49f · 3b1a49f
1 parent eac3f4a
commit 3b1a49f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 171 deletions.
diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,3 @@ var package = Package(
         .Package(url: "https://github.com/vapor/json.git", majorVersion: 0, minor: 5)
     ]
 )
-
-#if os(Linux)
-package.dependencies.append(Package.Dependency.Package(url: "https://github.com/czechboy0/SecretSocks.git", majorVersion: 0, minor: 6))
-#endif
diff --git a/Sources/TurnstileWeb/OAuth2.swift b/Sources/TurnstileWeb/OAuth2.swift
@@ -33,11 +33,7 @@ public class OAuth2 {
     /// The Token Endpoint of the OAuth 2 Server
     public let tokenURL: String
 
-    #if os(Linux)
-    let HTTPClient = Client<TLSClientStream>.self
-    #else
-    let HTTPClient = Client<FoundationStream>.self
-    #endif
+    let HTTPClient = BasicClient.self
 
 
     /// Creates the OAuth 2 client

diff --git a/Sources/TurnstileWeb/TLSClientStream.swift b/Sources/TurnstileWeb/TLSClientStream.swift
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -10,6 +10,5 @@ XCTMain([
      testCase(URandomTests.allTests),
      testCase(BCryptTests.allTests),
      testCase(FacebookTests.allTests),
-     testCase(OAuth2Tests.allTests),
-     testCase(TLSClientStreamTests.allTests)
+     testCase(OAuth2Tests.allTests)
 ])
diff --git a/Tests/TurnstileWebTests/FacebookTests.swift b/Tests/TurnstileWebTests/FacebookTests.swift
@@ -14,23 +14,15 @@ import JSON
 import Turnstile
 import Foundation
 import Transport
+import URI
 
 class FacebookTests: XCTestCase {
     var facebook: Facebook!
-    #if os(Linux)
-    let HTTPClient = Client<TLSClientStream>.self
-    #else
-    let HTTPClient = Client<FoundationStream>.self
-    #endif
+    let HTTPClient = BasicClient.self
 
     override func setUp() {
-        #if os(OSX) || os(iOS)
-            let clientID = ProcessInfo.processInfo.environment["FACEBOOK_CLIENT_ID"] ?? ""
-            let clientSecret = ProcessInfo.processInfo.environment["FACEBOOK_CLIENT_SECRET"] ?? ""
-        #elseif os(Linux)
-            let clientID = ProcessInfo.processInfo().environment["FACEBOOK_CLIENT_ID"] ?? ""
-            let clientSecret = ProcessInfo.processInfo().environment["FACEBOOK_CLIENT_SECRET"] ?? ""
-        #endif
+        let clientID = ProcessInfo.processInfo.environment["FACEBOOK_CLIENT_ID"] ?? ""
+        let clientSecret = ProcessInfo.processInfo.environment["FACEBOOK_CLIENT_SECRET"] ?? ""
 
         facebook = Facebook(clientID: clientID, clientSecret: clientSecret)
     }

diff --git a/Tests/TurnstileWebTests/TLSClientStreamTests.swift b/Tests/TurnstileWebTests/TLSClientStreamTests.swift