Skip to content

Commit

Permalink
fix: do the iOS side
Browse files Browse the repository at this point in the history
  • Loading branch information
@nplasterer
nplasterer committed Nov 22, 2024
1 parent b11b13c commit c881f71
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 61 deletions.
67 changes: 48 additions & 19 deletions ios/Wrappers/AuthParamsWrapper.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,77 @@ struct AuthParamsWrapper {
let appVersion: String?
let dbDirectory: String?
let historySyncUrl: String?
let walletType: WalletType
let chainId: Int64?
let blockNumber: Int64?

init(environment: String, appVersion: String?, dbDirectory: String?, historySyncUrl: String?, walletType: WalletType, chainId: Int64?, blockNumber: Int64?) {

init(
environment: String, appVersion: String?, dbDirectory: String?,
historySyncUrl: String?
) {
self.environment = environment
self.appVersion = appVersion
self.dbDirectory = dbDirectory
self.historySyncUrl = historySyncUrl
self.walletType = walletType
self.chainId = chainId
self.blockNumber = blockNumber
}

static func authParamsFromJson(_ authParams: String) -> AuthParamsWrapper {
guard let data = authParams.data(using: .utf8),
let jsonOptions = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] else {
return AuthParamsWrapper(environment: "dev", appVersion: nil, dbDirectory: nil, historySyncUrl: nil, walletType: WalletType.EOA, chainId: nil, blockNumber: nil)
let jsonOptions = try? JSONSerialization.jsonObject(
with: data, options: []) as? [String: Any]
else {
return AuthParamsWrapper(
environment: "dev", appVersion: nil, dbDirectory: nil,
historySyncUrl: nil)
}

let environment = jsonOptions["environment"] as? String ?? "dev"
let appVersion = jsonOptions["appVersion"] as? String
let dbDirectory = jsonOptions["dbDirectory"] as? String
let historySyncUrl = jsonOptions["historySyncUrl"] as? String

return AuthParamsWrapper(
environment: environment,
appVersion: appVersion,
dbDirectory: dbDirectory,
historySyncUrl: historySyncUrl
)
}
}

struct WalletParamsWrapper {
let walletType: WalletType
let chainId: Int64?
let blockNumber: Int64?

init(walletType: WalletType, chainId: Int64?, blockNumber: Int64?) {
self.walletType = walletType
self.chainId = chainId
self.blockNumber = blockNumber
}

static func walletParamsFromJson(_ walletParams: String)
-> WalletParamsWrapper
{
guard let data = walletParams.data(using: .utf8),
let jsonOptions = try? JSONSerialization.jsonObject(
with: data, options: []) as? [String: Any]
else {
return WalletParamsWrapper(
walletType: WalletType.EOA, chainId: nil, blockNumber: nil)
}

let walletTypeString = jsonOptions["walletType"] as? String ?? "EOA"
let chainId = jsonOptions["chainId"] as? Int64
let blockNumber = jsonOptions["blockNumber"] as? Int64

let walletType = { switch walletTypeString {

let walletType = {
switch walletTypeString {
case "SCW":
return WalletType.SCW
return WalletType.SCW
default:
return WalletType.EOA
}
}()


return AuthParamsWrapper(
environment: environment,
appVersion: appVersion,
dbDirectory: dbDirectory,
historySyncUrl: historySyncUrl,
return WalletParamsWrapper(
walletType: walletType,
chainId: chainId,
blockNumber: blockNumber
Expand Down
120 changes: 78 additions & 42 deletions ios/XMTPModule.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,6 @@ public class XMTPModule: Module {
try await client.requestMessageHistorySync()
}

AsyncFunction("revokeAllOtherInstallations") { (inboxId: String) in
guard let client = await clientsManager.getClient(key: inboxId)
else {
throw Error.noClient
}
let signer = ReactNativeSigner(
module: self, address: client.address)
self.signer = signer

try await client.revokeAllOtherInstallations(signingKey: signer)
self.signer = nil
}

AsyncFunction("getInboxState") {
(inboxId: String, refreshFromNetwork: Bool) -> String in
guard let client = await clientsManager.getClient(key: inboxId)
Expand Down Expand Up @@ -219,15 +206,11 @@ public class XMTPModule: Module {
hasAuthenticateToInboxCallback ?? false
? self.preAuthenticateToInboxCallback : nil
let encryptionKeyData = Data(dbEncryptionKey)
let authOptions = AuthParamsWrapper.authParamsFromJson(authParams)

let options = createClientConfig(
env: authOptions.environment,
appVersion: authOptions.appVersion,
preAuthenticateToInboxCallback: preAuthenticateToInboxCallback,
let options = self.createClientConfig(
authParams: authParams,
dbEncryptionKey: encryptionKeyData,
dbDirectory: authOptions.dbDirectory,
historySyncUrl: authOptions.historySyncUrl
preAuthenticateToInboxCallback: preAuthenticateToInboxCallback
)
let client = try await Client.create(
account: privateKey, options: options)
Expand All @@ -240,14 +223,14 @@ public class XMTPModule: Module {
AsyncFunction("create") {
(
address: String, hasAuthenticateToInboxCallback: Bool?,
dbEncryptionKey: [UInt8], authParams: String
dbEncryptionKey: [UInt8], authParams: String, walletParams: String
) in
let authOptions = AuthParamsWrapper.authParamsFromJson(authParams)
let walletOptions = WalletParamsWrapper.walletParamsFromJson(walletParams)
let signer = ReactNativeSigner(
module: self, address: address,
walletType: authOptions.walletType,
chainId: authOptions.chainId,
blockNumber: authOptions.blockNumber)
walletType: walletOptions.walletType,
chainId: walletOptions.chainId,
blockNumber: walletOptions.blockNumber)
self.signer = signer
if hasAuthenticateToInboxCallback ?? false {
self.preAuthenticateToInboxCallbackDeferred = DispatchSemaphore(
Expand All @@ -259,12 +242,9 @@ public class XMTPModule: Module {
let encryptionKeyData = Data(dbEncryptionKey)

let options = self.createClientConfig(
env: authOptions.environment,
appVersion: authOptions.appVersion,
preAuthenticateToInboxCallback: preAuthenticateToInboxCallback,
authParams: authParams,
dbEncryptionKey: encryptionKeyData,
dbDirectory: authOptions.dbDirectory,
historySyncUrl: authOptions.historySyncUrl
preAuthenticateToInboxCallback: preAuthenticateToInboxCallback
)
let client = try await XMTP.Client.create(
account: signer, options: options)
Expand All @@ -281,19 +261,67 @@ public class XMTPModule: Module {
let encryptionKeyData = Data(dbEncryptionKey)

let options = self.createClientConfig(
env: authOptions.environment,
appVersion: authOptions.appVersion,
preAuthenticateToInboxCallback: nil,
authParams: authParams,
dbEncryptionKey: encryptionKeyData,
dbDirectory: authOptions.dbDirectory,
historySyncUrl: authOptions.historySyncUrl
preAuthenticateToInboxCallback: preAuthenticateToInboxCallback
)
let client = try await XMTP.Client.build(
address: address, options: options)
await clientsManager.updateClient(
key: client.inboxID, client: client)
return try ClientWrapper.encodeToObj(client)
}

AsyncFunction("revokeAllOtherInstallations") { (inboxId: String, walletParams: String) in
guard let client = await clientsManager.getClient(key: inboxId)
else {
throw Error.noClient
}
let walletOptions = WalletParamsWrapper.walletParamsFromJson(walletParams)
let signer = ReactNativeSigner(
module: self, address: client.address,
walletType: walletOptions.walletType,
chainId: walletOptions.chainId,
blockNumber: walletOptions.blockNumber)
self.signer = signer

try await client.revokeAllOtherInstallations(signingKey: signer)
self.signer = nil
}

AsyncFunction("addAccount") { (inboxId: String, newAddress: String, walletParams: String) in
guard let client = await clientsManager.getClient(key: inboxId)
else {
throw Error.noClient
}
let walletOptions = WalletParamsWrapper.walletParamsFromJson(walletParams)
let signer = ReactNativeSigner(
module: self, address: newAddress,
walletType: walletOptions.walletType,
chainId: walletOptions.chainId,
blockNumber: walletOptions.blockNumber)
self.signer = signer

try await client.addAccount(newAccount: signer)
self.signer = nil
}

AsyncFunction("removeAccount") { (inboxId: String, addressToRemove: String, walletParams: String) in
guard let client = await clientsManager.getClient(key: inboxId)
else {
throw Error.noClient
}
let walletOptions = WalletParamsWrapper.walletParamsFromJson(walletParams)
let signer = ReactNativeSigner(
module: self, address: client.address,
walletType: walletOptions.walletType,
chainId: walletOptions.chainId,
blockNumber: walletOptions.blockNumber)
self.signer = signer

try await client.removeAccount(recoveryAccount: signer, addressToRemove: addressToRemove)
self.signer = nil
}

// Remove a client from memory for a given inboxId
AsyncFunction("dropClient") { (inboxId: String) in
Expand All @@ -309,6 +337,15 @@ public class XMTPModule: Module {
let signature = try client.signWithInstallationKey(message: message)
return [UInt8](signature)
}

AsyncFunction("verifySignature") {
(inboxId: String, message: String, signature: [UInt8]) -> Bool in
guard let client = await clientsManager.getClient(key: inboxId)
else {
throw Error.noClient
}
return try client.verifySignature(message: message, signature: Data(signature))
}

AsyncFunction("canMessage") {
(inboxId: String, peerAddresses: [String]) -> [String: Bool] in
Expand Down Expand Up @@ -1663,17 +1700,16 @@ public class XMTPModule: Module {
}

func createClientConfig(
env: String, appVersion: String?,
preAuthenticateToInboxCallback: PreEventCallback? = nil,
dbEncryptionKey: Data, dbDirectory: String? = nil,
historySyncUrl: String? = nil
authParams: String, dbEncryptionKey: Data,
preAuthenticateToInboxCallback: PreEventCallback? = nil
) -> XMTP.ClientOptions {
let authOptions = AuthParamsWrapper.authParamsFromJson(authParams)

return XMTP.ClientOptions(
api: createApiClient(env: env, appVersion: appVersion),
api: createApiClient(env: authOptions.environment, appVersion: authOptions.appVersion),
preAuthenticateToInboxCallback: preAuthenticateToInboxCallback,
dbEncryptionKey: dbEncryptionKey, dbDirectory: dbDirectory,
historySyncUrl: historySyncUrl)
dbEncryptionKey: dbEncryptionKey, dbDirectory: authOptions.dbDirectory,
historySyncUrl: authOptions.historySyncUrl)
}

func subscribeToConversations(inboxId: String, type: ConversationType)
Expand Down

0 comments on commit c881f71

Please sign in to comment.