@doordeck/headless-react-native-sdk 0.83.0 → 1.0.7

package/HeadlessReactNativeSdk.podspec

@@ -1,7 +1,6 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
   s.name         = "HeadlessReactNativeSdk"
@@ -18,27 +17,20 @@ Pod::Spec.new do |s|
   s.private_header_files = "ios/**/*.h"
   s.preserve_paths = "ios/**/*.{h,m,mm,swift}"
 
-  doordeck_sdk_version = '0.83.0'
-  s.dependency "DoordeckSDK", "~> #{doordeck_sdk_version}"
+  # The native Doordeck SDK is distributed as a Swift Package (a binary xcframework),
+  # not as a CocoaPods pod. Wire it in via React Native's built-in SPM support
+  # (spm_dependency, available on RN >= 0.76). The SPM product/module is "DoordeckSDK",
+  # so `import DoordeckSDK` in the Swift bridge continues to work unchanged.
+  spm_dependency(s,
+    url: 'https://github.com/doordeck/doordeck-headless-sdk-spm.git',
+    requirement: { kind: 'exactVersion', version: '1.128.0' },
+    products: ['DoordeckSDK']
+  )
 
-  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
-  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
-  s.dependency "React-Core"
-
-  # Don't install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-      "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-      "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1",
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    # There is a bug importing  <ReactCommon/RCTTurboModule.h>
-    # s.dependency "ReactCommon/turbomodule/core"
-    s.dependency "React"
-  end
+  # Install all React Native dependencies (React-Core, RCT-Folly, RCTRequired,
+  # RCTTypeSafety, ReactCommon, codegen, New Architecture flags, etc.) via the
+  # official helper. This resolves the correct spec sources for the installed RN
+  # version — replacing the hand-maintained dependency list, which broke on RN
+  # 0.86 (`Unable to find a specification for RCT-Folly`).
+  install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.7.2"
+    classpath "com.android.tools.build:gradle:8.13.2"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
@@ -51,11 +51,11 @@ android {
     }
   }
 
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  compileSdk getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    minSdk getExtOrIntegerDefault("minSdkVersion")
+    targetSdk getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
 
@@ -69,8 +69,8 @@ android {
     }
   }
 
