Migration 0823 (#18)

* Kitura/Kitura#675 Test module name change * Kitura/Kitura#675 Updated swift version * Kitura/Kitura#675 Swift language changes * Kitura/Kitura#675 Options now a Dictionary<String, Any> on all platforms * IBM-Swift/Kitra#65 Changes to Tests due to Credentials API change * Kitura/Kitura#675 Migrate from KituraSys.Queue to Dispatch * Kitura/Kitura#675 Changes due to @escaping issues * Kitura/Kitura#697 Updated Swift version * Kitura/Kitura#697 Swift language changes * Kitura/Kitura#697 Linux Foundation changes * Kitura/Kitura#697 Updated dependencies
Kitura · Aug 28, 2016 · f2ead2d · f2ead2d
1 parent 80b209a
commit f2ead2d
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 50 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-DEVELOPMENT-SNAPSHOT-2016-07-25-a
+DEVELOPMENT-SNAPSHOT-2016-08-23-a
diff --git a/Package.swift b/Package.swift
@@ -19,7 +19,7 @@ import PackageDescription
 let package = Package(
     name: "Kitura-Credentials",
     dependencies: [
-        .Package(url: "https://github.com/IBM-Swift/Kitura.git", majorVersion: 0, minor: 26),
-        .Package(url: "https://github.com/IBM-Swift/Kitura-Session.git", majorVersion: 0, minor: 26)
+        .Package(url: "https://github.com/IBM-Swift/Kitura.git", majorVersion: 0, minor: 27),
+        .Package(url: "https://github.com/IBM-Swift/Kitura-Session.git", majorVersion: 0, minor: 27)
     ]
 )
diff --git a/Sources/Credentials/Credentials.swift b/Sources/Credentials/Credentials.swift
@@ -23,27 +23,21 @@ import Foundation
 
 import SwiftyJSON
 
-#if os(Linux)
-public typealias OptionValue = Any
-#else
-public typealias OptionValue = AnyObject
-#endif
-
 public class Credentials : RouterMiddleware {
 
     var nonRedirectingPlugins = [CredentialsPluginProtocol]()
     var redirectingPlugins = [String : CredentialsPluginProtocol]()
-    public var options : [String:OptionValue]
+    public var options : [String:Any]
 
     public convenience init () {
-        self.init(options: [String:OptionValue]())
+        self.init(options: [String:Any]())
     }
 
-    public init (options: [String:OptionValue]) {
+    public init (options: [String:Any]) {
         self.options = options
     }
 
-    public func handle(request: RouterRequest, response: RouterResponse, next: () -> Void) {
+    public func handle(request: RouterRequest, response: RouterResponse, next: @escaping () -> Void) {
         if let session = request.session  {
             if let _ = request.userProfile {
                 next()
@@ -99,7 +93,7 @@ public class Credentials : RouterMiddleware {
             else {
                 // All the plugins passed
                 if let session = request.session, !self.redirectingPlugins.isEmpty {
-                    session["returnTo"] = JSON(request.originalURL as OptionValue)
+                    session["returnTo"] = JSON(request.originalURL)
                     self.redirectUnauthorized(response: response)
                 }
                 else {
@@ -136,11 +130,7 @@ public class Credentials : RouterMiddleware {
         }
         else {
             nonRedirectingPlugins.append(plugin)
-            #if os(OSX)
-                nonRedirectingPlugins[nonRedirectingPlugins.count - 1].usersCache = NSCache()
-            #else
-                nonRedirectingPlugins[nonRedirectingPlugins.count - 1].usersCache = Cache()
-            #endif
+            nonRedirectingPlugins[nonRedirectingPlugins.count - 1].usersCache = NSCache()
         }
     }
 
@@ -209,7 +199,7 @@ public class Credentials : RouterMiddleware {
                                             profile["displayName"] = userProfile.displayName
                                             profile["provider"] = credentialsType
                                             profile["id"] = userProfile.id
-                                            session["userProfile"] = JSON(profile as OptionValue)
+                                            session["userProfile"] = JSON(profile)
 
                                             var redirect : String?
                                             if session["returnTo"].type != .null  {

diff --git a/Sources/Credentials/CredentialsPluginProtocol.swift b/Sources/Credentials/CredentialsPluginProtocol.swift
@@ -21,12 +21,12 @@ import Foundation
 
 public protocol CredentialsPluginProtocol {
     var name: String { get }
-    #if os(Linux)
-    var usersCache: Cache? { get set }
-    #else
     var usersCache: NSCache<NSString, BaseCacheElement>? { get set }
-    #endif
     var redirecting: Bool { get }
 
-    func authenticate (request: RouterRequest, response: RouterResponse, options: [String:OptionValue], onSuccess: (UserProfile) -> Void, onFailure: (HTTPStatusCode?, [String:String]?) -> Void, onPass: (HTTPStatusCode?, [String:String]?) -> Void, inProgress: () -> Void)
+    func authenticate (request: RouterRequest, response: RouterResponse,
+                       options: [String:Any], onSuccess: @escaping (UserProfile) -> Void,
+                       onFailure: @escaping (HTTPStatusCode?, [String:String]?) -> Void,
+                       onPass: @escaping (HTTPStatusCode?, [String:String]?) -> Void,
+                       inProgress: @escaping () -> Void)
 }
diff --git a/Tests/Credentials/BadSessionPlugin.swift → ...s/CredentialsTests/BadSessionPlugin.swift b/Tests/Credentials/BadSessionPlugin.swift → ...s/CredentialsTests/BadSessionPlugin.swift
@@ -39,19 +39,19 @@ public class BadSessionPlugin : CredentialsPluginProtocol {
         return true
     }
 
-#if os(OSX)
     public var usersCache : NSCache<NSString, BaseCacheElement>?
-#else
-    public var usersCache : Cache?
-#endif
 
     public init (clientId: String, clientSecret : String, callbackUrl : String) {
         self.clientId = clientId
         self.clientSecret = clientSecret
         self.callbackUrl = callbackUrl
     }
 
-    public func authenticate (request: RouterRequest, response: RouterResponse, options: [String:OptionValue], onSuccess: (UserProfile) -> Void, onFailure: (HTTPStatusCode?, [String:String]?) -> Void, onPass: (HTTPStatusCode?, [String:String]?) -> Void, inProgress: () -> Void) {
+    public func authenticate (request: RouterRequest, response: RouterResponse,
+                              options: [String:Any], onSuccess: @escaping (UserProfile) -> Void,
+                              onFailure: @escaping (HTTPStatusCode?, [String:String]?) -> Void,
+                              onPass: @escaping (HTTPStatusCode?, [String:String]?) -> Void,
+                              inProgress: @escaping () -> Void) {
         if let code = request.queryParameters["code"], code == "123" {
             onFailure(nil, nil)
         }

diff --git a/Tests/Credentials/CredentialsTest.swift → Tests/CredentialsTests/CredentialsTest.swift b/Tests/Credentials/CredentialsTest.swift → Tests/CredentialsTests/CredentialsTest.swift
@@ -18,9 +18,9 @@ import XCTest
 
 import Kitura
 import KituraNet
-import KituraSys
 
 import Foundation
+import Dispatch
 
 
 protocol CredentialsTest {
@@ -34,15 +34,15 @@ extension CredentialsTest {
         //       sleep(10)
     }
 
-    func performServerTest(router: ServerDelegate, asyncTasks: (expectation: XCTestExpectation) -> Void...) {
+    func performServerTest(router: ServerDelegate, asyncTasks: @escaping (XCTestExpectation) -> Void...) {
         let server = setupServer(port: 8090, delegate: router)
         sleep(10)
-        let requestQueue = Queue(type: QueueType.serial)
+        let requestQueue = DispatchQueue(label: "Request queue")
 
         for (index, asyncTask) in asyncTasks.enumerated() {
             let expectation = self.expectation(index)
-            requestQueue.enqueueAsynchronously {
-                asyncTask(expectation: expectation)
+            requestQueue.sync {
+                asyncTask(expectation)
             }
         }
 
@@ -53,15 +53,17 @@ extension CredentialsTest {
         }
     }
 
-    func performRequest(method: String, host: String = "localhost", path: String, callback: ClientRequest.Callback, headers: [String: String]? = nil, requestModifier: ((ClientRequest) -> Void)? = nil) {
+    func performRequest(method: String, host: String = "localhost", path: String, callback: @escaping ClientRequest.Callback, headers: [String: String]? = nil, requestModifier: ((ClientRequest) -> Void)? = nil) {
         var allHeaders = [String: String]()
         if  let headers = headers  {
             for  (headerName, headerValue) in headers  {
                 allHeaders[headerName] = headerValue
             }
         }
         allHeaders["Content-Type"] = "text/plain"
-        let req = HTTP.request([.method(method), .hostname(host), .port(8090), .path(path), .headers(allHeaders)], callback: callback)
+        let options: [ClientRequest.Options] =
+                [.method(method), .hostname(host), .port(8090), .path(path), .headers(allHeaders)]
+        let req = HTTP.request(options, callback: callback)
         if let requestModifier = requestModifier {
             requestModifier(req)
         }
@@ -76,7 +78,7 @@ extension CredentialsTest {
 
 extension XCTestCase: CredentialsTest {
     func expectation(_ index: Int) -> XCTestExpectation {
-        let expectationDescription = "\(self.dynamicType)-\(index)"
+        let expectationDescription = "\(type(of: self))-\(index)"
         return self.expectation(description: expectationDescription)
     }
 

diff --git a/Tests/Credentials/DummySessionPlugin.swift → ...CredentialsTests/DummySessionPlugin.swift b/Tests/Credentials/DummySessionPlugin.swift → ...CredentialsTests/DummySessionPlugin.swift
@@ -39,19 +39,19 @@ public class DummySessionPlugin : CredentialsPluginProtocol {
         return true
     }
 
-#if os(OSX)
     public var usersCache : NSCache<NSString, BaseCacheElement>?
-#else
-    public var usersCache : Cache?
-#endif
 
     public init (clientId: String, clientSecret : String, callbackUrl : String) {
         self.clientId = clientId
         self.clientSecret = clientSecret
         self.callbackUrl = callbackUrl
     }
 
-    public func authenticate (request: RouterRequest, response: RouterResponse, options: [String:OptionValue], onSuccess: (UserProfile) -> Void, onFailure: (HTTPStatusCode?, [String:String]?) -> Void, onPass: (HTTPStatusCode?, [String:String]?) -> Void, inProgress: () -> Void) {
+    public func authenticate (request: RouterRequest, response: RouterResponse,
+                              options: [String:Any], onSuccess: @escaping (UserProfile) -> Void,
+                              onFailure: @escaping (HTTPStatusCode?, [String:String]?) -> Void,
+                              onPass: @escaping (HTTPStatusCode?, [String:String]?) -> Void,
+                              inProgress: @escaping () -> Void) {
 
         if let code = request.queryParameters["code"], code == "123" {
             let userProfile = UserProfile(id: "123", displayName: "Dummy User", provider: self.name, name: UserProfile.UserProfileName(familyName: "User", givenName: "Dummy", middleName: "Dummy"))

diff --git a/Tests/Credentials/DummyTokenPlugin.swift → ...s/CredentialsTests/DummyTokenPlugin.swift b/Tests/Credentials/DummyTokenPlugin.swift → ...s/CredentialsTests/DummyTokenPlugin.swift
@@ -35,18 +35,22 @@ public class DummyTokenPlugin : CredentialsPluginProtocol {
 
     public init () {}
 
-#if os(OSX)
     public var usersCache : NSCache<NSString, BaseCacheElement>?
-#else
-    public var usersCache : Cache?
-#endif
 
-    public func authenticate (request: RouterRequest, response: RouterResponse, options: [String:OptionValue], onSuccess: (UserProfile) -> Void, onFailure: (HTTPStatusCode?, [String:String]?) -> Void, onPass: (HTTPStatusCode?, [String:String]?) -> Void, inProgress: () -> Void) {
+    public func authenticate (request: RouterRequest, response: RouterResponse,
+                              options: [String:Any], onSuccess: @escaping (UserProfile) -> Void,
+                              onFailure: @escaping (HTTPStatusCode?, [String:String]?) -> Void,
+                              onPass: @escaping (HTTPStatusCode?, [String:String]?) -> Void,
+                              inProgress: @escaping () -> Void) {
         if let type = request.headers["X-token-type"], type == name {
             if let token = request.headers["access_token"], token == "dummyToken123" {
                 let userProfile = UserProfile(id: "123", displayName: "Dummy User", provider: self.name)
                 let newCacheElement = BaseCacheElement(profile: userProfile)
-                self.usersCache!.setObject(newCacheElement, forKey: token.bridge())
+                #if os(OSX)
+                    self.usersCache!.setObject(newCacheElement, forKey: token as NSString)
+                #else
+                    self.usersCache!.setObject(newCacheElement, forKey: NSString(string: token))
+                #endif
                 onSuccess(userProfile)
             }
             else {

diff --git a/Tests/Credentials/TestSession.swift → Tests/CredentialsTests/TestSession.swift b/Tests/Credentials/TestSession.swift → Tests/CredentialsTests/TestSession.swift
diff --git a/Tests/Credentials/TestToken.swift → Tests/CredentialsTests/TestToken.swift b/Tests/Credentials/TestToken.swift → Tests/CredentialsTests/TestToken.swift
diff --git a/...Credentials/TestUnauthorizedSession.swift → ...ntialsTests/TestUnauthorizedSession.swift b/...Credentials/TestUnauthorizedSession.swift → ...ntialsTests/TestUnauthorizedSession.swift
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -16,7 +16,7 @@
 
 import XCTest
 
-@testable import CredentialsTestSuite
+@testable import CredentialsTests
 
 
 XCTMain([