From 5ce2bcde03bb743df2a4b2823f56cf2b0bf799b7 Mon Sep 17 00:00:00 2001 From: Arian Flores Date: Wed, 1 Mar 2023 14:47:52 -0800 Subject: [PATCH] Cleans up logs --- .../MagicSDK/Modules/Auth/AuthModule.swift | 35 +++---- .../MagicSDK/Modules/User/UserModule.swift | 94 +++++++++---------- .../Modules/Wallet/WalletModule.swift | 11 ++- 3 files changed, 63 insertions(+), 77 deletions(-) diff --git a/Sources/MagicSDK/Modules/Auth/AuthModule.swift b/Sources/MagicSDK/Modules/Auth/AuthModule.swift index 67676b8..6f4108d 100644 --- a/Sources/MagicSDK/Modules/Auth/AuthModule.swift +++ b/Sources/MagicSDK/Modules/Auth/AuthModule.swift @@ -25,24 +25,12 @@ public class AuthModule: BaseModule { } public func loginWithMagicLink (_ configuration: LoginWithMagicLinkConfiguration) -> Promise { - if #available(iOS 14.0, *) { - AuthModule.logger.warning("loginWithMagicLink: \(BaseWarningLog.MA_Method)") - } else { - print("\(BaseWarningLog.MA_Method)") - } - return Promise { resolver in loginWithMagicLink(configuration, response: promiseResolver(resolver)) } } public func loginWithMagicLink (_ configuration: LoginWithMagicLinkConfiguration, eventLog: Bool) -> MagicEventPromise { - if #available(iOS 14.0, *) { - AuthModule.logger.warning("loginWithMagicLink: \(BaseWarningLog.MA_Method)") - } else { - print("\(BaseWarningLog.MA_Method)") - } - return MagicEventPromise (eventCenter: self.magicEventCenter, eventLog: eventLog) { resolver in self.loginWithMagicLink(configuration, response: promiseResolver(resolver)) } @@ -50,17 +38,16 @@ public class AuthModule: BaseModule { // MARK: - Login with SMS public func loginWithSMS (_ configuration: LoginWithSmsConfiguration, response: @escaping Web3ResponseCompletion ) { + if #available(iOS 14.0, *) { + AuthModule.logger.warning("loginWithSMS: \(BaseWarningLog.MA_Method)") + } else { + print("loginWithSMS: \(BaseWarningLog.MA_Method)") + } let request = RPCRequest<[LoginWithSmsConfiguration]>(method: AuthMethod.magic_auth_login_with_sms.rawValue, params: [configuration]) self.provider.send(request: request, response: response) } public func loginWithSMS (_ configuration: LoginWithSmsConfiguration) -> Promise { - if #available(iOS 14.0, *) { - AuthModule.logger.warning("loginWithSMS: \(BaseWarningLog.MA_Method)") - } else { - print("\(BaseWarningLog.MA_Method)") - } - return Promise { resolver in loginWithSMS(configuration, response: promiseResolver(resolver)) } @@ -68,17 +55,17 @@ public class AuthModule: BaseModule { // MARK: - Login with EmailOTP public func loginWithEmailOTP (_ configuration: LoginWithEmailOTPConfiguration, response: @escaping Web3ResponseCompletion ) { - let request = RPCRequest<[LoginWithEmailOTPConfiguration]>(method: AuthMethod.magic_auth_login_with_email_otp.rawValue, params: [configuration]) - self.provider.send(request: request, response: response) - } - - public func loginWithEmailOTP (_ configuration: LoginWithEmailOTPConfiguration) -> Promise { if #available(iOS 14.0, *) { AuthModule.logger.warning("loginWithEmailOTP: \(BaseWarningLog.MA_Method)") } else { - print("\(BaseWarningLog.MA_Method)") + print("loginWithEmailOTP: \(BaseWarningLog.MA_Method)") } + let request = RPCRequest<[LoginWithEmailOTPConfiguration]>(method: AuthMethod.magic_auth_login_with_email_otp.rawValue, params: [configuration]) + self.provider.send(request: request, response: response) + } + + public func loginWithEmailOTP (_ configuration: LoginWithEmailOTPConfiguration) -> Promise { return Promise { resolver in loginWithEmailOTP(configuration, response: promiseResolver(resolver)) } diff --git a/Sources/MagicSDK/Modules/User/UserModule.swift b/Sources/MagicSDK/Modules/User/UserModule.swift index c4ea4e4..2445e8c 100644 --- a/Sources/MagicSDK/Modules/User/UserModule.swift +++ b/Sources/MagicSDK/Modules/User/UserModule.swift @@ -20,17 +20,18 @@ public class UserModule: BaseModule { GetIdToken */ public func getIdToken(_ configuration: GetIdTokenConfiguration? = nil, response: @escaping Web3ResponseCompletion) { + if #available(iOS 14.0, *) { + UserModule.logger.warning("getIdToken: \(BaseWarningLog.MA_Method)") + } else { + print("getIdToken: \(BaseWarningLog.MA_Method)") + } + let request = RPCRequest<[GetIdTokenConfiguration?]>(method: UserMethod.magic_auth_get_id_token.rawValue, params: [configuration]) return self.provider.send(request: request, response: response) } public func getIdToken(_ configuration: GetIdTokenConfiguration? = nil) -> Promise { - if #available(iOS 14.0, *) { - UserModule.logger.warning("getIdToken: \(BaseWarningLog.MA_Method)") - } else { - print("\(BaseWarningLog.MA_Method)") - } return Promise { resolver in getIdToken(configuration, response: promiseResolver(resolver)) } @@ -40,18 +41,18 @@ public class UserModule: BaseModule { Generate Id Token */ public func generateIdToken(_ configuration: GenerateIdTokenConfiguration? = nil, response: @escaping Web3ResponseCompletion) { + if #available(iOS 14.0, *) { + UserModule.logger.warning("generateIdToken: \(BaseWarningLog.MA_Method)") + } else { + print("generateIdToken: \(BaseWarningLog.MA_Method)") + } + let request = RPCRequest<[GenerateIdTokenConfiguration?]>(method: UserMethod.magic_auth_generate_id_token.rawValue, params: [configuration]) return self.provider.send(request: request, response: response) } public func generateIdToken(_ configuration: GenerateIdTokenConfiguration? = nil) -> Promise { - if #available(iOS 14.0, *) { - UserModule.logger.warning("generateIdToken: \(BaseWarningLog.MA_Method)") - } else { - print("\(BaseWarningLog.MA_Method)") - } - return Promise { resolver in generateIdToken(configuration, response: promiseResolver(resolver)) } @@ -62,17 +63,17 @@ public class UserModule: BaseModule { Get Metadata */ public func getMetadata(response: @escaping Web3ResponseCompletion) { - let request = BasicRPCRequest(method: UserMethod.magic_auth_get_metadata.rawValue, params: []) - return self.provider.send(request: request, response: response) - } - - public func getMetadata() -> Promise { if #available(iOS 14.0, *) { UserModule.logger.warning("getMetadata: \(BaseWarningLog.MA_Method)") } else { - print("\(BaseWarningLog.MA_Method)") + print("getMetadata: \(BaseWarningLog.MA_Method)") } + let request = BasicRPCRequest(method: UserMethod.magic_auth_get_metadata.rawValue, params: []) + return self.provider.send(request: request, response: response) + } + + public func getMetadata() -> Promise { return Promise { resolver in getMetadata(response: promiseResolver(resolver)) } @@ -82,17 +83,16 @@ public class UserModule: BaseModule { IsLogged In */ public func isLoggedIn(response: @escaping Web3ResponseCompletion) { + if #available(iOS 14.0, *) { + UserModule.logger.warning("isLoggedIn: \(BaseWarningLog.MA_Method)") + } else { + print("isLoggedIn: \(BaseWarningLog.MA_Method)") + } let request = BasicRPCRequest(method: UserMethod.magic_auth_is_logged_in.rawValue, params: []) self.provider.send(request: request, response: response) } public func isLoggedIn() -> Promise { - if #available(iOS 14.0, *) { - UserModule.logger.warning("isLoggedIn: \(BaseWarningLog.MA_Method)") - } else { - print("\(BaseWarningLog.MA_Method)") - } - return Promise { resolver in isLoggedIn(response: promiseResolver(resolver)) } @@ -102,31 +102,18 @@ public class UserModule: BaseModule { * Update Email */ public func updateEmail(_ configuration: UpdateEmailConfiguration, response: @escaping Web3ResponseCompletion) { - let request = RPCRequest<[UpdateEmailConfiguration]>(method: UserMethod.magic_auth_update_email.rawValue, params: [configuration]) return self.provider.send(request: request, response: response) } public func updateEmail(_ configuration: UpdateEmailConfiguration) -> Promise { - if #available(iOS 14.0, *) { - UserModule.logger.warning("updateEmail: \(BaseWarningLog.MA_Method)") - } else { - print("\(BaseWarningLog.MA_Method)") - } - return Promise { resolver in updateEmail(configuration, response: promiseResolver(resolver)) } } public func updateEmail(_ configuration: UpdateEmailConfiguration, eventLog: Bool) -> MagicEventPromise { - if #available(iOS 14.0, *) { - UserModule.logger.warning("updateEmail: \(BaseWarningLog.MA_Method)") - } else { - print("\(BaseWarningLog.MA_Method)") - } - return MagicEventPromise (eventCenter: self.magicEventCenter, eventLog: eventLog){ resolver in self.updateEmail(configuration, response: promiseResolver(resolver)) } @@ -136,17 +123,17 @@ public class UserModule: BaseModule { Logout */ public func logout (response: @escaping Web3ResponseCompletion) { - let request = BasicRPCRequest(method: UserMethod.magic_auth_logout.rawValue, params: []) - self.provider.send(request: request, response: response) - } - - public func logout() -> Promise { if #available(iOS 14.0, *) { UserModule.logger.warning("logout: \(BaseWarningLog.MA_Method)") } else { - print("\(BaseWarningLog.MA_Method)") + print("logout: \(BaseWarningLog.MA_Method)") } + let request = BasicRPCRequest(method: UserMethod.magic_auth_logout.rawValue, params: []) + self.provider.send(request: request, response: response) + } + + public func logout() -> Promise { return Promise { resolver in logout(response: promiseResolver(resolver)) } @@ -155,17 +142,17 @@ public class UserModule: BaseModule { showSettings */ public func showSettings(response: @escaping Web3ResponseCompletion) { - let request = BasicRPCRequest(method: UserMethod.magic_auth_settings.rawValue, params: []) - self.provider.send(request: request, response: response) - } - - public func showSettings() -> Promise { if #available(iOS 14.0, *) { UserModule.logger.warning("showSettings: \(BaseWarningLog.MA_Method)") } else { - print("\(BaseWarningLog.MA_Method)") + print("showSettings: \(BaseWarningLog.MA_Method)") } + let request = BasicRPCRequest(method: UserMethod.magic_auth_settings.rawValue, params: []) + self.provider.send(request: request, response: response) + } + + public func showSettings() -> Promise { return Promise { resolver in showSettings(response: promiseResolver(resolver)) } @@ -175,6 +162,12 @@ public class UserModule: BaseModule { updatePhoneNumber */ public func updatePhoneNumber(response: @escaping Web3ResponseCompletion) { + if #available(iOS 14.0, *) { + UserModule.logger.warning("updatePhoneNumber: \(BaseWarningLog.MA_Method)") + } else { + print("updatePhoneNumber: \(BaseWarningLog.MA_Method)") + } + let request = BasicRPCRequest(method: UserMethod.magic_auth_update_phone_number.rawValue, params: []) self.provider.send(request: request, response: response) } @@ -189,6 +182,11 @@ public class UserModule: BaseModule { recoverAccount */ public func recoverAccount(_ configuration: RecoverAccountConfiguration, response: @escaping Web3ResponseCompletion) { + if #available(iOS 14.0, *) { + UserModule.logger.warning("recoverAccount: \(BaseWarningLog.MA_Method)") + } else { + print("recoverAccount: \(BaseWarningLog.MA_Method)") + } let request = RPCRequest<[RecoverAccountConfiguration]>(method: UserMethod.magic_auth_recover_account.rawValue, params: [configuration]) diff --git a/Sources/MagicSDK/Modules/Wallet/WalletModule.swift b/Sources/MagicSDK/Modules/Wallet/WalletModule.swift index 6af6759..bb948b1 100644 --- a/Sources/MagicSDK/Modules/Wallet/WalletModule.swift +++ b/Sources/MagicSDK/Modules/Wallet/WalletModule.swift @@ -16,6 +16,7 @@ public class WalletModule: BaseModule { category: String(describing: WalletModule.self) ) + /** connectWithUI */ @@ -23,7 +24,7 @@ public class WalletModule: BaseModule { if #available(iOS 14.0, *) { WalletModule.logger.warning("connectWithUI: \(BaseWarningLog.MC_Method)") } else { - print("\(BaseWarningLog.MC_Method)") + print("connectWithUI: \(BaseWarningLog.MC_Method)") } let request = BasicRPCRequest(method: WalletMethod.mc_login.rawValue, params: []) @@ -38,7 +39,7 @@ public class WalletModule: BaseModule { if #available(iOS 14.0, *) { WalletModule.logger.warning("showUI: \(BaseWarningLog.MC_Method)") } else { - print("\(BaseWarningLog.MC_Method)") + print("showUI: \(BaseWarningLog.MC_Method)") } let request = BasicRPCRequest(method: WalletMethod.mc_wallet.rawValue, params: []) @@ -53,7 +54,7 @@ public class WalletModule: BaseModule { if #available(iOS 14.0, *) { WalletModule.logger.warning("getInfo: \(BaseWarningLog.MC_Method)") } else { - print("\(BaseWarningLog.MC_Method)") + print("getInfo: \(BaseWarningLog.MC_Method)") } let request = BasicRPCRequest(method: WalletMethod.mc_get_wallet_info.rawValue, params: []) @@ -69,7 +70,7 @@ public class WalletModule: BaseModule { if #available(iOS 14.0, *) { WalletModule.logger.warning("requestUserInfoWithUI: \(BaseWarningLog.MC_Method)") } else { - print("\(BaseWarningLog.MC_Method)") + print("requestUserInfoWithUI: \(BaseWarningLog.MC_Method)") } let request = RPCRequest<[RequestUserInfoWithUIConfiguration?]>(method: WalletMethod.mc_request_user_info.rawValue, params: (configuration != nil) ? [configuration]: []) @@ -84,7 +85,7 @@ public class WalletModule: BaseModule { if #available(iOS 14.0, *) { WalletModule.logger.warning("disconnect: \(BaseWarningLog.MC_Method)") } else { - print("\(BaseWarningLog.MC_Method)") + print("disconnect: \(BaseWarningLog.MC_Method)") } let request = BasicRPCRequest(method: WalletMethod.mc_disconnect.rawValue, params: [])