Fix - Custom field validation on form submission

auth0 · Sep 12, 2017 · 09977da · 09977da
1 parent 9973259
commit 09977da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Lock/DatabaseOnlyView.swift b/Lock/DatabaseOnlyView.swift
@@ -39,6 +39,7 @@ class DatabaseOnlyView: UIView, DatabaseView {
 
     weak var identityField: InputField?
     weak var passwordField: InputField?
+    var allFields: [InputField]?
 
     // FIXME: Remove this from the view since it should not even know it exists
     var navigator: Navigable?
@@ -143,13 +144,13 @@ class DatabaseOnlyView: UIView, DatabaseView {
 
         self.identityField = showUsername ? form.usernameField : form.emailField
         self.passwordField = form.passwordField
+        self.allFields = form.stackView.arrangedSubviews.map { $0 as? InputField }.filter { $0 != nil }.map { $0! }
 
         if let passwordPolicyValidator = passwordPolicyValidator {
             let passwordPolicyView = PolicyView(rules: passwordPolicyValidator.policy.rules)
             passwordPolicyValidator.delegate = passwordPolicyView
             let passwordIndex = form.stackView.arrangedSubviews.index(of: form.passwordField)
             form.stackView.insertArrangedSubview(passwordPolicyView, at:passwordIndex!)
-
             passwordPolicyView.isHidden = true
             form.passwordField.errorLabel?.removeFromSuperview()
             form.passwordField.onBeginEditing = { [weak self, weak passwordPolicyView] _ in

diff --git a/Lock/DatabasePresenter.swift b/Lock/DatabasePresenter.swift
@@ -178,9 +178,10 @@ class DatabasePresenter: Presentable, Loggable {
         view.showSignUp(withUsername: self.database.requiresUsername, username: username, email: email, authCollectionView: authCollectionView, additionalFields: self.options.customSignupFields, passwordPolicyValidator: passwordPolicyValidator, showPassswordManager: self.passwordManager.available, showPassword: self.options.allowShowPassword)
         let form = view.form
         view.form?.onValueChange = self.handleInput
-        let action = { [weak form] (button: PrimaryButton) in
+        let action = { [weak form, weak view] (button: PrimaryButton) in
             self.messagePresenter?.hideCurrent()
-            self.logger.info("perform sign up for email \(self.creator.email.verbatim())")
+            self.logger.info("Perform sign up for email \(self.creator.email.verbatim())")
+            view?.allFields?.forEach { self.handleInput($0) }
             let interactor = self.creator
             button.inProgress = true
             interactor.create { createError, loginError in

diff --git a/Lock/DatabaseView.swift b/Lock/DatabaseView.swift
@@ -31,6 +31,7 @@ protocol DatabaseView: class, View {
     weak var showPasswordButton: IconButton? { get }
     weak var identityField: InputField? { get }
     weak var passwordField: InputField? { get }
+    var allFields: [InputField]? { get }
 
     var traitCollection: UITraitCollection { get }