-  lintOptions {
-    disable "GradleCompatible"
+  lint {
+    disable += "GradleCompatible"
   }
 
   compileOptions {
@@ -98,7 +98,7 @@ repositories {
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
-def doordeckSdkVersion = "0.83.0"
+def doordeckSdkVersion = "0.185.0"
 
 dependencies {
   implementation "com.facebook.react:react-android"

package/android/generated/jni/CMakeLists.txt

@@ -25,12 +25,4 @@ target_link_libraries(
   reactnative
 )
 
-target_compile_options(
-  react_codegen_RNHeadlessReactNativeSdkSpec
-  PRIVATE
-  -DLOG_TAG=\"ReactNative\"
-  -fexceptions
-  -frtti
-  -std=c++20
-  -Wall
-)
+target_compile_reactnative_options(react_codegen_RNHeadlessReactNativeSdkSpec PRIVATE)

package/android/generated/jni/react/renderer/components/RNHeadlessReactNativeSdkSpec/RNHeadlessReactNativeSdkSpecJSI.h

@@ -15,7 +15,6 @@
 namespace facebook::react {
 
 
-  
 #pragma mark - NativeHeadlessReactNativeSdkAssistedRegisterEphemeralKeyResponse
 
 template <typename P0>
@@ -61,8 +60,8 @@ struct NativeHeadlessReactNativeSdkAssistedRegisterEphemeralKeyResponseBridging
 
 template <typename P0, typename P1, typename P2>
 struct NativeHeadlessReactNativeSdkTileLocksResponse {
-  P0 siteId;
-  P1 tileId;
+  P0 siteId{};
+  P1 tileId{};
   P2 deviceIds;
   bool operator==(const NativeHeadlessReactNativeSdkTileLocksResponse &other) const {
     return siteId == other.siteId && tileId == other.tileId && deviceIds == other.deviceIds;
@@ -88,11 +87,9 @@ struct NativeHeadlessReactNativeSdkTileLocksResponseBridging {
   static jsi::String siteIdToJs(jsi::Runtime &rt, decltype(types.siteId) value) {
     return bridging::toJs(rt, value);
   }
-
   static jsi::String tileIdToJs(jsi::Runtime &rt, decltype(types.tileId) value) {
     return bridging::toJs(rt, value);
   }
-
   static jsi::Array deviceIdsToJs(jsi::Runtime &rt, decltype(types.deviceIds) value) {
     return bridging::toJs(rt, value);
   }
@@ -116,12 +113,12 @@ struct NativeHeadlessReactNativeSdkTileLocksResponseBridging {
 
 template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
 struct NativeHeadlessReactNativeSdkUserDetailsResponse {
-  P0 userId;
-  P1 publicKey;
-  P2 email;
-  P3 displayName;
-  P4 emailVerified;
-  P5 certificateChainAboutToExpire;
+  P0 userId{};
+  P1 publicKey{};
+  P2 email{};
+  P3 displayName{};
+  P4 emailVerified{};
+  P5 certificateChainAboutToExpire{};
   P6 tokenAboutToExpire;
   bool operator==(const NativeHeadlessReactNativeSdkUserDetailsResponse &other) const {
     return userId == other.userId && publicKey == other.publicKey && email == other.email && displayName == other.displayName && emailVerified == other.emailVerified && certificateChainAboutToExpire == other.certificateChainAboutToExpire && tokenAboutToExpire == other.tokenAboutToExpire;
@@ -151,27 +148,21 @@ struct NativeHeadlessReactNativeSdkUserDetailsResponseBridging {
   static jsi::String userIdToJs(jsi::Runtime &rt, decltype(types.userId) value) {
     return bridging::toJs(rt, value);
   }
-
   static jsi::String publicKeyToJs(jsi::Runtime &rt, decltype(types.publicKey) value) {
     return bridging::toJs(rt, value);
   }
-
   static jsi::String emailToJs(jsi::Runtime &rt, decltype(types.email) value) {
     return bridging::toJs(rt, value);
   }
-
   static jsi::String displayNameToJs(jsi::Runtime &rt, decltype(types.displayName) value) {
     return bridging::toJs(rt, value);
   }
-
   static bool emailVerifiedToJs(jsi::Runtime &rt, decltype(types.emailVerified) value) {
     return bridging::toJs(rt, value);
   }
-
   static bool certificateChainAboutToExpireToJs(jsi::Runtime &rt, decltype(types.certificateChainAboutToExpire) value) {
     return bridging::toJs(rt, value);
   }
-
   static bool tokenAboutToExpireToJs(jsi::Runtime &rt, decltype(types.tokenAboutToExpire) value) {
     return bridging::toJs(rt, value);
   }
@@ -197,111 +188,78 @@ struct NativeHeadlessReactNativeSdkUserDetailsResponseBridging {
   }
 };
 
-class JSI_EXPORT NativeHeadlessReactNativeSdkCxxSpecJSI : public TurboModule {
-protected:
-  NativeHeadlessReactNativeSdkCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
-
-public:
-  virtual jsi::Value login(jsi::Runtime &rt, jsi::String email, jsi::String password) = 0;
-  virtual jsi::Value setAuthToken(jsi::Runtime &rt, jsi::String authToken) = 0;
-  virtual jsi::Value getUserDetails(jsi::Runtime &rt) = 0;
-  virtual jsi::Value verify(jsi::Runtime &rt, jsi::String code) = 0;
-  virtual jsi::Value logout(jsi::Runtime &rt) = 0;
-  virtual jsi::Value getLocksBelongingToTile(jsi::Runtime &rt, jsi::String tileId) = 0;
-  virtual jsi::Value unlockDevice(jsi::Runtime &rt, jsi::String lockId) = 0;
-
-};
 
 template <typename T>
 class JSI_EXPORT NativeHeadlessReactNativeSdkCxxSpec : public TurboModule {
 public:
-  jsi::Value create(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
-    return delegate_.create(rt, propName);
-  }
-
-  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override {
-    return delegate_.getPropertyNames(runtime);
-  }
-
   static constexpr std::string_view kModuleName = "HeadlessReactNativeSdk";
 
 protected:
-  NativeHeadlessReactNativeSdkCxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(std::string{NativeHeadlessReactNativeSdkCxxSpec::kModuleName}, jsInvoker),
-      delegate_(reinterpret_cast<T*>(this), jsInvoker) {}
-
-
+  NativeHeadlessReactNativeSdkCxxSpec(std::shared_ptr<CallInvoker> jsInvoker) : TurboModule(std::string{NativeHeadlessReactNativeSdkCxxSpec::kModuleName}, jsInvoker) {
+    methodMap_["login"] = MethodMetadata {.argCount = 2, .invoker = __login};
+    methodMap_["setAuthToken"] = MethodMetadata {.argCount = 1, .invoker = __setAuthToken};
+    methodMap_["getUserDetails"] = MethodMetadata {.argCount = 0, .invoker = __getUserDetails};
+    methodMap_["verify"] = MethodMetadata {.argCount = 1, .invoker = __verify};
+    methodMap_["logout"] = MethodMetadata {.argCount = 0, .invoker = __logout};
+    methodMap_["getLocksBelongingToTile"] = MethodMetadata {.argCount = 1, .invoker = __getLocksBelongingToTile};
+    methodMap_["unlockDevice"] = MethodMetadata {.argCount = 1, .invoker = __unlockDevice};
+  }
+  
 private:
-  class Delegate : public NativeHeadlessReactNativeSdkCxxSpecJSI {
-  public:
-    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
-      NativeHeadlessReactNativeSdkCxxSpecJSI(std::move(jsInvoker)), instance_(instance) {
-
-    }
-
-    jsi::Value login(jsi::Runtime &rt, jsi::String email, jsi::String password) override {
-      static_assert(
-          bridging::getParameterCount(&T::login) == 3,
-          "Expected login(...) to have 3 parameters");
-
-      return bridging::callFromJs<jsi::Value>(
-          rt, &T::login, jsInvoker_, instance_, std::move(email), std::move(password));
-    }
-    jsi::Value setAuthToken(jsi::Runtime &rt, jsi::String authToken) override {
-      static_assert(
-          bridging::getParameterCount(&T::setAuthToken) == 2,
-          "Expected setAuthToken(...) to have 2 parameters");
-
-      return bridging::callFromJs<jsi::Value>(
-          rt, &T::setAuthToken, jsInvoker_, instance_, std::move(authToken));
-    }
-    jsi::Value getUserDetails(jsi::Runtime &rt) override {
-      static_assert(
-          bridging::getParameterCount(&T::getUserDetails) == 1,
-          "Expected getUserDetails(...) to have 1 parameters");
-
-      return bridging::callFromJs<jsi::Value>(
-          rt, &T::getUserDetails, jsInvoker_, instance_);
-    }
-    jsi::Value verify(jsi::Runtime &rt, jsi::String code) override {
-      static_assert(
-          bridging::getParameterCount(&T::verify) == 2,
-          "Expected verify(...) to have 2 parameters");
+  static jsi::Value __login(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::login) == 3,
+      "Expected login(...) to have 3 parameters");
+    return bridging::callFromJs<jsi::Value>(rt, &T::login,  static_cast<NativeHeadlessReactNativeSdkCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
+      count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt));
+  }
 
-      return bridging::callFromJs<jsi::Value>(
-          rt, &T::verify, jsInvoker_, instance_, std::move(code));
-    }
-    jsi::Value logout(jsi::Runtime &rt) override {
-      static_assert(
-          bridging::getParameterCount(&T::logout) == 1,
-          "Expected logout(...) to have 1 parameters");
+  static jsi::Value __setAuthToken(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::setAuthToken) == 2,
+      "Expected setAuthToken(...) to have 2 parameters");
+    return bridging::callFromJs<jsi::Value>(rt, &T::setAuthToken,  static_cast<NativeHeadlessReactNativeSdkCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt));
+  }
 
-      return bridging::callFromJs<jsi::Value>(
-          rt, &T::logout, jsInvoker_, instance_);
-    }
-    jsi::Value getLocksBelongingToTile(jsi::Runtime &rt, jsi::String tileId) override {
-      static_assert(
-          bridging::getParameterCount(&T::getLocksBelongingToTile) == 2,
-          "Expected getLocksBelongingToTile(...) to have 2 parameters");
+  static jsi::Value __getUserDetails(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::getUserDetails) == 1,
+      "Expected getUserDetails(...) to have 1 parameters");
+    return bridging::callFromJs<jsi::Value>(rt, &T::getUserDetails,  static_cast<NativeHeadlessReactNativeSdkCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
 
-      return bridging::callFromJs<jsi::Value>(
-          rt, &T::getLocksBelongingToTile, jsInvoker_, instance_, std::move(tileId));
-    }
-    jsi::Value unlockDevice(jsi::Runtime &rt, jsi::String lockId) override {
-      static_assert(
-          bridging::getParameterCount(&T::unlockDevice) == 2,
-          "Expected unlockDevice(...) to have 2 parameters");
+  static jsi::Value __verify(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::verify) == 2,
+      "Expected verify(...) to have 2 parameters");
+    return bridging::callFromJs<jsi::Value>(rt, &T::verify,  static_cast<NativeHeadlessReactNativeSdkCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt));
+  }
 
-      return bridging::callFromJs<jsi::Value>(
-          rt, &T::unlockDevice, jsInvoker_, instance_, std::move(lockId));
-    }
+  static jsi::Value __logout(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::logout) == 1,
+      "Expected logout(...) to have 1 parameters");
+    return bridging::callFromJs<jsi::Value>(rt, &T::logout,  static_cast<NativeHeadlessReactNativeSdkCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
 
-  private:
-    friend class NativeHeadlessReactNativeSdkCxxSpec;
-    T *instance_;
-  };
+  static jsi::Value __getLocksBelongingToTile(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::getLocksBelongingToTile) == 2,
+      "Expected getLocksBelongingToTile(...) to have 2 parameters");
+    return bridging::callFromJs<jsi::Value>(rt, &T::getLocksBelongingToTile,  static_cast<NativeHeadlessReactNativeSdkCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt));
+  }
 
