react-native-authsignal 2.6.1 → 2.8.0-alpha.2

package/android/src/main/java/com/authsignal/react/AuthsignalPushModule.kt

@@ -5,40 +5,29 @@ import com.authsignal.push.AuthsignalPush
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 
+@ReactModule(name = AuthsignalPushModule.NAME)
 class AuthsignalPushModule(private val reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(
-    reactContext
-  ) {
+  NativeAuthsignalPushModuleSpec(reactContext) {
   private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
   private var authsignal: AuthsignalPush? = null
   private var defaultError = "unexpected_error"
 
-  override fun getConstants(): Map<String, Any>? {
-    val constants: MutableMap<String, Any> = HashMap()
-    constants["bundleIdentifier"] = reactContext.applicationInfo.packageName
-    return constants
-  }
-
-  override fun getName(): String {
-    return "AuthsignalPushModule"
-  }
-
   @ReactMethod
-  fun initialize(tenantID: String?, baseURL: String?, promise: Promise) {
-    authsignal = AuthsignalPush(tenantID!!, baseURL!!)
+  override fun initialize(tenantID: String, baseURL: String, promise: Promise) {
+    authsignal = AuthsignalPush(tenantID, baseURL)
 
     promise.resolve(null)
   }
 
   @ReactMethod
-  fun getCredential(promise: Promise) {
+  override fun getCredential(promise: Promise) {
     launch(promise) {
       val response = it.getCredential()
 
@@ -61,8 +50,10 @@ class AuthsignalPushModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun addCredential(
+  override fun addCredential(
     token: String?,
+    _requireUserAuthentication: Boolean,
+    _keychainAccess: String?,
     promise: Promise
   ) {
     launch(promise) {
@@ -85,7 +76,7 @@ class AuthsignalPushModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun removeCredential(promise: Promise) {
+  override fun removeCredential(promise: Promise) {
     launch(promise) {
       val response = it.removeCredential()
 
@@ -100,7 +91,7 @@ class AuthsignalPushModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun getChallenge(promise: Promise) {
+  override fun getChallenge(promise: Promise) {
     launch(promise) {
       val response = it.getChallenge()
 
@@ -128,7 +119,7 @@ class AuthsignalPushModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun updateChallenge(
+  override fun updateChallenge(
     challengeId: String,
     approved: Boolean,
     verificationCode: String?,
@@ -158,4 +149,8 @@ class AuthsignalPushModule(private val reactContext: ReactApplicationContext) :
       }
     }
   }
+
+  companion object {
+    const val NAME = "AuthsignalPushModule"
+  }
 }

package/android/src/main/java/com/authsignal/react/AuthsignalQRCodeModule.kt

@@ -5,41 +5,29 @@ import com.authsignal.qr.AuthsignalQRCode
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 
+@ReactModule(name = AuthsignalQRCodeModule.NAME)
 class AuthsignalQRCodeModule(private val reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(
-    reactContext
-  ) {
+  NativeAuthsignalQRCodeModuleSpec(reactContext) {
   private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
   private var authsignal: AuthsignalQRCode? = null
   private var defaultError = "unexpected_error"
 
-  override fun getConstants(): Map<String, Any>? {
-    val constants: MutableMap<String, Any> = HashMap()
-    constants["bundleIdentifier"] = reactContext.applicationInfo.packageName
-    return constants
-  }
-
-  override fun getName(): String {
-    return "AuthsignalQRCodeModule"
-  }
-
   @ReactMethod
-  fun initialize(tenantID: String?, baseURL: String?, promise: Promise) {
-    Log.d("AuthsignalQRCodeModule", "initialize: $tenantID, $baseURL")
-    authsignal = AuthsignalQRCode(tenantID!!, baseURL!!)
+  override fun initialize(tenantID: String, baseURL: String, promise: Promise) {
+    authsignal = AuthsignalQRCode(tenantID, baseURL)
 
     promise.resolve(null)
   }
 
   @ReactMethod
-  fun getCredential(promise: Promise) {
+  override fun getCredential(promise: Promise) {
     launch(promise) {
       val response = it.getCredential()
 
@@ -62,8 +50,10 @@ class AuthsignalQRCodeModule(private val reactContext: ReactApplicationContext)
   }
 
   @ReactMethod
-  fun addCredential(
+  override fun addCredential(
     token: String?,
+    _requireUserAuthentication: Boolean,
+    _keychainAccess: String?,
     promise: Promise
   ) {
     launch(promise) {
@@ -86,7 +76,7 @@ class AuthsignalQRCodeModule(private val reactContext: ReactApplicationContext)
   }
 
   @ReactMethod
-  fun removeCredential(promise: Promise) {
+  override fun removeCredential(promise: Promise) {
     launch(promise) {
       val response = it.removeCredential()
 
@@ -101,7 +91,7 @@ class AuthsignalQRCodeModule(private val reactContext: ReactApplicationContext)
   }
 
   @ReactMethod
-  fun claimChallenge(
+  override fun claimChallenge(
     challengeId: String,
     promise: Promise
   ) {
@@ -130,7 +120,7 @@ class AuthsignalQRCodeModule(private val reactContext: ReactApplicationContext)
   }
 
   @ReactMethod
-  fun updateChallenge(
+  override fun updateChallenge(
     challengeId: String,
     approved: Boolean,
     verificationCode: String?,
@@ -160,4 +150,8 @@ class AuthsignalQRCodeModule(private val reactContext: ReactApplicationContext)
       }
     }
   }
+
+  companion object {
+    const val NAME = "AuthsignalQRCodeModule"
+  }
 }

package/android/src/main/java/com/authsignal/react/AuthsignalSMSModule.kt

@@ -1,43 +1,25 @@
 package com.authsignal.react
 
 import android.util.Log
-import com.authsignal.models.AuthsignalResponse
-import com.authsignal.models.ChallengeResponse
-import com.authsignal.models.EnrollResponse
-import com.authsignal.models.VerifyResponse
 import com.authsignal.sms.AuthsignalSMS
-import com.authsignal.totp.AuthsignalTOTP
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import java.util.function.Consumer
-
+@ReactModule(name = AuthsignalSMSModule.NAME)
 class AuthsignalSMSModule(private val reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(
-    reactContext
-  ) {
+  NativeAuthsignalSMSModuleSpec(reactContext) {
   private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
   private var authsignal: AuthsignalSMS? = null
   private val defaultError = "unexpected_error"
 
-  override fun getConstants(): Map<String, Any>? {
-    val constants: MutableMap<String, Any> = HashMap()
-    constants["bundleIdentifier"] = reactContext.applicationInfo.packageName
-    return constants
-  }
-
-  override fun getName(): String {
-    return "AuthsignalSMSModule"
-  }
-
   @ReactMethod
-  fun initialize(tenantID: String, baseURL: String, promise: Promise) {
+  override fun initialize(tenantID: String, baseURL: String, promise: Promise) {
     val currentActivity = reactContext.currentActivity
 
     if (currentActivity != null) {
@@ -48,7 +30,7 @@ class AuthsignalSMSModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun enroll(phoneNumber: String, promise: Promise) {
+  override fun enroll(phoneNumber: String, promise: Promise) {
     launch(promise) {
       val response = it.enroll(phoneNumber)
 
@@ -66,7 +48,7 @@ class AuthsignalSMSModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun challenge(promise: Promise) {
+  override fun challenge(promise: Promise) {
     launch(promise) {
       val response = it.challenge()
 
@@ -84,7 +66,7 @@ class AuthsignalSMSModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun verify(code: String, promise: Promise) {
+  override fun verify(code: String, promise: Promise) {
     launch(promise) {
       val response = it.verify(code)
 
@@ -114,4 +96,8 @@ class AuthsignalSMSModule(private val reactContext: ReactApplicationContext) :
       }
     }
   }
+
+  companion object {
+    const val NAME = "AuthsignalSMSModule"
+  }
 }

package/android/src/main/java/com/authsignal/react/AuthsignalTOTPModule.kt

@@ -5,33 +5,22 @@ import com.authsignal.totp.AuthsignalTOTP
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 
+@ReactModule(name = AuthsignalTOTPModule.NAME)
 class AuthsignalTOTPModule(private val reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(
-    reactContext
-  ) {
+  NativeAuthsignalTOTPModuleSpec(reactContext) {
   private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
   private var authsignal: AuthsignalTOTP? = null
   private val defaultError = "unexpected_error"
 
-  override fun getConstants(): Map<String, Any>? {
-    val constants: MutableMap<String, Any> = HashMap()
-    constants["bundleIdentifier"] = reactContext.applicationInfo.packageName
-    return constants
-  }
-
-  override fun getName(): String {
-    return "AuthsignalTOTPModule"
-  }
-
   @ReactMethod
-  fun initialize(tenantID: String, baseURL: String, promise: Promise) {
+  override fun initialize(tenantID: String, baseURL: String, promise: Promise) {
     val currentActivity = reactContext.currentActivity
 
     if (currentActivity != null) {
@@ -42,7 +31,7 @@ class AuthsignalTOTPModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun enroll(promise: Promise) {
+  override fun enroll(promise: Promise) {
     launch(promise) {
       val response = it.enroll()
 
@@ -62,7 +51,7 @@ class AuthsignalTOTPModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun verify(code: String, promise: Promise) {
+  override fun verify(code: String, promise: Promise) {
     launch(promise) {
       val response = it.verify(code)
 
@@ -92,4 +81,8 @@ class AuthsignalTOTPModule(private val reactContext: ReactApplicationContext) :
       }
     }
   }
+
+  companion object {
+    const val NAME = "AuthsignalTOTPModule"
+  }
 }

package/android/src/main/java/com/authsignal/react/AuthsignalWhatsappModule.kt

@@ -1,42 +1,25 @@
 package com.authsignal.react
 
 import android.util.Log
-import com.authsignal.models.AuthsignalResponse
-import com.authsignal.models.ChallengeResponse
-import com.authsignal.models.EnrollResponse
-import com.authsignal.models.VerifyResponse
 import com.authsignal.whatsapp.AuthsignalWhatsApp
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import java.util.function.Consumer
-
+@ReactModule(name = AuthsignalWhatsappModule.NAME)
 class AuthsignalWhatsappModule(private val reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(
-    reactContext
-  ) {
+  NativeAuthsignalWhatsappModuleSpec(reactContext) {
   private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
   private var authsignal: AuthsignalWhatsApp? = null
   private val defaultError = "unexpected_error"
 
-  override fun getConstants(): Map<String, Any>? {
-    val constants: MutableMap<String, Any> = HashMap()
-    constants["bundleIdentifier"] = reactContext.applicationInfo.packageName
-    return constants
-  }
-
-  override fun getName(): String {
-    return "AuthsignalWhatsappModule"
-  }
-
   @ReactMethod
-  fun initialize(tenantID: String, baseURL: String, promise: Promise) {
+  override fun initialize(tenantID: String, baseURL: String, promise: Promise) {
     val currentActivity = reactContext.currentActivity
 
     if (currentActivity != null) {
@@ -47,7 +30,7 @@ class AuthsignalWhatsappModule(private val reactContext: ReactApplicationContext
   }
 
   @ReactMethod
-  fun challenge(promise: Promise) {
+  override fun challenge(promise: Promise) {
     launch(promise) {
       val response = it.challenge()
 
@@ -65,7 +48,7 @@ class AuthsignalWhatsappModule(private val reactContext: ReactApplicationContext
   }
 
   @ReactMethod
-  fun verify(code: String, promise: Promise) {
+  override fun verify(code: String, promise: Promise) {
     launch(promise) {
       val response = it.verify(code)
 
@@ -95,4 +78,8 @@ class AuthsignalWhatsappModule(private val reactContext: ReactApplicationContext
       }
     }
   }
+
+  companion object {
+    const val NAME = "AuthsignalWhatsappModule"
+  }
 }

package/ios/AuthsignalEmailModule.m

@@ -5,18 +5,18 @@
 
 RCT_EXTERN_METHOD(initialize:(NSString)tenantID
                   withBaseURL:(NSString)baseURL
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(enroll:(NSString)email
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(challenge:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(verify:(NSString)code
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)             
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)             
 
 @end

package/ios/AuthsignalEmailModule.swift

@@ -1,6 +1,7 @@
-import Security
-import Foundation
 import Authsignal
+import Foundation
+import React
+import Security
 
 @objc(AuthsignalEmailModule)
 class AuthsignalEmailModule: NSObject {
@@ -13,8 +14,8 @@ class AuthsignalEmailModule: NSObject {
   @objc func initialize(
     _ tenantID: NSString,
     withBaseURL baseURL: NSString,
-    resolver resolve: @escaping RCTPromiseResolveBlock,
-    rejecter reject: @escaping RCTPromiseRejectBlock
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
   ) -> Void {
     self.authsignal = AuthsignalEmail(tenantID: tenantID as String, baseURL: baseURL as String)
     
@@ -23,8 +24,8 @@ class AuthsignalEmailModule: NSObject {
   
   @objc func enroll(
     _ email: NSString,
-    resolver resolve: @escaping RCTPromiseResolveBlock,
-    rejecter reject: @escaping RCTPromiseRejectBlock
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
   ) -> Void {
     if (authsignal == nil) {
       resolve(nil)
@@ -50,7 +51,7 @@ class AuthsignalEmailModule: NSObject {
 
   @objc func challenge(
     _ resolve: @escaping RCTPromiseResolveBlock,
-    rejecter reject: @escaping RCTPromiseRejectBlock
+    reject: @escaping RCTPromiseRejectBlock
   ) -> Void {
     if (authsignal == nil) {
       resolve(nil)
@@ -74,8 +75,8 @@ class AuthsignalEmailModule: NSObject {
 
   @objc func verify(
     _ code: NSString,
-    resolver resolve: @escaping RCTPromiseResolveBlock,
-    rejecter reject: @escaping RCTPromiseRejectBlock
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
   ) -> Void {
     if (authsignal == nil) {
       resolve(nil)

package/ios/AuthsignalInAppModule.m

@@ -5,46 +5,47 @@
 
 RCT_EXTERN_METHOD(initialize:(NSString)tenantID
                   withBaseURL:(NSString)baseURL
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(getCredential:(NSString)username
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(addCredential:(NSString)token
                   withRequireUserAuthentication:(BOOL)requireUserAuthentication
                   withKeychainAccess:(NSString)keychainAccess
                   withUsername:(NSString)username
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  withAppAttestation:(NSDictionary)appAttestation
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(removeCredential:(NSString)username
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(verify:(NSString)action
                   withUsername:(NSString)username
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(createPin:(NSString)pin
                   withUsername:(NSString)username
                   withToken:(NSString)token
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(verifyPin:(NSString)pin
                   withUsername:(NSString)username
                   withAction:(NSString)action
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(deletePin:(NSString)username
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(getAllPinUsernames:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  reject:(RCTPromiseRejectBlock)reject)
 
 @end