diff --git a/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift b/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift index 041f4def..86cdab76 100644 --- a/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift +++ b/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift @@ -92,9 +92,14 @@ extension RegisterInteractor: RegisterInteractorInput { model.phoneOs = self.getPhoneOs() model.osVersion = self.getOsVersion() model.fcmId = self.getFcmToken() - let clientId = self.getCliendId() + model.clientId = self.getCliendId() let params = model.serialize() - + + self.service.register(params: model.serialize(), success: { + self.output?.success() + }) { (error) in + self.output?.show(error: error) + } } } diff --git a/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractorIO.swift b/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractorIO.swift index a846229b..bf410ff7 100644 --- a/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractorIO.swift +++ b/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractorIO.swift @@ -12,4 +12,5 @@ protocol RegisterInteractorInput: class { protocol RegisterInteractorOutput: class { func show(error: Error) + func success() } diff --git a/GMERemittance/Module/Register/Module Interface/RegisterModuleInterface.swift b/GMERemittance/Module/Register/Module Interface/RegisterModuleInterface.swift index 0e1330a8..8e719888 100644 --- a/GMERemittance/Module/Register/Module Interface/RegisterModuleInterface.swift +++ b/GMERemittance/Module/Register/Module Interface/RegisterModuleInterface.swift @@ -8,4 +8,5 @@ protocol RegisterModuleInterface: class { func register(model: RegisterRequestModel) + func login() } diff --git a/GMERemittance/Module/Register/User Interface/Presenter/RegisterPresenter.swift b/GMERemittance/Module/Register/User Interface/Presenter/RegisterPresenter.swift index 77250860..be5d171a 100644 --- a/GMERemittance/Module/Register/User Interface/Presenter/RegisterPresenter.swift +++ b/GMERemittance/Module/Register/User Interface/Presenter/RegisterPresenter.swift @@ -27,7 +27,9 @@ extension RegisterPresenter: RegisterModuleInterface { self.interactor?.register(model: model) } - + func login() { + self.wireframe?.login() + } } @@ -38,4 +40,9 @@ extension RegisterPresenter: RegisterInteractorOutput { self.view?.hideLoading() self.view?.show(error: error.localizedDescription) } + + func success() { + self.view?.hideLoading() + self.wireframe?.login() + } } diff --git a/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift b/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift index 2ed5bd5d..eac1dff6 100644 --- a/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift +++ b/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift @@ -31,7 +31,7 @@ class RegisterViewController: UIViewController { // MARK: IBActions @IBAction func login(_ sender: UIButton) { - + self.presenter?.login() } @IBAction func register(_ sender: UIButton) { diff --git a/GMERemittance/Module/Register/User Interface/Wireframe/RegisterWireframe.swift b/GMERemittance/Module/Register/User Interface/Wireframe/RegisterWireframe.swift index d3c44641..952e855f 100644 --- a/GMERemittance/Module/Register/User Interface/Wireframe/RegisterWireframe.swift +++ b/GMERemittance/Module/Register/User Interface/Wireframe/RegisterWireframe.swift @@ -31,4 +31,8 @@ extension RegisterWireframe: RegisterWireframeInput { self.view = viewController return viewController } + + func login() { + self.view.navigationController?.popViewController(animated: true) + } } diff --git a/GMERemittance/Module/Register/User Interface/Wireframe/RegisterWireframeInput.swift b/GMERemittance/Module/Register/User Interface/Wireframe/RegisterWireframeInput.swift index 9fcb5352..d20c1570 100644 --- a/GMERemittance/Module/Register/User Interface/Wireframe/RegisterWireframeInput.swift +++ b/GMERemittance/Module/Register/User Interface/Wireframe/RegisterWireframeInput.swift @@ -9,5 +9,5 @@ import Foundation protocol RegisterWireframeInput: WireframeInput { - + func login() }