diff --git a/GMERemittance/Base.lproj/Main.storyboard b/GMERemittance/Base.lproj/Main.storyboard index f9ff64d9..715b589d 100644 --- a/GMERemittance/Base.lproj/Main.storyboard +++ b/GMERemittance/Base.lproj/Main.storyboard @@ -2810,7 +2810,6 @@ - @@ -2825,6 +2824,7 @@ + @@ -3511,7 +3511,7 @@ - + diff --git a/GMERemittance/Login/LoginViewModel.swift b/GMERemittance/Login/LoginViewModel.swift index dc93bb28..f43c2916 100644 --- a/GMERemittance/Login/LoginViewModel.swift +++ b/GMERemittance/Login/LoginViewModel.swift @@ -8,39 +8,6 @@ import Foundation -//{ -// "userId": "ranjan@mailinator.com", -// "firstName": "preyea", -// "middleName": "", -// "lastName": "regmi", -// "nickName": "ranjan", -// "email": "ranjan@mailinator.com", -// "mobileNumber": "9849165388", -// "rewardPoint": "0", -// "walletNumber": "", -// "availableBalance": "0", -// "primaryBankName": "Kwangju Bank(KJ)", -// "accessCode": "7019A90D-79C8-43F3-9093-C099DC4D3DA9", -// "dpUrl": null, -// "kyc": true, -// "verified": true, -// "active": true, -// "cmRegistrationId": "", -// "isReferred": false, -// "country": "South Korea", -// "province": "Andong", -// "provinceId": "1", -// "sourceId": "3901", -// "idType": "10997", -// "idNumber": "12554", -// "countryCode": "NP", -// "ErrorCode": "0", -// "Msg": "", -// "Id": "", -// "Data": null -//} - - class LoginViewModel: SignUpViewModel, Login { var loggedin: Box = Box(nil) diff --git a/GMERemittance/RestApiManager.swift b/GMERemittance/RestApiManager.swift index aa709d7e..41307b8c 100644 --- a/GMERemittance/RestApiManager.swift +++ b/GMERemittance/RestApiManager.swift @@ -28,8 +28,8 @@ class RestApiMananger { init() { self.manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.session.configuration.timeoutIntervalForRequest = 600 + manager.session.configuration.timeoutIntervalForResource = 600 } func getUUID() -> String { @@ -93,10 +93,7 @@ class RestApiMananger { //Signing up a new user func registerUser(userId: String, password: String, completion: @escaping (ApiResult) -> Void) { - - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getSignupURL())!, @@ -129,10 +126,7 @@ class RestApiMananger { //Verification of 4 digit code for func authenticateUser(code: String, userId: String, completion: @escaping (ApiResult) -> Void) { - - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getCodeVerificationURL(userId: userId))!, @@ -182,10 +176,7 @@ class RestApiMananger { default: param = nil } - - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getRequestAnotherCodeURL(userId: userId))!, @@ -222,9 +213,7 @@ class RestApiMananger { //Logging in user func signInUser(userId: String, password: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager .request( URL(string: UrlManager.sharedInstance.getLogInURL())!, method: .post, @@ -255,10 +244,7 @@ class RestApiMananger { //Checking user verification for password reset process, 1 of 3 func isVerifiedUser(userId: String, completion: @escaping (ApiResult) -> Void) { - - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getUserVerificationURLforPasswordReset())!, @@ -296,10 +282,6 @@ class RestApiMananger { func submitUserDOB(userId: String, userDOB: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 - manager.request( URL(string: UrlManager.sharedInstance.getDOBVerificationURLforPasswordReset(userId: userId))!, method: .post, @@ -336,10 +318,6 @@ class RestApiMananger { //Getting 4 digit code for password reset, 3 of 3 func reAuthenticateUser(code: String, userId: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 - manager.request( URL(string: UrlManager.sharedInstance.getResetCodeValidationURL(userId: userId))!, method: .post, @@ -375,10 +353,7 @@ class RestApiMananger { //Resetting password func resetPassword(userId: String, password: String, completion: @escaping (ApiResult) -> Void) { - - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getPasswordUpdateURL(userId: userId))!, @@ -417,9 +392,6 @@ class RestApiMananger { // Getting recipients as per pagination func fetchRecipientListThroughPagination(userId: String, page: Int, size: Int, completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 manager.request( URL(string: UrlManager.sharedInstance.getRecipientListURLForPagination())!, @@ -460,9 +432,6 @@ class RestApiMananger { //Creating a new recipient func createNewRecipient(recipientDetails: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 manager.request( URL(string: UrlManager.sharedInstance.getNewRecipientURL())!, @@ -502,9 +471,6 @@ class RestApiMananger { //Updating a recipient func updateRecipient(recipientId: String, recipientDetails: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 manager.request( URL(string: UrlManager.sharedInstance.getUpdateRecipientURL(recipientId: recipientId))!, @@ -544,10 +510,6 @@ class RestApiMananger { //Removing an existing recipient func deleteRecipient(recipientId: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 - manager.request( URL(string: UrlManager.sharedInstance.getDeleteRecipientURL(recipientId: recipientId))!, method: .delete, @@ -611,10 +573,6 @@ class RestApiMananger { //Getting transaction Information on send money and wallet func getTransactionInfo(param: [String: String],completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 - manager .request manager.request( URL(string: UrlManager.sharedInstance.getTransactionInformationURL())!, @@ -652,10 +610,6 @@ class RestApiMananger { } func getCurrency(param: [String: String],completion: @escaping (ApiResult) -> Void) { - - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 manager.request( URL(string: UrlManager.sharedInstance.getCurrencyURL())!, @@ -696,9 +650,6 @@ class RestApiMananger { //Recharging mobile func rechargeMobile(rechargeDetails: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 manager.request( URL(string: UrlManager.sharedInstance.getRechargeURL())!, @@ -737,11 +688,7 @@ class RestApiMananger { //Recharging amounts for mobile recharge func amountsForMobileRecharge(rechargeDetails: [String: String], completion: @escaping (ApiResult) -> Void) { - - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 - + manager.request( URL(string: UrlManager.sharedInstance.getURLForMobileRechargeAmount())!, method: .get, @@ -779,9 +726,6 @@ class RestApiMananger { func callMobileOperator(rechargeDetails: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 manager.request( URL(string: UrlManager.sharedInstance.getMobileOperator())!, @@ -821,10 +765,6 @@ class RestApiMananger { //Getting Bank Details func getBankDetails(completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 - manager.request( URL(string: UrlManager.sharedInstance.getBankDetailsURL())!, method: .get, @@ -862,9 +802,6 @@ class RestApiMananger { func getSource(completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 Alamofire.request( URL(string: UrlManager.sharedInstance.getSourceURL())!, @@ -903,9 +840,6 @@ class RestApiMananger { func getTransferReason(completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 manager.request( URL(string: UrlManager.sharedInstance.getTransferReasonURL())!,