Skip to content
This repository was archived by the owner on Oct 10, 2025. It is now read-only.

Commit ae5bf3b

Browse files
Use magic_get_info instead of magic_auth_get_metadata (#32)
* Use magic_get_info instead of magic_auth_get_metadata * Major version bump
1 parent c172428 commit ae5bf3b

File tree

6 files changed

+66
-12
lines changed

6 files changed

+66
-12
lines changed

MagicSDK.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
Pod::Spec.new do |s|
55
s.name = 'MagicSDK'
6-
s.version = '9.1.1'
6+
s.version = '10.0.0'
77
s.summary = 'Magic IOS SDK'
88

99
s.description = <<-DESC
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//
2+
// UserResponse.swift
3+
// Magic
4+
//
5+
// Created by Romin Halltari on 11/22/2023.
6+
// Copyright © 2020 Magic Labs Inc. All rights reserved.
7+
//
8+
9+
10+
import Foundation
11+
12+
public class RecoveryFactor: Codable {
13+
public var value: String
14+
public var type: RecoveryMethodType
15+
16+
public init(value: String, type: RecoveryMethodType) {
17+
self.value = value
18+
self.type = type
19+
}
20+
21+
public var description: String {
22+
return "value: \(value)\ntype: \(type.rawValue)\n"
23+
}
24+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//
2+
// RecoveryMethodType.swift
3+
// Magic
4+
//
5+
// Created by Romin Halltari on 11/22/2023.
6+
// Copyright © 2020 Magic Labs Inc. All rights reserved.
7+
//
8+
9+
import Foundation
10+
11+
public enum RecoveryMethodType: String, Codable {
12+
case phoneNumber = "PHONE_NUMBER"
13+
14+
public var description: String {
15+
return rawValue.lowercased()
16+
}
17+
}

Sources/MagicSDK/Modules/User/UserMethod.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ internal enum UserMethod: String, CaseIterable {
1313
// Auth
1414
case magic_auth_get_id_token
1515
case magic_auth_generate_id_token
16-
case magic_auth_get_metadata
16+
case magic_get_info
1717
case magic_auth_logout
1818
case magic_auth_settings
1919
case magic_auth_update_email

Sources/MagicSDK/Modules/User/UserModule.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,22 @@ public class UserModule: BaseModule {
6060

6161

6262
/**
63-
Get Metadata
63+
Get Info
6464
*/
65-
public func getMetadata(response: @escaping Web3ResponseCompletion<UserMetadata>) {
65+
public func getInfo(response: @escaping Web3ResponseCompletion<UserInfo>) {
6666
if #available(iOS 14.0, *) {
67-
UserModule.logger.warning("getMetadata: \(BaseWarningLog.MA_Method)")
67+
UserModule.logger.warning("getInfo: \(BaseWarningLog.MA_Method)")
6868
} else {
69-
print("getMetadata: \(BaseWarningLog.MA_Method)")
69+
print("getInfo: \(BaseWarningLog.MA_Method)")
7070
}
7171

72-
let request = BasicRPCRequest(method: UserMethod.magic_auth_get_metadata.rawValue, params: [])
72+
let request = BasicRPCRequest(method: UserMethod.magic_get_info.rawValue, params: [])
7373
return self.provider.send(request: request, response: response)
7474
}
7575

76-
public func getMetadata() -> Promise<UserMetadata> {
76+
public func getInfo() -> Promise<UserInfo> {
7777
return Promise { resolver in
78-
getMetadata(response: promiseResolver(resolver))
78+
getInfo(response: promiseResolver(resolver))
7979
}
8080
}
8181

@@ -141,7 +141,7 @@ public class UserModule: BaseModule {
141141
/**
142142
showSettings
143143
*/
144-
public func showSettings(response: @escaping Web3ResponseCompletion<UserMetadata>) {
144+
public func showSettings(response: @escaping Web3ResponseCompletion<UserInfo>) {
145145
if #available(iOS 14.0, *) {
146146
UserModule.logger.warning("showSettings: \(BaseWarningLog.MA_Method)")
147147
} else {
@@ -152,7 +152,7 @@ public class UserModule: BaseModule {
152152
self.provider.send(request: request, response: response)
153153
}
154154

155-
public func showSettings() -> Promise<UserMetadata> {
155+
public func showSettings() -> Promise<UserInfo> {
156156
return Promise { resolver in
157157
showSettings(response: promiseResolver(resolver))
158158
}

Sources/MagicSDK/Modules/User/UserResponse.swift

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,23 @@ import MagicSDK_Web3
1212
public protocol MagicResponse: Codable {}
1313

1414
/// Get Id Token configuration
15-
public struct UserMetadata: MagicResponse {
15+
public struct UserInfo: MagicResponse {
1616

1717
public let issuer: String?
1818
public let publicAddress: String?
1919
public let email: String?
2020
public let phoneNumber: String?
21+
public let isMfaEnabled: Bool
22+
public let recoveryFactors: [RecoveryFactor]
23+
24+
public var description: String {
25+
return """
26+
issuer: \(issuer ?? "nil")
27+
publicAddress: \(publicAddress ?? "nil")
28+
email: \(email ?? "nil")
29+
phoneNumber: \(phoneNumber ?? "nil")
30+
isMfaEnabled: \(isMfaEnabled)
31+
recoveryFactors: \(recoveryFactors)
32+
"""
33+
}
2134
}

0 commit comments

Comments
 (0)