-  Delegate delegate_;
+  static jsi::Value __unlockDevice(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::unlockDevice) == 2,
+      "Expected unlockDevice(...) to have 2 parameters");
+    return bridging::callFromJs<jsi::Value>(rt, &T::unlockDevice,  static_cast<NativeHeadlessReactNativeSdkCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt));
+  }
 };
 
 } // namespace facebook::react

package/android/gradle.properties

@@ -1,5 +1,5 @@
-HeadlessReactNativeSdk_kotlinVersion=2.0.21
-HeadlessReactNativeSdk_minSdkVersion=24
-HeadlessReactNativeSdk_targetSdkVersion=34
-HeadlessReactNativeSdk_compileSdkVersion=35
+HeadlessReactNativeSdk_kotlinVersion=2.1.20
+HeadlessReactNativeSdk_minSdkVersion=30
+HeadlessReactNativeSdk_targetSdkVersion=36
+HeadlessReactNativeSdk_compileSdkVersion=36
 HeadlessReactNativeSdk_ndkVersion=27.1.12297006

package/android/src/main/java/com/doordeck/headlessreactnativesdk/HeadlessReactNativeSdkModule.kt

@@ -1,7 +1,6 @@
 package com.doordeck.headlessreactnativesdk
 
 import com.doordeck.multiplatform.sdk.Doordeck
