auth0 · lbalmaceda · Jun 18, 2020 · Jun 16, 2020 · Jun 17, 2020 · Jun 17, 2020
diff --git a/Lock/CredentialView.swift b/Lock/CredentialView.swift
@@ -43,6 +43,19 @@ class CredentialView: UIView, Form {
         }
     }
 
+    var onSubmit: (InputField) -> Bool = { _ in return true } {
+        didSet {
+            self.identityField.>
+            self.passwordField.>
+        }
+    }
+
+    func shouldSubmit() -> Bool {
+        let shouldSubmitIdentityField = self.identityField.onSubmit(self.identityField)
+        let shouldSubmitPasswordField = self.passwordField.onSubmit(self.passwordField)
+        return shouldSubmitIdentityField && shouldSubmitPasswordField
+    }
+
     func needsToUpdateState() {
         self.identityField.needsToUpdateState()
         self.passwordField.needsToUpdateState()

diff --git a/Lock/DatabaseForgotPasswordPresenter.swift b/Lock/DatabaseForgotPasswordPresenter.swift
@@ -58,11 +58,26 @@ class DatabaseForgotPasswordPresenter: Presentable, Loggable {
                 input.showError()
             }
         }
+
+        view.form?. input in
+            view.form?.onValueChange(input)
+
+            do {
+                try self.interactor.updateEmail(input.text)
+                return true
+            } catch {
+                return false
+            }
+        }
+
         let action = { [weak form] (button: PrimaryButton) in
+            guard let isValid = view.form?.shouldSubmit(), isValid else { return }
+
             self.messagePresenter?.hideCurrent()
             self.logger.info("request forgot password for email: \(self.interactor.email.verbatim())")
             let interactor = self.interactor
             button.inProgress = true
+
             interactor.requestEmail { error in
                 Queue.main.async {
                     button.inProgress = false

diff --git a/Lock/DatabasePresenter.swift b/Lock/DatabasePresenter.swift
@@ -97,7 +97,23 @@ class DatabasePresenter: Presentable, Loggable {
         self.currentScreen = .login
         let form = view.form
         form?.>
+
+        form?. input in
+            form?.onValueChange(input)
+
+            guard let attribute = self.getUserAttribute(from: input.type) else { return false }
+
+            do {
+                try self.authenticator.update(attribute, value: input.text)
+                return true
+            } catch {
+                return false
+            }
+        }
+
         let action = { [weak form] (button: PrimaryButton) in
+            guard let isValid = view.form?.shouldSubmit(), isValid else { return }
+
             self.messagePresenter?.hideCurrent()
             self.logger.info("Perform login for email: \(self.authenticator.email.verbatim())")
             button.inProgress = true
@@ -164,7 +180,22 @@ class DatabasePresenter: Presentable, Loggable {
         let form = view.form
         view.form?.>
 
+        form?. input in
+            form?.onValueChange(input)
+
+            guard let attribute = self.getUserAttribute(from: input.type) else { return false }
+
+            do {
+                try self.authenticator.update(attribute, value: input.text)
+                return true
+            } catch {
+                return false
+            }
+        }
+
         let action = { [weak form, weak view] (button: PrimaryButton) in
+            guard let isValid = view?.form?.shouldSubmit(), isValid else { return }
+
             self.messagePresenter?.hideCurrent()
             self.logger.info("Perform sign up for email \(self.creator.email.verbatim())")
             view?.allFields?.forEach { self.handleInput($0) }
@@ -233,27 +264,15 @@ class DatabasePresenter: Presentable, Loggable {
 
     private func handleInput(_ input: InputField) {
         self.messagePresenter?.hideCurrent()
-
         self.logger.verbose("new value: \(input.text.verbatim()) for type: \(input.type)")
-        var updateHRD: Bool = false
 
-        // FIXME: enum mapping outlived its usefulness
-        let attribute: UserAttribute
-        switch input.type {
-        case .email:
-            attribute = .email
-            updateHRD = true
-        case .emailOrUsername:
-            attribute = .emailOrUsername
-            updateHRD = true
-        case .password:
-            attribute = .password(enforcePolicy: self.currentScreen == .signup)
-        case .username:
-            attribute = .username
-        case .custom(let name, _, _, let storage, _, _, _, _, _, _, _):
-            attribute = .custom(name: name, storage: storage)
-        default:
-            return
+        guard let attribute = getUserAttribute(from: input.type) else { return }
+
+        var updateHRD: Bool = false
+        switch attribute {
+        case .email: updateHRD = true
+        case .emailOrUsername: updateHRD = true
+        default: break
         }
 
         do {
@@ -276,6 +295,18 @@ class DatabasePresenter: Presentable, Loggable {
         }
     }
 
+    private func getUserAttribute(from inputType: InputField.InputType) -> UserAttribute? {
+        switch inputType {
+        case .email: return .email
+        case .emailOrUsername: return .emailOrUsername
+        case .password: return .password(enforcePolicy: self.currentScreen == .signup)
+        case .username: return .username
+        case .custom(let name, _, _, let storage, _, _, _, _, _, _, _):
+            return .custom(name: name, storage: storage)
+        default: return nil
+        }
+    }
+
     func showTermsPrompt(atButton button: PrimaryButton, successHandler: @escaping (PrimaryButton) -> Void) {
         let terms = "Terms & Policy".i18n(key: "com.auth0.lock.database.button.tos.title", comment: "tos title")
         let alert = UIAlertController(title: terms, message: "By signing up, you agree to our terms of\n service and privacy policy".i18n(key: "com.auth0.lock.database.button.tos", comment: "tos & privacy"), preferredStyle: .alert)

diff --git a/Lock/Form.swift b/Lock/Form.swift
@@ -25,8 +25,11 @@ import Foundation
 protocol Form: class {
     var onValueChange: (InputField) -> Void { get set }
     var onReturn: (InputField) -> Void { get set }
-    func needsToUpdateState()
+    var onSubmit: (InputField) -> Bool { get set }
     var onCountryChange: (CountryCode) -> Void { get set }
+
+    func shouldSubmit() -> Bool
+    func needsToUpdateState()
 }
 
 extension Form {

diff --git a/Lock/InputField.swift b/Lock/InputField.swift
@@ -85,13 +85,15 @@ class InputField: UIView, Stylable {
         }
     }
 
-    var onTextChange: (InputField) -> Void = {_ in}
+    var onTextChange: (InputField) -> Void = { _ in }
 
-    var onReturn: (InputField) -> Void = {_ in}
+    var onReturn: (InputField) -> Void = { _ in }
 
-    var onBeginEditing: (InputField) -> Void = {_ in}
+    var onBeginEditing: (InputField) -> Void = { _ in }
 
-    var onEndEditing: (InputField) -> Void = {_ in}
+    var onEndEditing: (InputField) -> Void = { _ in }
+
+    var onSubmit: (InputField) -> Bool = { _ in return true }
 
     // MARK: - Initialisers
 

diff --git a/Lock/InternationalPhoneInputView.swift b/Lock/InternationalPhoneInputView.swift
@@ -102,6 +102,19 @@ class InternationalPhoneInputView: UIView, Form, Stylable {
         }
     }
 
+    var onSubmit: (InputField) -> Bool {
+        get {
+            return self.inputField.onSubmit
+        }
+        set {
+            self.inputField.>
+        }
+    }
+
+    func shouldSubmit() -> Bool {
+        return self.inputField.onSubmit(self.inputField)
+    }
+
     func needsToUpdateState() {
         self.inputField.needsToUpdateState()
     }

diff --git a/Lock/SignUpView.swift b/Lock/SignUpView.swift
@@ -60,10 +60,25 @@ class SignUpView: UIView, Form {
         }
     }
 
+    var onSubmit: (InputField) -> Bool = { _ in return true } {
+        didSet {
+            self.stackView.arrangedSubviews
+                .compactMap { $0 as? InputField }
+                .forEach { $0. }
+        }
+    }
+
     var lastField: InputField? {
         return self.stackView.arrangedSubviews.last as? InputField
     }
 
+    func shouldSubmit() -> Bool {
+        return !self.stackView.arrangedSubviews
+            .compactMap { $0 as? InputField }
+            .map { $0.onSubmit($0) }
+            .contains(false)
+    }
+
     func needsToUpdateState() {
         self.stackView.arrangedSubviews
             .map { $0 as? InputField }
@@ -116,7 +131,7 @@ class SignUpView: UIView, Form {
 
         stackView.axis = .vertical
         stackView.spacing = 16
-        stackView.distribution = .fillProportionally
+        stackView.distribution = .fill
         stackView.alignment = .fill
 
         email.type = .email

diff --git a/Lock/SingleInputView.swift b/Lock/SingleInputView.swift
@@ -73,6 +73,19 @@ class SingleInputView: UIView, Form, Stylable {
         }
     }
 
+    var onSubmit: (InputField) -> Bool {
+        get {
+            return self.inputField.onSubmit
+        }
+        set {
+            self.inputField.>
+        }
+    }
+
+    func shouldSubmit() -> Bool {
+        return self.inputField.onSubmit(self.inputField)
+    }
+
     func needsToUpdateState() {
         self.inputField.needsToUpdateState()
     }

diff --git a/LockTests/Presenters/DatabasePresenterSpec.swift b/LockTests/Presenters/DatabasePresenterSpec.swift
@@ -86,6 +86,20 @@ class DatabasePresenterSpec: QuickSpec {
             }
         }
 
+        describe("form submit") {
+
+            it("should allow form submit") {
+                view.form?. _ in return true }
+                expect(view.form?.shouldSubmit()) == true
+            }
+
+            it("should not allow form submit") {
+                view.form?. _ in return false }
+                expect(view.form?.shouldSubmit()) == false
+            }
+
+        }
+
         describe("accept terms alert") {
 
             it("present alert") {
@@ -263,24 +277,64 @@ class DatabasePresenterSpec: QuickSpec {
                     expect(interactor.email) == email
                 }
 
+                it("should allow a valid email") {
+                    let input = mockInput(.email, value: email)
+                    expect(view.form?.onSubmit(input)) == true
+                }
+
+                it("should not allow an invalid email") {
+                    let input = mockInput(.email, value: "invalid")
+                    expect(view.form?.onSubmit(input)) == false
+                }
+
                 it("should update username") {
                     let input = mockInput(.username, value: username)
                     view.form?.onValueChange(input)
                     expect(interactor.username) == username
                 }
 
+                it("should allow a valid username") {
+                    let input = mockInput(.username, value: username)
+                    expect(view.form?.onSubmit(input)) == true
+                }
+
+                it("should not allow an invalid username") {
+                    let input = mockInput(.username, value: "invalid")
+                    expect(view.form?.onSubmit(input)) == false
+                }
+
                 it("should update password") {
                     let input = mockInput(.password, value: password)
                     view.form?.onValueChange(input)
                     expect(interactor.password) == password
                 }
 
+                it("should allow a valid password") {
+                    let input = mockInput(.password, value: password)
+                    expect(view.form?.onSubmit(input)) == true
+                }
+
+                it("should not allow an invalid password") {
+                    let input = mockInput(.password, value: "invalid")
+                    expect(view.form?.onSubmit(input)) == false
+                }
+
                 it("should update username or email") {
                     let input = mockInput(.emailOrUsername, value: username)
                     view.form?.onValueChange(input)
                     expect(interactor.username) == username
                 }
 
+                it("should allow a valid username or email") {
+                    let input = mockInput(.emailOrUsername, value: username)
+                    expect(view.form?.onSubmit(input)) == true
+                }
+
+                it("should not allow an invalid username or email") {
+                    let input = mockInput(.emailOrUsername, value: "invalid")
+                    expect(view.form?.onSubmit(input)) == false
+                }
+
                 it("should not update if type is not valid for db connection") {
                     let input = mockInput(.phone, value: "+1234567890")
                     view.form?.onValueChange(input)
@@ -466,18 +520,48 @@ class DatabasePresenterSpec: QuickSpec {
                     expect(interactor.email) == email
                 }
 
+                it("should allow a valid email") {
+                    let input = mockInput(.email, value: email)
+                    expect(view.form?.onSubmit(input)) == true
+                }
+
+                it("should not allow an invalid email") {
+                    let input = mockInput(.email, value: "invalid")
+                    expect(view.form?.onSubmit(input)) == false
+                }
+
                 it("should update us
B3FB
ername") {
                     let input = mockInput(.username, value: username)
                     view.form?.onValueChange(input)
                     expect(interactor.username) == username
                 }
 
+                it("should allow a valid username") {
+                    let input = mockInput(.username, value: username)
+                    expect(view.form?.onSubmit(input)) == true
+                }
+
+                it("should not allow an invalid username") {
+                    let input = mockInput(.username, value: "invalid")
+                    expect(view.form?.onSubmit(input)) == false
+                }
+
                 it("should update password") {
                     let input = mockInput(.password, value: password)
                     view.form?.onValueChange(input)
                     expect(interactor.password) == password
                 }
 
+                it("should allow a valid password") {
+                    let input = mockInput(.password, value: password)
+                    expect(view.form?.onSubmit(input)) == true
+                }
+
+                it("should not allow an invalid password") {
+                    let input = mockInput(.password, value: "invalid")
+                    expect(view.form?.onSubmit(input)) == false
+                }
+
                 it("should custom field") {
                     let name = "Auth0"
                     let input = mockInput(.custom(name: "first_name", placeholder: "Name", defaultValue: nil, storage: .userMetadata, icon: LazyImage(name: "ic_auth0", bundle: Lock.bundle), keyboardType: .default, autocorrectionType: .no, autocapitalizationType: .none, secure: false, hidden: false, contentType: nil), value: name)
@@ -839,6 +923,7 @@ class DatabasePresenterSpec: QuickSpec {
                         presenter.enterpriseInteractor = enterpriseInteractor
 
                         view = presenter.view as? DatabaseOnlyView
+                        view.form?. _ in return true }
 
                         let input = mockInput(.email, value: "user@valid.com")
                         view.form?.onValueChange(input)