Merge pull request #54 from MetaMask/dapp-platform

Add device platform in dapp metadata
MetaMask · Feb 14, 2023 · ada7983 · ada7983
2 parents decdcfd + 6123864
commit ada7983
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/Example/metamask-ios-sdk/SwitchChainView.swift b/Example/metamask-ios-sdk/SwitchChainView.swift
@@ -108,6 +108,11 @@ struct SwitchChainView: View {
                 .modifier(ButtonStyle())
             }
         }
+        .onAppear {
+            networkSelection = ethereum.chainId == networkSelection.rawValue
+                ? .ethereum
+            : .goerli
+        }
         .background(Color.blue.grayscale(0.5))
     }
 

diff --git a/Sources/metamask-ios-sdk/Classes/Communication/SocketClient.swift b/Sources/metamask-ios-sdk/Classes/Communication/SocketClient.swift
@@ -282,7 +282,8 @@ extension SocketClient {
     func sendOriginatorInfo() {
         let originatorInfo = OriginatorInfo(
             title: dapp?.name,
-            url: dapp?.url
+            url: dapp?.url,
+            platform: SDKInfo.platform
         )
 
         let requestInfo = RequestInfo(
@@ -361,7 +362,7 @@ extension SocketClient {
                 "sdkVersion": SDKInfo.version,
                 "url": dapp?.url ?? "",
                 "title": dapp?.name ?? "",
-                "platform": UIDevice.current.systemName
+                "platform": SDKInfo.platform
             ]
             parameters.merge(additionalParams) { current, _ in current }
         }

diff --git a/Sources/metamask-ios-sdk/Classes/Communication/models/Models.swift b/Sources/metamask-ios-sdk/Classes/Communication/models/Models.swift
@@ -12,9 +12,14 @@ public typealias CodableData = Codable & SocketData
 struct OriginatorInfo: CodableData {
     let title: String?
     let url: String?
+    let platform: String?
 
     func socketRepresentation() -> NetworkData {
-        ["title": title ?? "", "url": url ?? ""]
+        [
+            "title": title,
+            "url": url,
+            "platform": platform
+        ]
     }
 }
 

diff --git a/Sources/metamask-ios-sdk/Classes/Ethereum/Dapp.swift b/Sources/metamask-ios-sdk/Classes/Ethereum/Dapp.swift
@@ -7,6 +7,7 @@ import Foundation
 public struct Dapp {
     public let name: String
     public let url: String
+    var platform: String = "ios"
 
     public init(name: String, url: String) {
         self.name = name

diff --git a/Sources/metamask-ios-sdk/Classes/SDK/SDKInfo.swift b/Sources/metamask-ios-sdk/Classes/SDK/SDKInfo.swift
@@ -2,9 +2,10 @@
 //  SDKInfo.swift
 //
 
+import UIKit
 import Foundation
 
-struct SDKInfo {
+enum SDKInfo {
     /// Bundle with SDK plist
     static var sdkBundle: [String: Any] {
         Bundle(for: MetaMaskSDK.self).infoDictionary ?? [:]
@@ -14,4 +15,9 @@ struct SDKInfo {
     static var version: String {
         sdkBundle["CFBundleShortVersionString"] as? String ?? ""
     }
+
+    /// The platform OS on which the SDK is run e.g `ios, ipados`
+    static var platform: String {
+        UIDevice.current.systemName.lowercased()
+    }
 }