-import com.doordeck.multiplatform.sdk.exceptions.SdkException
 import com.doordeck.multiplatform.sdk.model.data.LockOperations
 import com.doordeck.multiplatform.sdk.model.responses.AssistedRegisterEphemeralKeyResponse
 import com.doordeck.multiplatform.sdk.model.responses.TileLocksResponse
@@ -10,10 +9,8 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
-import java.security.KeyFactory
-import java.security.Signature
-import java.security.spec.PKCS8EncodedKeySpec
-import kotlin.time.Duration.Companion.days
+import java.util.Base64
+import java.util.UUID
 
 @ReactModule(name = HeadlessReactNativeSdkModule.NAME)
 class HeadlessReactNativeSdkModule(
@@ -79,15 +76,22 @@ class HeadlessReactNativeSdkModule(
    * User operations
    */
   override fun getUserDetails(promise: Promise) {
+    val contextManager = doordeckSdk.contextManager()
+
     doordeckSdk.account().getUserDetailsAsync()
-      .thenApply { response ->
-        promise.resolve(response.toNativeMap(
-          userId = doordeckSdk.contextManager().getUserId(),
-          certificateChainAboutToExpire = doordeckSdk.contextManager().isCertificateChainAboutToExpire(),
-          tokenAboutToExpire = doordeckSdk.contextManager().isCloudAuthTokenAboutToExpire(),
-        ))
+      .thenCompose { response ->
+        // The cloud-auth-token expiry check is now asynchronous; chain it and
+        // build the response once it resolves.
+        contextManager.isCloudAuthTokenInvalidOrExpiredAsync(false)
+          .thenApply { tokenAboutToExpire ->
+            promise.resolve(response.toNativeMap(
+              userId = contextManager.getUserId()?.toString(),
+              certificateChainAboutToExpire = contextManager.isCertificateChainInvalidOrExpired(),
+              tokenAboutToExpire = tokenAboutToExpire,
+            ))
+          }
       }
-      .exceptionally {  error ->
+      .exceptionally { error ->
         promise.reject("USER_DETAILS_ERROR", error)
       }
   }
@@ -97,7 +101,7 @@ class HeadlessReactNativeSdkModule(
    */
 
   override fun getLocksBelongingToTile(tileId: String, promise: Promise) {
-    doordeckSdk.tiles().getLocksBelongingToTileAsync(tileId)
+    doordeckSdk.tiles().getLocksBelongingToTileAsync(UUID.fromString(tileId))
       .thenApply { response ->
         promise.resolve(response.toNativeMap())
       }
@@ -110,7 +114,7 @@ class HeadlessReactNativeSdkModule(
     doordeckSdk.lockOperations().unlockAsync(
       LockOperations.UnlockOperation(
         LockOperations.BaseOperation(
-          lockId = lockId,
+          lockId = UUID.fromString(lockId),
         )
       )
     )
@@ -130,10 +134,7 @@ class HeadlessReactNativeSdkModule(
   private fun setKeyPairIfNeeded() {
     if (!doordeckSdk.contextManager().isKeyPairValid()) {
       val newKeyPair = doordeckSdk.crypto().generateKeyPair()
-      doordeckSdk.contextManager().setKeyPair(
-        publicKey = newKeyPair.public,
-        privateKey = newKeyPair.private,
-      )
+      doordeckSdk.contextManager().setKeyPair(newKeyPair)
     }
   }
 
@@ -152,10 +153,10 @@ class HeadlessReactNativeSdkModule(
   }
 
   private fun TileLocksResponse.toNativeMap() = Arguments.createMap().apply {
-    putString("siteId", siteId)
-    putString("tileId", tileId)
+    putString("siteId", siteId.toString())
+    putString("tileId", tileId.toString())
     putArray("deviceIds", Arguments.createArray().apply {
-      deviceIds.forEach { pushString(it) }
+      deviceIds.forEach { pushString(it.toString()) }
     })
   }
 
@@ -167,10 +168,11 @@ class HeadlessReactNativeSdkModule(
     putString("userId", userId)
     putBoolean("certificateChainAboutToExpire", certificateChainAboutToExpire)
     putBoolean("tokenAboutToExpire", tokenAboutToExpire)
-    putString("publicKey", publicKey)
+    // The SDK now returns a java.security.PublicKey; expose its X.509 (SPKI)
+    // form as a base64 string to preserve the `publicKey: string` JS contract.
+    putString("publicKey", Base64.getEncoder().encodeToString(publicKey.encoded))
     putString("email", email)
     putString("displayName", displayName)
     putBoolean("emailVerified", emailVerified)
   }
 }
-

package/android/src/main/java/com/doordeck/headlessreactnativesdk/HeadlessReactNativeSdkPackage.kt

@@ -1,6 +1,5 @@
 package com.doordeck.headlessreactnativesdk
 
-import com.doordeck.multiplatform.sdk.ApplicationContext
 import com.doordeck.multiplatform.sdk.KDoordeckFactory
 import com.doordeck.multiplatform.sdk.config.SdkConfig
 import com.facebook.react.BaseReactPackage
@@ -13,13 +12,13 @@ import java.util.HashMap
 class HeadlessReactNativeSdkPackage : BaseReactPackage() {
   override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
     return if (name == HeadlessReactNativeSdkModule.NAME) {
+      // The Android application context is supplied automatically by the SDK's
+      // bundled DoordeckContextProvider (a ContentProvider auto-registered in the
+      // AAR manifest), so the bridge no longer sets it explicitly. initialize() is
+      // now a suspend fun; use the blocking CompletableFuture variant here.
       HeadlessReactNativeSdkModule(
         reactContext = reactContext,
-        doordeckSdk = KDoordeckFactory.initialize(
-          SdkConfig.Builder()
-            .setApplicationContext(ApplicationContext.apply { set(reactContext.applicationContext)})
-            .build()
-        )
+        doordeckSdk = KDoordeckFactory.initializeAsync(SdkConfig.Builder().build()).get()
       )
     } else {
       null

package/ios/HeadlessReactNativeSdk.h

@@ -1,5 +1,5 @@
 
-#import "generated/RNHeadlessReactNativeSdkSpec/RNHeadlessReactNativeSdkSpec.h"
+#import "generated/ReactCodegen/RNHeadlessReactNativeSdkSpec/RNHeadlessReactNativeSdkSpec.h"
 
 @interface HeadlessReactNativeSdk : NSObject <NativeHeadlessReactNativeSdkSpec>