refactor(global): error handling manager ♻️ (#358)

PierreBrisorgueil · web-flow · commit abf42b2160ee · 2021-04-15T20:18:42.000+02:00
diff --git a/waosSwift/modules/auth/controllers/AuthForgotController.swift b/waosSwift/modules/auth/controllers/AuthForgotController.swift
@@ -177,7 +177,7 @@ private extension AuthForgotController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -295,7 +295,7 @@ private extension AuthForgotController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
             })
diff --git a/waosSwift/modules/auth/controllers/AuthSigninController.swift b/waosSwift/modules/auth/controllers/AuthSigninController.swift
@@ -237,7 +237,7 @@ private extension AuthSignInController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -337,7 +337,7 @@ private extension AuthSignInController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
diff --git a/waosSwift/modules/auth/controllers/AuthSignupController.swift b/waosSwift/modules/auth/controllers/AuthSignupController.swift
@@ -228,7 +228,7 @@ private extension AuthSignUpController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -402,7 +402,7 @@ private extension AuthSignUpController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
diff --git a/waosSwift/modules/core/controllers/CoreController.swift b/waosSwift/modules/core/controllers/CoreController.swift
@@ -31,6 +31,7 @@ class CoreController: UIViewController {
         static let timesRefreshData = Int(config["times"]["refresh"]["data"].int ?? 60000)
         static let margin = Int(config["theme"]["global"]["margin"].int ?? 15)
         static let error = UIColor(named: config["theme"]["themes"]["waos"]["error"].string ?? "")
+        static let radius = CGFloat(config["theme"]["global"]["radius"].int ?? 0)
     }
 
     lazy private(set) var className: String = {
diff --git a/waosSwift/modules/home/controllers/HomePageController.swift b/waosSwift/modules/home/controllers/HomePageController.swift
@@ -106,7 +106,7 @@ private extension HomePageController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -152,7 +152,7 @@ private extension HomePageController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
diff --git a/waosSwift/modules/home/controllers/HomeTermsController.swift b/waosSwift/modules/home/controllers/HomeTermsController.swift
@@ -90,7 +90,7 @@ private extension HomeTermsController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -129,7 +129,7 @@ private extension HomeTermsController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
diff --git a/waosSwift/modules/tasks/controllers/TasksListController.swift b/waosSwift/modules/tasks/controllers/TasksListController.swift
@@ -122,7 +122,7 @@ private extension TasksListController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -207,7 +207,7 @@ private extension TasksListController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
diff --git a/waosSwift/modules/tasks/controllers/TasksViewController.swift b/waosSwift/modules/tasks/controllers/TasksViewController.swift
@@ -94,7 +94,7 @@ private extension TasksViewController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -143,7 +143,7 @@ private extension TasksViewController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
diff --git a/waosSwift/modules/users/controllers/UserController.swift b/waosSwift/modules/users/controllers/UserController.swift
@@ -366,7 +366,7 @@ private extension UserController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -538,7 +538,7 @@ private extension UserController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
diff --git a/waosSwift/modules/users/controllers/UserMoreController.swift b/waosSwift/modules/users/controllers/UserMoreController.swift
@@ -156,7 +156,7 @@ private extension UserMoreController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -187,7 +187,7 @@ private extension UserMoreController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
diff --git a/waosSwift/modules/users/controllers/UserPreferenceController.swift b/waosSwift/modules/users/controllers/UserPreferenceController.swift
@@ -88,7 +88,7 @@ private extension UserPreferenceController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -141,7 +141,7 @@ private extension UserPreferenceController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)
diff --git a/waosSwift/modules/users/controllers/UserViewController.swift b/waosSwift/modules/users/controllers/UserViewController.swift
@@ -211,7 +211,7 @@ private extension UserViewController {
                     mvc.mailComposeDelegate = self
                     mvc.setToRecipients([(config["app"]["mails"]["report"].string ?? "")])
                     mvc.setSubject(L10n.userReport)
-                    mvc.setMessageBody(setMailError(reactor.currentState.error?.source), isHTML: true)
+                    mvc.setMessageBody(setMailError("\(reactor.currentState.error?.title ?? "") \n \(reactor.currentState.error?.description ?? "") \n  \(reactor.currentState.error?.source ?? "")"), isHTML: true)
                     self.present(mvc, animated: true)
                 }
             })
@@ -462,7 +462,7 @@ private extension UserViewController {
             .filterNil()
             .throttle(.milliseconds(Metric.timesButtonsThrottle), latest: false, scheduler: MainScheduler.instance)
             .subscribe(onNext: { error in
-                self.error.configureContent(title: error.title, body: error.description)
+                self.error.configureContent(title: error.title, body: error.description == "" ? error.title : error.description)
                 self.error.button?.isHidden = (error.source != nil && error.code != 401) ? false : true
                 SwiftMessages.hideAll()
                 SwiftMessages.show(config: self.popupConfig, view: self.error)

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class CoreController: UIViewController {`
`31`	`31`	`static let timesRefreshData = Int(config["times"]["refresh"]["data"].int ?? 60000)`
`32`	`32`	`static let margin = Int(config["theme"]["global"]["margin"].int ?? 15)`
`33`	`33`	`static let error = UIColor(named: config["theme"]["themes"]["waos"]["error"].string ?? "")`
	`34`	`+ static let radius = CGFloat(config["theme"]["global"]["radius"].int ?? 0)`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`lazy private(set) var className: String = {`