Fixed retain issues between presenter and views

Lock/AuthStyle.swift

@@ -23,7 +23,7 @@
 import UIKit
 
 /// Style for AuthButton
-public class AuthStyle {
+public struct AuthStyle {
 
         /// Name that will be used for titles. e.g. 'Login with Auth0'
     let name: String
@@ -52,7 +52,7 @@ public class AuthStyle {
 
      - returns: a new style
      */
-    public convenience init(name: String, color: UIColor = UIColor.a0_orange, foregroundColor: UIColor = .white, withImage image: LazyImage = LazyImage(name: "ic_auth_auth0", bundle: bundleForLock())) {
+    public init(name: String, color: UIColor = UIColor.a0_orange, foregroundColor: UIColor = .white, withImage image: LazyImage = LazyImage(name: "ic_auth_auth0", bundle: bundleForLock())) {
         self.init(name: name, normalColor: color, highlightedColor: color.a0_darker(0.3), foregroundColor: foregroundColor, withImage: image)
     }
 

Lock/DatabaseForgotPasswordPresenter.swift

@@ -53,7 +53,7 @@ class DatabaseForgotPasswordPresenter: Presentable, Loggable {
                 input.showError()
             }
         }
-        let action = { (button: PrimaryButton) in
+        let action = { [weak form] (button: PrimaryButton) in
             self.messagePresenter?.hideCurrent()
             self.logger.info("request forgot password for email \(self.interactor.email)")
             let interactor = self.interactor
@@ -73,7 +73,7 @@ class DatabaseForgotPasswordPresenter: Presentable, Loggable {
             }
         }
         view.primaryButton?.onPress = action
-        view.form?.onReturn = {_ in
+        view.form?.onReturn = { [unowned view] _ in
             guard let button = view.primaryButton else { return }
             action(button)
         }

Lock/DatabaseOnlyView.swift

@@ -129,21 +129,21 @@ class DatabaseOnlyView: UIView, DatabaseView {
 
         passwordPolicyView.isHidden = true
         form.passwordField.errorLabel?.removeFromSuperview()
-        form.passwordField.onBeginEditing = { [unowned passwordPolicyView] _ in
+        form.passwordField.onBeginEditing = { _ in
             passwordPolicyView.isHidden = false
         }
-        form.passwordField.onEndEditing = { [unowned passwordPolicyView] _ in
+        form.passwordField.onEndEditing = { _ in
             passwordPolicyView.isHidden = true
         }
 
-        form.emailField.onReturn = { [unowned form, unowned passwordPolicyView] _ in
-            if form.emailField.nextField == form.passwordField {
+        form.emailField.onReturn = { [weak form] _ in
+            if form?.emailField.nextField == form?.passwordField {
                 self.navigator?.scroll(toPosition: CGPoint(x: 0, y: passwordPolicyView.intrinsicContentSize.height), animated: true)
             }
         }
 
-        form.usernameField?.onReturn = { [unowned form, unowned passwordPolicyView] _ in
-            if form.usernameField?.nextField == form.passwordField {
+        form.usernameField?.onReturn = { [weak form] _ in
+            if form?.usernameField?.nextField == form?.passwordField {
                 self.navigator?.scroll(toPosition: CGPoint(x: 0, y: passwordPolicyView.intrinsicContentSize.height), animated: true)
             }
         }

Lock/DatabasePresenter.swift

@@ -59,7 +59,7 @@ class DatabasePresenter: Presentable, Loggable {
         let allow = self.options.allow
         let database = DatabaseOnlyView(allowedModes: allow)
         database.navigator = self.navigator
-        database.switcher?.onSelectionChange = { [weak database] switcher in
+        database.switcher?.onSelectionChange = { [unowned self, weak database] switcher in
             let selected = switcher.selected
             guard let view = database else { return }
             self.logger.debug("selected \(selected)")
@@ -130,8 +130,9 @@ class DatabasePresenter: Presentable, Loggable {
 
         }
 
-        view.form?.onReturn = { field in
-            guard let button = view.primaryButton, field.returnKey == .done else { return } // FIXME: Log warn
+        let primaryButton = view.primaryButton
+        view.form?.onReturn = { [weak primaryButton] field in
+            guard let button = primaryButton, field.returnKey == .done else { return } // FIXME: Log warn
             action(button)
         }
         view.primaryButton?.onPress = action

Lock/EnterpriseActiveAuthPresenter.swift

@@ -65,7 +65,7 @@ class EnterpriseActiveAuthPresenter: Presentable, Loggable {
             }
         }
 
-        let action = { (button: PrimaryButton) in
+        let action = { [weak form] (button: PrimaryButton) in
             self.messagePresenter?.hideCurrent()
             self.logger.info("Enterprise password connection started: \(self.interactor.identifier), \(self.interactor.connection)")
             let interactor = self.interactor
@@ -87,7 +87,7 @@ class EnterpriseActiveAuthPresenter: Presentable, Loggable {
         }
 
         view.primaryButton?.onPress = action
-        view.form?.onReturn = {_ in
+        view.form?.onReturn = { [unowned view] _ in
             guard let button = view.primaryButton else { return }
             action(button)
         }

Lock/EnterpriseDomainPresenter.swift

@@ -67,7 +67,7 @@ class EnterpriseDomainPresenter: Presentable, Loggable {
         let form = view.form
 
         view.ssoBar?.isHidden = self.interactor.connection == nil
-        view.form?.onValueChange = { input in
+        view.form?.onValueChange = { [unowned view ] input in
             self.messagePresenter?.hideCurrent()
             view.ssoBar?.isHidden = true
 
@@ -85,7 +85,7 @@ class EnterpriseDomainPresenter: Presentable, Loggable {
             }
         }
 
-        let action = { (button: PrimaryButton) in
+        let action = { [weak form] (button: PrimaryButton) in
             // Check for credential auth
             if let connection = self.interactor.connection, self.options.enterpriseConnectionUsingActiveAuth.contains(connection.name) {
                 guard self.navigator?.navigate(.enterpriseActiveAuth(connection: connection)) == nil else { return }
@@ -112,7 +112,7 @@ class EnterpriseDomainPresenter: Presentable, Loggable {
         }
 
         view.primaryButton?.onPress = action
-        view.form?.onReturn = {_ in
+        view.form?.onReturn = { [unowned view] _ in
             guard let button = view.primaryButton else { return }
             action(button)
         }

Lock/MultifactorPresenter.swift

@@ -52,7 +52,7 @@ class MultifactorPresenter: Presentable, Loggable {
                 input.showError()
             }
         }
-        let action = { (button: PrimaryButton) in
+        let action = { [weak form] (button: PrimaryButton) in
             self.messagePresenter?.hideCurrent()
             self.logger.debug("resuming with mutifactor code \(self.interactor.code)")
             let interactor = self.interactor
@@ -68,7 +68,7 @@ class MultifactorPresenter: Presentable, Loggable {
                 }
             }
         }
-        view.form?.onReturn = { _ in
+        view.form?.onReturn = { [unowned view]_ in
             guard let button = view.primaryButton else { return }
             action(button)
         }