fix call preEventCallbacks without listeners

xmtp · Dec 13, 2023 · b4e7130 · b4e7130
1 parent a52a9ac
commit b4e7130
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 34 deletions.
diff --git a/ios/XMTPModule.swift b/ios/XMTPModule.swift
@@ -64,9 +64,11 @@ public class XMTPModule: Module {
 		//
 		// Auth functions
 		//
-		AsyncFunction("auth") { (address: String, environment: String, appVersion: String?) in
+		AsyncFunction("auth") { (address: String, environment: String, appVersion: String?, hasCreateIdentityCallback: Bool?, hasEnableIdentityCallback: Bool?) in
 			let signer = ReactNativeSigner(module: self, address: address)
 			self.signer = signer
+			let preCreateIdentityCallback: PreEventCallback? = hasCreateIdentityCallback ?? false ? self.preCreateIdentityCallback : nil
+			let preEnableIdentityCallback: PreEventCallback? = hasEnableIdentityCallback ?? false ? self.preEnableIdentityCallback : nil
 			let options = createClientConfig(env: environment, appVersion: appVersion, preEnableIdentityCallback: preEnableIdentityCallback, preCreateIdentityCallback: preCreateIdentityCallback)
 			try await clientsManager.updateClient(key: address, client: await XMTP.Client.create(account: signer, options: options))
 			self.signer = nil
@@ -78,8 +80,10 @@ public class XMTPModule: Module {
 		}
 
 		// Generate a random wallet and set the client to that
-		AsyncFunction("createRandom") { (environment: String, appVersion: String?) -> String in
+		AsyncFunction("createRandom") { (environment: String, appVersion: String?, hasCreateIdentityCallback: Bool?, hasEnableIdentityCallback: Bool?) -> String in
 			let privateKey = try PrivateKey.generate()
+			let preCreateIdentityCallback: PreEventCallback? = hasCreateIdentityCallback ?? false ? self.preCreateIdentityCallback : nil
+			let preEnableIdentityCallback: PreEventCallback? = hasEnableIdentityCallback ?? false ? self.preEnableIdentityCallback : nil
 
 			let options = createClientConfig(env: environment, appVersion: appVersion, preEnableIdentityCallback: preEnableIdentityCallback, preCreateIdentityCallback: preCreateIdentityCallback)
 			let client = try await Client.create(account: privateKey, options: options)
@@ -147,14 +151,14 @@ public class XMTPModule: Module {
 			return try await client.canMessage(peerAddress)
 		}
 
-        AsyncFunction("staticCanMessage") { (peerAddress: String, environment: String, appVersion: String?) -> Bool in
-            do {
-        		let options = createClientConfig(env: environment, appVersion: appVersion)
-              	return try await XMTP.Client.canMessage(peerAddress, options: options)
-            } catch {
-                throw Error.noClient
-            }
-        }
+		AsyncFunction("staticCanMessage") { (peerAddress: String, environment: String, appVersion: String?) -> Bool in
+			do {
+				let options = createClientConfig(env: environment, appVersion: appVersion)
+				return try await XMTP.Client.canMessage(peerAddress, options: options)
+			} catch {
+				throw Error.noClient
+			}
+		}
 
 		AsyncFunction("encryptAttachment") { (clientAddress: String, fileJson: String) -> String in
 			guard let client = await clientsManager.getClient(key: clientAddress) else {
@@ -507,29 +511,29 @@ public class XMTPModule: Module {
 				throw Error.noClient
 			}
 			let consentList = try await client.contacts.refreshConsentList()
-            
-            return try consentList.entries.compactMap { entry in
-                try ConsentWrapper.encode(entry.value)
-            }
+
+			return try consentList.entries.compactMap { entry in
+				try ConsentWrapper.encode(entry.value)
+			}
 		}
 
 		AsyncFunction("conversationConsentState") { (clientAddress: String, conversationTopic: String) -> String in
 			guard let conversation = try await findConversation(clientAddress: clientAddress, topic: conversationTopic) else {
 				throw Error.conversationNotFound(conversationTopic)
 			}
-            return ConsentWrapper.consentStateToString(state: await conversation.consentState())
+			return ConsentWrapper.consentStateToString(state: await conversation.consentState())
 		}
 
-        AsyncFunction("consentList") { (clientAddress: String) -> [String] in
-            guard let client = await clientsManager.getClient(key: clientAddress) else {
-                throw Error.noClient
-            }
-            let entries = await client.contacts.consentList.entries
-            
-            return try entries.compactMap { entry in
-                try ConsentWrapper.encode(entry.value)
-            }
-        }
+		AsyncFunction("consentList") { (clientAddress: String) -> [String] in
+			guard let client = await clientsManager.getClient(key: clientAddress) else {
+				throw Error.noClient
+			}
+			let entries = await client.contacts.consentList.entries
+
+			return try entries.compactMap { entry in
+				try ConsentWrapper.encode(entry.value)
+			}
+		}
 	}
 
 	//
@@ -666,11 +670,12 @@ public class XMTPModule: Module {
 	func getConversationsKey(clientAddress: String) -> String {
 		return "conversations:\(clientAddress)"
 	}
-	
-	func preEnableIdentityCallback () -> Void {
+
+	func preEnableIdentityCallback() {
 		sendEvent("preEnableIdentityCallback")
 	}
-	func preCreateIdentityCallback () -> Void {
+
+	func preCreateIdentityCallback() {
 		sendEvent("preCreateIdentityCallback")
 	}
 }
diff --git a/src/index.ts b/src/index.ts
@@ -31,9 +31,17 @@ export function address(): string {
 export async function auth(
   address: string,
   environment: 'local' | 'dev' | 'production',
-  appVersion?: string | undefined
+  appVersion?: string | undefined,
+  hasCreateIdentityCallback?: boolean | undefined,
+  hasEnableIdentityCallback?: boolean | undefined
 ) {
-  return await XMTPModule.auth(address, environment, appVersion)
+  return await XMTPModule.auth(
+    address,
+    environment,
+    appVersion,
+    hasCreateIdentityCallback,
+    hasEnableIdentityCallback
+  )
 }
 
 export async function receiveSignature(requestID: string, signature: string) {
@@ -42,9 +50,16 @@ export async function receiveSignature(requestID: string, signature: string) {
 
 export async function createRandom(
   environment: 'local' | 'dev' | 'production',
-  appVersion?: string | undefined
+  appVersion?: string | undefined,
+  hasCreateIdentityCallback?: boolean | undefined,
+  hasEnableIdentityCallback?: boolean | undefined
 ): Promise<string> {
-  return await XMTPModule.createRandom(environment, appVersion)
+  return await XMTPModule.createRandom(
+    environment,
+    appVersion,
+    hasCreateIdentityCallback,
+    hasEnableIdentityCallback
+  )
 }
 
 export async function createFromKeyBundle(

diff --git a/src/lib/Client.ts b/src/lib/Client.ts
@@ -84,7 +84,9 @@ export class Client<ContentTypes> {
         XMTPModule.auth(
           await signer.getAddress(),
           options.env,
-          options.appVersion
+          options.appVersion,
+          Boolean(createSubscription),
+          Boolean(enableSubscription)
         )
       })()
       this.removeSubscription(enableSubscription)
@@ -112,7 +114,9 @@ export class Client<ContentTypes> {
       this.setupSubscriptions(options)
     const address = await XMTPModule.createRandom(
       options.env,
-      options.appVersion
+      options.appVersion,
+      Boolean(createSubscription),
+      Boolean(enableSubscription)
     )
     this.removeSubscription(enableSubscription)
     this.removeSubscription(createSubscription)