Reduce OAuth2Authenticatable parameters to loginHint

Updated Tests
auth0 · Mar 20, 2017 · e95f84e · e95f84e
1 parent d054704
commit e95f84e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/Lock/Auth0OAuth2Interactor.swift b/Lock/Auth0OAuth2Interactor.swift
@@ -30,20 +30,20 @@ struct Auth0OAuth2Interactor: OAuth2Authenticatable {
     let options: Options
     let nativeHandlers: [String: AuthProvider]
 
-    func login(_ connection: String, parameters: [String: String] = [:], callback: @escaping (OAuth2AuthenticatableError?) -> Void) {
+    func login(_ connection: String, loginHint: String?, callback: @escaping (OAuth2AuthenticatableError?) -> Void) {
         if let nativeHandler = self.nativeHandlers[connection] {
             self.nativeAuth(withConnection: connection, nativeAuth: nativeHandler, callback: callback)
         } else {
-            self.webAuth(withConnection: connection, parameters: parameters, callback: callback)
+            self.webAuth(withConnection: connection, loginHint: loginHint, callback: callback)
         }
     }
 
-    private func webAuth(withConnection connection: String, parameters authParameters: [String: String], callback: @escaping (OAuth2AuthenticatableError?) -> Void) {
+    private func webAuth(withConnection connection: String, loginHint: String?, callback: @escaping (OAuth2AuthenticatableError?) -> Void) {
 
         var parameters: [String: String] = [:]
-        authParameters.forEach { parameters[$0] = "\($1)" }
-
         self.options.parameters.forEach { parameters[$0] = "\($1)" }
+        parameters["login_hint"] = loginHint
+
         var auth = authentication
             .webAuth(withConnection: connection)
             .scope(self.options.scope)

diff --git a/Lock/EnterpriseDomainInteractor.swift b/Lock/EnterpriseDomainInteractor.swift
@@ -73,9 +73,7 @@ struct EnterpriseDomainInteractor: HRDAuthenticatable {
 
     func login(_ callback: @escaping (OAuth2AuthenticatableError?) -> Void) {
         guard let connection = self.connection else { return callback(.noConnectionAvailable) }
-        var parameters: [String: String] = [:]
-        parameters["login_hint"] = self.email
-        authenticator.login(connection.name, parameters: parameters, callback: callback)
+        authenticator.login(connection.name, loginHint: self.email, callback: callback)
     }
 
 }
diff --git a/Lock/OAuth2Authenticatable.swift b/Lock/OAuth2Authenticatable.swift
@@ -23,12 +23,12 @@
 import Foundation
 
 protocol OAuth2Authenticatable {
-    func login(_ connection: String, parameters: [String: String], callback: @escaping (OAuth2AuthenticatableError?) -> Void)
+    func login(_ connection: String, loginHint: String?, callback: @escaping (OAuth2AuthenticatableError?) -> Void)
 }
 
 extension OAuth2Authenticatable {
-    func login(_ connection: String, parameters: [String: String] = [:], callback: @escaping (OAuth2AuthenticatableError?) -> Void) {
-        self.login(connection, parameters: parameters, callback: callback)
+    func login(_ connection: String, loginHint: String? = nil, callback: @escaping (OAuth2AuthenticatableError?) -> Void) {
+        self.login(connection, loginHint: loginHint, callback: callback)
     }
 }
 

diff --git a/LockTests/Interactors/EnterpriseDomainInteractorSpec.swift b/LockTests/Interactors/EnterpriseDomainInteractorSpec.swift
@@ -182,7 +182,7 @@ class EnterpriseDomainInteractorSpec: QuickSpec {
                 expect(error).toEventually(beNil())
             }
 
-            it("should add login_hint to login") {
+            it("should add login_hint to parameters") {
                 authentication.webAuthResult = { return .success(result: mockCredentials()) }
                 try! enterprise.updateEmail("[email protected]")
                 enterprise.login() { error = $0 }

diff --git a/LockTests/Utils/Mocks.swift b/LockTests/Utils/Mocks.swift
@@ -361,9 +361,9 @@ class MockOAuth2: OAuth2Authenticatable {
     var onLogin: () -> OAuth2AuthenticatableError? = { _ in return nil }
     var parameters: [String: String] = [:]
 
-    func login(_ connection: String, parameters: [String: String] = [:], callback: @escaping (OAuth2AuthenticatableError?) -> ()) {
+    func login(_ connection: String, loginHint: String? = nil, callback: @escaping (OAuth2AuthenticatableError?) -> ()) {
         self.connection = connection
-        self.parameters = parameters
+        self.parameters["login_hint"] = loginHint
         callback(self.onLogin())
     }
 }