Skip to content
This repository has been archived by the owner on Sep 4, 2024. It is now read-only.

Commit

Permalink
Cleans up logs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ariflo
Ariflo committed Mar 1, 2023
1 parent 9d1b490 commit 5ce2bcd
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 77 deletions.
35 changes: 11 additions & 24 deletions Sources/MagicSDK/Modules/Auth/AuthModule.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,60 +25,47 @@ public class AuthModule: BaseModule {
}

public func loginWithMagicLink (_ configuration: LoginWithMagicLinkConfiguration) -> Promise<String> {
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<String> {
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))
}
}

// MARK: - Login with SMS
public func loginWithSMS (_ configuration: LoginWithSmsConfiguration, response: @escaping Web3ResponseCompletion<String> ) {
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<String> {
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))
}
}

// MARK: - Login with EmailOTP
public func loginWithEmailOTP (_ configuration: LoginWithEmailOTPConfiguration, response: @escaping Web3ResponseCompletion<String> ) {
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<String> {
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<String> {
return Promise { resolver in
loginWithEmailOTP(configuration, response: promiseResolver(resolver))
}
Expand Down
94 changes: 46 additions & 48 deletions Sources/MagicSDK/Modules/User/UserModule.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@ public class UserModule: BaseModule {
GetIdToken
*/
public func getIdToken(_ configuration: GetIdTokenConfiguration? = nil, response: @escaping Web3ResponseCompletion<String>) {
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<String> {
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))
}
Expand All @@ -40,18 +41,18 @@ public class UserModule: BaseModule {
Generate Id Token
*/
public func generateIdToken(_ configuration: GenerateIdTokenConfiguration? = nil, response: @escaping Web3ResponseCompletion<String>) {
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<String> {
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))
}
Expand All @@ -62,17 +63,17 @@ public class UserModule: BaseModule {
Get Metadata
*/
public func getMetadata(response: @escaping Web3ResponseCompletion<UserMetadata>) {
let request = BasicRPCRequest(method: UserMethod.magic_auth_get_metadata.rawValue, params: [])
return self.provider.send(request: request, response: response)
}

public func getMetadata() -> Promise<UserMetadata> {
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<UserMetadata> {
return Promise { resolver in
getMetadata(response: promiseResolver(resolver))
}
Expand All @@ -82,17 +83,16 @@ public class UserModule: BaseModule {
IsLogged In
*/
public func isLoggedIn(response: @escaping Web3ResponseCompletion<Bool>) {
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<Bool> {
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))
}
Expand All @@ -102,31 +102,18 @@ public class UserModule: BaseModule {
* Update Email
*/
public func updateEmail(_ configuration: UpdateEmailConfiguration, response: @escaping Web3ResponseCompletion<Bool>) {

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<Bool> {
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<Bool> {
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))
}
Expand All @@ -136,17 +123,17 @@ public class UserModule: BaseModule {
Logout
*/
public func logout (response: @escaping Web3ResponseCompletion<Bool>) {
let request = BasicRPCRequest(method: UserMethod.magic_auth_logout.rawValue, params: [])
self.provider.send(request: request, response: response)
}

public func logout() -> Promise<Bool> {
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<Bool> {
return Promise { resolver in
logout(response: promiseResolver(resolver))
}
Expand All @@ -155,17 +142,17 @@ public class UserModule: BaseModule {
showSettings
*/
public func showSettings(response: @escaping Web3ResponseCompletion<String>) {
let request = BasicRPCRequest(method: UserMethod.magic_auth_settings.rawValue, params: [])
self.provider.send(request: request, response: response)
}

public func showSettings() -> Promise<String> {
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<String> {
return Promise { resolver in
showSettings(response: promiseResolver(resolver))
}
Expand All @@ -175,6 +162,12 @@ public class UserModule: BaseModule {
updatePhoneNumber
*/
public func updatePhoneNumber(response: @escaping Web3ResponseCompletion<String>) {
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)
}
Expand All @@ -189,6 +182,11 @@ public class UserModule: BaseModule {
recoverAccount
*/
public func recoverAccount(_ configuration: RecoverAccountConfiguration, response: @escaping Web3ResponseCompletion<Bool>) {
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])

Expand Down
11 changes: 6 additions & 5 deletions Sources/MagicSDK/Modules/Wallet/WalletModule.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ public class WalletModule: BaseModule {
category: String(describing: WalletModule.self)
)


/**
connectWithUI
*/
public func connectWithUI(response: @escaping Web3ResponseCompletion<[String]>) {
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: [])
Expand All @@ -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: [])
Expand All @@ -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: [])
Expand All @@ -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]: [])
Expand All @@ -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: [])
Expand Down

0 comments on commit 5ce2bcd

Please sign in to comment.