18.07

@@ -36,37 +36,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "B21C0B63-1820-47D9-863A-585E52771DA2"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "InterQR-Internship/Modules/OneTimePasswordScreen/View/OTPView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "94"
-            endingLineNumber = "94"
-            landmarkName = "didTextFieldChanged(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "7B1AC08C-6FFC-42BD-8C5C-4D6CE5CBD70C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "InterQR-Internship/Modules/OneTimePasswordScreen/ViewController/CodeVerificationViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "145"
-            endingLineNumber = "145"
-            landmarkName = "didFullCodeCompletion(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

@@ -9,7 +9,10 @@ import Foundation
 import Alamofire
 
 class AuthService {
-    static let share = AuthService()
+    static let shared = AuthService()
+    
+    private init() {
+    }
     
     var networkToken: String? {
         get {
@@ -87,10 +90,11 @@ class AuthService {
     }
     
     func loginRequest(model: LoginRequestModel, success: @escaping LoginWebServiceResponse, fail: @escaping FailedHandler) {
-        let headers = ["Authorization": "Bearer \(self.networkToken ?? "")"]
+        let interceptor = InterQrRequestInterceptor()
+
         let params = ["device_uuid": model.deviceUUID] as [String: Any]
         
-        AF.request(Constants.baseURL + APIRoutes.loginURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default, headers: HTTPHeaders(headers), interceptor: nil).responseDecodable(of: LoginResponseModel.self ) { response in
+        AF.request(Constants.baseURL + APIRoutes.loginURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default, interceptor: interceptor).responseDecodable(of: LoginResponseModel.self ) { response in
             
             switch response.result {
             case .failure(let error) :
@@ -102,10 +106,10 @@ class AuthService {
     }
     
     func logoutRequest(model: LogoutRequestModel, completion: @escaping LogoutWebServiceResponse, fail: @escaping FailedHandler) {
-        let headers = ["Authorization": "Bearer \(self.networkToken ?? "")"]
+        let interceptor = InterQrRequestInterceptor()
         let params = ["device_uuid": model.deviceUUID] as [String: Any]
         
-        AF.request(Constants.baseURL + APIRoutes.logoutURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default, headers: HTTPHeaders(headers), interceptor: nil).responseDecodable(of: LogoutResponseModel.self ) { response in
+        AF.request(Constants.baseURL + APIRoutes.logoutURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default, interceptor: interceptor).responseDecodable(of: LogoutResponseModel.self ) { response in
             
             if let error = response.error {
                 fail(error)
@@ -117,3 +121,16 @@ class AuthService {
         }
     }
 }
+
+class InterQrRequestInterceptor: RequestInterceptor {
+    func adapt(_ urlRequest: URLRequest, for session: Session, completion: @escaping (Result<URLRequest, Error>) -> Void) {
+        var urlRequest = urlRequest
+//        let headers = ["Authorization": "Bearer \(self.networkToken ?? "")"]
+//        let params = ["device_uuid": model.deviceUUID] as [String: Any]
+        if let token = AuthService.shared.networkToken {
+            urlRequest.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
+        }
+//        if let deviceUUID = 
+        completion(.success(urlRequest))
+    }
+}

@@ -11,11 +11,8 @@ import ContactsUI
 class AddResidentsViewController: UIViewController {
     var isKeyboardAppear = false
     
-    weak var delegate: ResidentSavable?
-    
-    var contact = ContactPickerViewController()
     var mainView = AddResidentsView()
-    
+    weak var delegate: ResidentSavable?
     var closeTap: UITapGestureRecognizer?
     
     override func loadView() {

@@ -41,7 +41,6 @@ extension HomeViewController: UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: HomeTableViewCell.id, for: indexPath) as? HomeTableViewCell else { return UITableViewCell() }
-//        cell.configureWithItem(doors[indexPath.row])
         return cell
     }
     

@@ -80,7 +80,6 @@ class CodeVerificationView: UIView {
     let spinner: UIActivityIndicatorView = {
         var obj = UIActivityIndicatorView(style: .large)
         obj.hidesWhenStopped = true
-        
         return obj
     }()
     

@@ -9,9 +9,8 @@ import UIKit
 
 class CodeVerificationViewController: UIViewController {
     var isKeyboardAppear = false
-    
+    var verifyMessage: String?
     private let mainView = CodeVerificationView()
-    private let networkManager = AuthService()
     
     override func loadView() {
         view = mainView
@@ -23,7 +22,7 @@ class CodeVerificationViewController: UIViewController {
     
     private func initViewController() {
         mainView.otpView.delegate = self
-        mainView.backButton.addTarget(self, action: #selector(didDismissVC), for: .touchUpInside)
+        mainView.backButton.addTarget(self, action: #selector(didTapBackButton), for: .touchUpInside)
         mainView.verifyButton.addTarget(self, action: #selector(didTapVerifyButton), for: .touchUpInside)
         
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(notification:)), name: UIResponder.keyboardWillShowNotification, object: nil)
@@ -35,36 +34,40 @@ class CodeVerificationViewController: UIViewController {
         NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillHideNotification, object: nil)
     }
     
-    func networkingVerify() {
-        guard let verifyModel = verifyModelFilling() else { return }
-        AuthService.share.verifyRequest(model: verifyModel) { response in
+    func verificationRequestProcessing() {
+        self.mainView.spinner.startAnimating()
+        guard let verifyModel = getVerifyModel() else { return }
+        AuthService.shared.verifyRequest(model: verifyModel) { response in
             print("3️⃣✅\(response.data)")
             print("\(response.message)✅")
-            self.networkingLogin()
-            self.mainView.spinner.startAnimating()
+            self.loginRequestProcessing()
         } fail: { error in
+            self.mainView.spinner.stopAnimating()
             print("3️⃣\(error)")
             self.errorProcessing()
         }
     }
     
-    func networkingLogin() {
-        guard let loginModel = loginModelFilling() else { return }
-        AuthService.share.loginRequest(model: loginModel) { response in
+    func loginRequestProcessing() {
+        guard let loginModel = getLoginModel() else { return }
+        AuthService.shared.loginRequest(model: loginModel) { response in
             print("4️⃣\(String(describing: response.message))4️⃣")
-            self.errorProcessing()
+            self.verifyMessage = response.message
+            self.loginDataProcessing()
         } fail: { error in
+            self.mainView.spinner.stopAnimating()
+            self.errorProcessing()
             print("4️⃣⛔️\(error)⛔️")
         }
     }
     
-    func verifyModelFilling() -> VerifyRequestModel? {
+    func getVerifyModel() -> VerifyRequestModel? {
         let email = "test@interqr.com"
         guard let code = mainView.otpView.code else { return nil }
         return VerifyRequestModel(emailOrNumber: email, code: code, secondAuthToken: "asdas")
     }
     
-    func loginModelFilling() -> LoginRequestModel? {
+    func getLoginModel() -> LoginRequestModel? {
         guard let deviceUUID = UIDevice.current.identifierForVendor?.uuidString else {
             return nil
         }
@@ -74,7 +77,7 @@ class CodeVerificationViewController: UIViewController {
 //MARK: - Targets
 extension CodeVerificationViewController {
     @objc private func didTapVerifyButton() {
-        networkingVerify()
+        verificationRequestProcessing()
     }
     
     private func showHomeVC() {
@@ -82,25 +85,36 @@ extension CodeVerificationViewController {
         navigationController?.pushViewController(viewController, animated: true)
     }
     
+    private func loginDataProcessing() {
+        self.mainView.spinner.stopAnimating()
+        self.showHomeVC()
+    }
+    
     private func errorProcessing() {
         guard let code = mainView.otpView.code else { return }
+        
         if code.count < 4 {
             let alert = UIAlertController(title: "❌", message: "Enter all fields", preferredStyle: .alert)
             alert.addAction(UIAlertAction(title: "Close", style: .cancel, handler: nil))
             present(alert, animated: true, completion: nil)
+        } else if verifyMessage != "OK" {
+            let alert = UIAlertController(title: "Wrong password", message: "", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "Try again", style: .cancel, handler: { action in
+                self.mainView.otpView.isError.toggle()
+                self.mainView.errorAlertLabel.isHidden = false
+                self.mainView.otpView.textField.becomeFirstResponder()
+            }))
+            present(alert, animated: true, completion: nil)
         } else {
-            if code != "8327" {
-                mainView.otpView.isError.toggle()
-                mainView.errorAlertLabel.isHidden = false
-                mainView.otpView.textField.becomeFirstResponder()
-            } else {
-                    self.mainView.spinner.stopAnimating()
-                    self.showHomeVC()
-            }
+            let alert = UIAlertController(title: "Network technical issues", message: "", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "Reload", style: .cancel, handler: { action in
+                self.didTapBackButton()
+            }))
+            present(alert, animated: true, completion: nil)
         }
     }
 
-    @objc private func didDismissVC() {
+    @objc private func didTapBackButton() {
         navigationController?.popViewController(animated: true)
     }
     
@@ -144,11 +158,5 @@ extension CodeVerificationViewController: OTPViewDelegate {
     
     func didFullCodeCompletion(_ otpView: OTPView) {
         print("code -> \(String(describing: otpView.code))")
-        guard let code = otpView.code else { return }
-        if code.isEmpty {
-            mainView.otpView.isError.toggle()
-            otpView.reloadInputViews()
-        }
-        
     }
 }

@@ -11,15 +11,12 @@ class ResidentsViewController: UIViewController {
     var mainView = ResidentsView()
     var myData: [ResidentModel] = []
     
-    let networkManager = AuthService()
-    
     override func loadView() {
         view = mainView
     }
     
     override func viewDidLoad() {
         initViewController()
-        initDevice()
     }
     
     func initViewController() {
@@ -31,32 +28,6 @@ class ResidentsViewController: UIViewController {
         mainView.addResidentsButton.addTarget(self, action: #selector(willShowAddResidentVC), for: .touchUpInside)
     }
     
-    func modelFilling() -> InitRequestModel? {
-        guard let deviceUUID = UIDevice.current.identifierForVendor?.uuidString else {
-            return nil
-        }
-        guard let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else {
-            return nil
-        }
-        return InitRequestModel(deviceUUID: deviceUUID,
-                                manufacturer: .Text.apple,
-                                model: UIDevice.current.model,
-                                platform: UIDevice.current.systemName,
-                                osVersion: UIDevice.current.systemVersion,
-                                appVersion: appVersion)
-    }
-    
-    private func initDevice() {
-        guard let model = modelFilling() else {
-            return
-        }
-        AuthService.share.initRequest(model: model) { result in
-            print("1️⃣✅\(result.message)✅")
-        } fail: { error in
-            print("1️⃣\(error)")
-        }
-    }
-    
     @objc private func didShowChooseApartVC() {
         navigationController?.popViewController(animated: true)
     }
@@ -111,14 +82,6 @@ extension ResidentsViewController: ResidentTableViewCellDelegate {
         mainView.tableView.reloadData()
     }
     
-//    func didButtonsTapped(_ button: UIButton) {
-//        if !button.isSelected {
-//            button.isSelected = true
-//        } else {
-//            button.isSelected = false
-//        }
-//    }
-    
     func didManagerButtonTapped(cell: ResidentTableViewCell) {
         if !cell.managerButton.isSelected {
             cell.managerButton.isSelected = true

@@ -8,9 +8,8 @@
 import UIKit
 
 class SettingsViewController: UIViewController {
-    var mainView = SettingsView()
-    var networkManager = AuthService()
-    
+    var logoutMessage: String?
+    var mainView = SettingsView()    
     let settingsModel = SettingsModel.allCases
     
     override func loadView() {
@@ -30,7 +29,7 @@ class SettingsViewController: UIViewController {
         mainView.settingsTableView.registerReusableCell(SettingsTableViewCell.self)
         
         mainView.backButton.addTarget(self, action: #selector(didShowHomeVC), for: .touchUpInside)
-        mainView.logoutButton.addTarget(self, action: #selector(didLogoutAndShowVerificationVC), for: .touchUpInside)
+        mainView.logoutButton.addTarget(self, action: #selector(didTapLogoutButton), for: .touchUpInside)
     }
 }
 //MARK: - Delegate
@@ -39,27 +38,50 @@ extension SettingsViewController {
         navigationController?.popViewController(animated: true)
     }
     
-    @objc private func didLogoutAndShowVerificationVC() {
-        networking()
-        let vc = VerificationViewController()
-        navigationController?.pushViewController(vc, animated: true)
+    @objc private func didTapLogoutButton() {
+        logoutRequestProcessing()
+        
     }
     
-    func networking() {
-        guard let logoutModel = logoutModelFilling() else { return }
-        AuthService.share.logoutRequest(model: logoutModel) { response in
+    func logoutRequestProcessing() {
+        guard let logoutModel = getLogoutModel() else { return }
+        AuthService.shared.logoutRequest(model: logoutModel) { response in
+            self.logoutMessage = response.message
+            self.logoutDataProcessing()
             print("5️⃣❇️\(response.message ?? "Data not received!")❇️")
         } fail: { error in
+            self.logoutErrorProcessing()
             print("5️⃣❗️\(error)❗️")
         }
     }
     
-    func logoutModelFilling() -> LogoutRequestModel? {
+    func getLogoutModel() -> LogoutRequestModel? {
         guard let deviceUUID = UIDevice.current.identifierForVendor?.uuidString else {
             return nil
         }
         return LogoutRequestModel(deviceUUID: deviceUUID)
     }
+    
+    private func logoutDataProcessing() {
+        let alert = UIAlertController(title: "Do you really want to logout?", message: "", preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "Yes", style: .default, handler: { action in
+            let vc = VerificationViewController()
+            self.navigationController?.pushViewController(vc, animated: true)
+        }))
+        alert.addAction(UIAlertAction(title: "No", style: .cancel, handler: nil))
+        present(alert, animated: true, completion: nil)
+    }
+    
+    private func logoutErrorProcessing() {
+        if logoutMessage != "OK" {
+            let alert = UIAlertController(title: "Some network problems", message: "", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
+            present(alert, animated: true, completion: nil)
+        } else {
+            let vc = VerificationViewController()
+            self.navigationController?.pushViewController(vc, animated: true)
+        }
+    }
 }
 
 //MARK: tableView delegate and datasource

@@ -32,7 +32,7 @@ class VerificationView: UIView {
         var label = UILabel()
         label.text = .Text.letsVerifyYourAccount
         label.numberOfLines = 2
-        label.font = .skModernist(type: .regular, ofSize: 38)
+        label.font = .skModernist(type: .regular, ofSize: 28)
         return label
     }()
     

@@ -8,8 +8,8 @@
 import UIKit
 
 class VerificationViewController: UIViewController {
-    var networkManager = AuthService()
     var isKeyboardAppear = false
+    var startMessage: String?
     private let mainView = VerificationView()
     var closeTap: UITapGestureRecognizer?
     
@@ -57,13 +57,69 @@ class VerificationViewController: UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(notification:)), name: UIResponder.keyboardWillHideNotification, object: nil)
     }
     
-    func networking() {
+    private func initDevice() {
+        guard let model = getInitModel() else {
+            return
+        }
+        AuthService.shared.initRequest(model: model) { result in
+            print("1️⃣✅\(result.message)✅")
+            self.startRequestProcessing()
+        } fail: { error in
+            print("1️⃣\(error)")
+            let alert = UIAlertController(title: "Error", message: "", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "Cancel", style: .default, handler: nil))
+            self.present(alert, animated: true, completion: nil)
+        }
+    }
+    
+    func getInitModel() -> InitRequestModel? {
+        guard let deviceUUID = UIDevice.current.identifierForVendor?.uuidString else {
+            return nil
+        }
+        guard let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else {
+            return nil
+        }
+        return InitRequestModel(deviceUUID: deviceUUID,
+                                manufacturer: .Text.apple,
+                                model: UIDevice.current.model,
+                                platform: UIDevice.current.systemName,
+                                osVersion: UIDevice.current.systemVersion,
+                                appVersion: appVersion)
+    }
+    
+    private func startRequestProcessing() {
         guard let startModel = startModelFilling() else { return }
-        AuthService.share.startRequest(model: startModel) { response in
+        AuthService.shared.startRequest(model: startModel) { response in
+            self.startMessage = response.message
             print("2️⃣✅\(response.message)✅")
+            self.didShowCodeVerificationVC()
         } fail: { error in
             print("2️⃣❌\(error)❌")
+            self.errorProcessing()
+        }
+    }
+    
+    func didShowCodeVerificationVC() {
+        if startMessage == "SMS successfully sent" {
+            let viewController = CodeVerificationViewController()
+            viewController.navigationItem.hidesBackButton = true
+            navigationController?.pushViewController(viewController, animated: true)
+        } else {
+            userDoesNotExistNotice()
         }
+        
+    }
+    
+    private func userDoesNotExistNotice() {
+        let alert = UIAlertController(title: "User does not exist", message: "Try again", preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: nil))
+        present(alert, animated: true)
+    }
+    
+    private func errorProcessing() {
+        let alert = UIAlertController(title: "Network error", message: "Try again later", preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: nil))
+        present(alert, animated: true)
     }
     
     func startModelFilling() -> StartRequestModel? {
@@ -76,7 +132,7 @@ class VerificationViewController: UIViewController {
         }
     }
     
-    func addDoneButtonOnKeyboard() {
+    private func addDoneButtonOnKeyboard() {
             let doneToolbar: UIToolbar = UIToolbar(frame: CGRect.init(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 50))
             doneToolbar.barStyle = .default
 
@@ -90,9 +146,8 @@ class VerificationViewController: UIViewController {
         mainView.phoneTextField.inputAccessoryView = doneToolbar
         }
 
-        @objc func doneButtonAction(){
+        @objc private func doneButtonAction(){
             mainView.phoneTextField.resignFirstResponder()
-            didShowCodeVerificationVC()
         }
 }
 
@@ -109,10 +164,12 @@ extension VerificationViewController {
             sender.isSelected = true
             mainView.phoneNumberButton.isSelected = false
             mainView.handleUI(true)
+            mainView.phoneTextField.resignFirstResponder()
         case mainView.phoneNumberButton:
             sender.isSelected = true
             mainView.emailButton.isSelected = false
             mainView.handleUI(false)
+            mainView.emailTextField.resignFirstResponder()
         default:
             return
         }
@@ -124,28 +181,19 @@ extension VerificationViewController {
     }
     
     @objc private func didTapContinueButton() {
-        didShowCodeVerificationVC()
+        validatingTheLoginField()
     }
     
-    private func didShowCodeVerificationVC() {
+    private func validatingTheLoginField() {
         guard let email = mainView.emailTextField.text else { return }
         guard let number = mainView.phoneTextField.text else { return }
-        let userCode: String = .Text.userCode
+        
         if email.isEmpty || number.isEmpty{
             let alert = UIAlertController(title: "Enter email or number fields", message: "", preferredStyle: .alert)
             alert.addAction(UIAlertAction(title: "Ok", style: .cancel, handler: nil))
             present(alert, animated: true)
-        } else { if email == userCode || number == userCode {
-            let vc = CodeVerificationViewController()
-            vc.navigationItem.hidesBackButton = true
-            navigationController?.pushViewController(vc, animated: true)
-            networking()
-        } else { if email != userCode || number != userCode {
-            let alert = UIAlertController(title: "User does not exist", message: "", preferredStyle: .alert)
-            alert.addAction(UIAlertAction(title: "Ok", style: .cancel, handler: nil))
-            present(alert, animated: true)
-        }
-        }
+        } else {
+            initDevice()
         }
     }