react-native-credentials-manager 0.5.3 → 0.6.1

package/README.md

@@ -4,7 +4,7 @@ React Native Credentials Manager
 
 ![App Screens](IMG/flow.png)
 
-A React Native library that implements the [Credential Manager](https://developer.android.com/identity/sign-in/credential-manager) API for Android. This library allows you to manage passwords, passkeys and google signin in your React Native applications.
+A React Native library that implements the [Credential Manager](https://developer.android.com/identity/sign-in/credential-manager) API for Android and [AuthenticationServices](https://developer.apple.com/documentation/authenticationservices) for iOS. This library allows you to manage passwords, passkeys and platform-specific sign-in (Google Sign-In on Android, Apple Sign In on iOS) in your React Native applications.
 
 <p align="center">
   <a href="https://www.npmjs.com/package/react-native-credentials-manager">
@@ -18,5 +18,196 @@ A React Native library that implements the [Credential Manager](https://develope
   </a>
 </p>
 
+## Platform Support
+
+- ✅ **Android**: Full implementation with Credential Manager API (Android 14+ / API 34+)
+- ✅ **iOS**: Full implementation with AuthenticationServices (iOS 16.0+)
+
+### Platform-Specific Features
+
+| Feature                   | Android                   | iOS                               |
+| ------------------------- | ------------------------- | --------------------------------- |
+| Passkeys                  | ✅ Credential Manager API | ✅ AuthenticationServices         |
+| AutoFill Password Support | ✅ Credential Manager API | ✅ AuthenticationServices         |
+| Manual Password Storage   | ✅ Credential Manager API | ❌ Not supported (iOS limitation) |
+| Third-party Sign In       | ✅ Google Sign In         | ✅ Apple Sign In                  |
+
+> [!NOTE] > **iOS Implementation**: This library strictly follows Apple's Authentication Services framework. Manual password storage is not supported on iOS as it's not part of Apple's official Authentication Services APIs. Use AutoFill passwords instead.
+
 > [!IMPORTANT]
 > 📚 **Documentation has moved!** The complete documentation is now available at [https://docs.benjamineruvieru.com/docs/react-native-credentials-manager/](https://docs.benjamineruvieru.com/docs/react-native-credentials-manager/)
+
+## Platform-Specific Parameters
+
+When using this library, be aware that some parameters are platform-specific:
+
+| Function               | Parameter                               | Platform Support | Notes                                                             |
+| ---------------------- | --------------------------------------- | ---------------- | ----------------------------------------------------------------- |
+| `signUpWithPasskeys()` | `preferImmediatelyAvailableCredentials` | Android only     | This parameter is ignored on iOS                                  |
+| `signUpWithPassword()` | All parameters                          | Android only     | This function is not supported on iOS and will throw an error     |
+| `signIn()`             | `googleSignIn`                          | Android only     | This parameter is ignored on iOS                                  |
+| `signIn()`             | `appleSignIn`                           | iOS only         | This parameter is ignored on Android                              |
+| `signUpWithGoogle()`   | All parameters                          | Cross-platform   | Uses Google Sign-In on Android, Apple Sign-In on iOS              |
+| `signUpWithApple()`    | All parameters                          | iOS only         | This function is not supported on Android and will throw an error |
+
+### Handling Platform Differences
+
+To handle these platform differences, you can use conditional code:
+
+```typescript
+// For passkey registration
+await signUpWithPasskeys(
+  requestJson,
+  Platform.OS === 'android' ? true : false // preferImmediatelyAvailableCredentials
+);
+
+// For sign-in
+await signIn(
+  [
+    'passkeys',
+    'password',
+    Platform.OS === 'android' ? 'google-signin' : 'apple-signin',
+  ],
+  {
+    passkeys: passkeyParams,
+    ...(Platform.OS === 'android'
+      ? { googleSignIn: { serverClientId: 'your-client-id' } }
+      : { appleSignIn: { requestedScopes: ['fullName', 'email'] } }),
+  }
+);
+```
+
+## iOS Setup Requirements
+
+### 1. Associated Domains
+
+Add the Associated Domains capability to your iOS app:
+
+1. In Xcode, select your project
+2. Go to Signing & Capabilities
+3. Add "Associated Domains" capability
+4. Add your domain with the `webcredentials` service: `webcredentials:yourdomain.com`
+
+### 2. Apple App Site Association (AASA)
+
+Ensure your domain has a proper AASA file at `https://yourdomain.com/.well-known/apple-app-site-association`:
+
+```json
+{
+  "webcredentials": {
+    "apps": ["TEAMID.com.yourcompany.yourapp"]
+  }
+}
+```
+
+### 3. Apple Sign In Setup (Optional)
+
+If using Apple Sign In, configure it in your Apple Developer account:
+
+1. Enable "Sign In with Apple" capability in Xcode
+2. Configure Sign In with Apple in your Apple Developer account
+3. Add your app's bundle identifier to the Sign In with Apple configuration
+
+## Quick Example
+
+```typescript
+import {
+  signUpWithPasskeys,
+  signUpWithPassword, // Android only - throws error on iOS
+  signUpWithGoogle, // Cross-platform: Google on Android, Apple on iOS
+  signUpWithApple, // iOS-specific function
+  signIn,
+  signOut,
+  type Credential,
+  type AppleCredential,
+  type GoogleCredential,
+  type AppleSignInParams,
+  type GoogleSignInParams,
+} from 'react-native-credentials-manager';
+
+// Sign up with passkey (works on both platforms)
+const passkeyResult = await signUpWithPasskeys({
+  challenge: 'base64-challenge',
+  rp: { name: 'Your App', id: 'yourdomain.com' },
+  user: { id: 'user-id', name: 'username', displayName: 'User Name' },
+  // ... other WebAuthn options
+});
+
+// Password handling - platform differences
+try {
+  // This will work on Android but throw an error on iOS
+  await signUpWithPassword({ username: 'user', password: 'pass' });
+} catch (error) {
+  if (Platform.OS === 'ios') {
+    console.log(
+      'Manual password storage not supported on iOS. Use AutoFill instead.'
+    );
+  }
+}
+
+// Unified sign in (supports passkeys, AutoFill passwords, and platform sign-in)
+const credential = await signIn(
+  ['passkeys', 'password', 'google-signin'], // 'google-signin' becomes 'apple-signin' on iOS
+  {
+    passkeys: { challenge: 'base64-challenge', rpId: 'yourdomain.com' },
+    googleSignIn: { serverClientId: 'your-client-id' },
+  }
+);
+
+// Platform-specific sign-up methods
+if (Platform.OS === 'ios') {
+  // Direct Apple Sign In (iOS only) - uses AuthenticationServices
+  const appleCredential = await signUpWithApple({
+    requestedScopes: ['fullName', 'email'],
+  });
+} else {
+  // Google Sign In (Android only)
+  const googleCredential = await signUpWithGoogle({
+    serverClientId: 'your-client-id',
+  });
+}
+
+// Cross-platform sign-up (automatically uses the appropriate method)
+const credential = await signUpWithGoogle({
+  serverClientId: 'your-client-id', // Used on Android, ignored on iOS
+});
+// Returns GoogleCredential on Android, AppleCredential on iOS
+
+// Handle different credential types
+if (credential.type === 'passkey') {
+  console.log('Passkey authentication:', credential.authenticationResponseJson);
+} else if (credential.type === 'password') {
+  console.log('AutoFill Password:', credential.username, credential.password);
+} else if (credential.type === 'google-signin') {
+  console.log('Google Sign In:', credential.idToken);
+} else if (credential.type === 'apple-signin') {
+  console.log('Apple Sign In:', credential.idToken, credential.email);
+}
+```
+
+## Cross-Platform Compatibility
+
+The library provides excellent cross-platform compatibility while respecting platform limitations:
+
+- **`signUpWithGoogle()`**: Cross-platform function
+  - Android: Uses Google Sign In
+  - iOS: Automatically uses Apple Sign In (AuthenticationServices)
+- **`signUpWithApple()`**: iOS-specific function
+  - iOS: Uses Apple Sign In (AuthenticationServices)
+  - Android: Rejects with clear error message
+- **`signUpWithPassword()`**: Platform-specific behavior
+  - Android: Uses Credential Manager API
+  - iOS: Rejects (manual storage not supported by AuthenticationServices)
+- **AutoFill Passwords**: Available on both platforms through `signIn` method
+- **Error handling**: Platform-specific errors are handled gracefully
+
+## iOS AuthenticationServices Integration
+
+The iOS implementation strictly follows Apple's Authentication Services framework:
+
+- **Passkeys**: `ASAuthorizationPlatformPublicKeyCredentialProvider`
+- **AutoFill Passwords**: `ASAuthorizationPasswordProvider`
+- **Apple Sign In**: `ASAuthorizationAppleIDProvider`
+- **No Custom Keychain**: Manual credential storage is handled by the system
+
+This ensures compliance with Apple's security guidelines and provides the best user experience on iOS.

package/android/build.gradle

@@ -100,11 +100,12 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-     implementation "androidx.credentials:credentials:1.5.0-rc01"
-    implementation "androidx.credentials:credentials-play-services-auth:1.5.0-rc01"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
-     implementation "com.google.android.libraries.identity.googleid:googleid:1.1.1"
+   implementation("androidx.credentials:credentials:1.6.0-alpha02")
+
+    implementation("androidx.credentials:credentials-play-services-auth:1.6.0-alpha02")
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+  implementation "com.google.android.libraries.identity.googleid:googleid:1.1.1"
 }
 
 if (isNewArchitectureEnabled()) {

package/android/generated/java/com/credentialsmanager/NativeCredentialsManagerSpec.java

@@ -40,7 +40,7 @@ public abstract class NativeCredentialsManagerSpec extends ReactContextBaseJavaM
 
   @ReactMethod
   @DoNotStrip
-  public abstract void signUpWithPassword(ReadableMap credObject);
+  public abstract void signUpWithPassword(ReadableMap credObject, Promise promise);
 
   @ReactMethod
   @DoNotStrip
@@ -50,6 +50,10 @@ public abstract class NativeCredentialsManagerSpec extends ReactContextBaseJavaM
   @DoNotStrip
   public abstract void signUpWithGoogle(ReadableMap params, Promise promise);
 
+  @ReactMethod
+  @DoNotStrip
+  public abstract void signUpWithApple(ReadableMap params, Promise promise);
+
   @ReactMethod
   @DoNotStrip
   public abstract void signOut(Promise promise);

package/android/generated/jni/RNCredentialsManagerSpec-generated.cpp

@@ -19,7 +19,7 @@ static facebook::jsi::Value __hostFunction_NativeCredentialsManagerSpecJSI_signU
 
 static facebook::jsi::Value __hostFunction_NativeCredentialsManagerSpecJSI_signUpWithPassword(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, VoidKind, "signUpWithPassword", "(Lcom/facebook/react/bridge/ReadableMap;)V", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "signUpWithPassword", "(Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value __hostFunction_NativeCredentialsManagerSpecJSI_signIn(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -32,6 +32,11 @@ static facebook::jsi::Value __hostFunction_NativeCredentialsManagerSpecJSI_signU
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "signUpWithGoogle", "(Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
+static facebook::jsi::Value __hostFunction_NativeCredentialsManagerSpecJSI_signUpWithApple(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "signUpWithApple", "(Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
 static facebook::jsi::Value __hostFunction_NativeCredentialsManagerSpecJSI_signOut(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "signOut", "(Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
@@ -43,6 +48,7 @@ NativeCredentialsManagerSpecJSI::NativeCredentialsManagerSpecJSI(const JavaTurbo
   methodMap_["signUpWithPassword"] = MethodMetadata {1, __hostFunction_NativeCredentialsManagerSpecJSI_signUpWithPassword};
   methodMap_["signIn"] = MethodMetadata {2, __hostFunction_NativeCredentialsManagerSpecJSI_signIn};
   methodMap_["signUpWithGoogle"] = MethodMetadata {1, __hostFunction_NativeCredentialsManagerSpecJSI_signUpWithGoogle};
+  methodMap_["signUpWithApple"] = MethodMetadata {1, __hostFunction_NativeCredentialsManagerSpecJSI_signUpWithApple};
   methodMap_["signOut"] = MethodMetadata {0, __hostFunction_NativeCredentialsManagerSpecJSI_signOut};
 }
 

package/android/generated/jni/react/renderer/components/RNCredentialsManagerSpec/RNCredentialsManagerSpecJSI-generated.cpp

@@ -19,11 +19,10 @@ static jsi::Value __hostFunction_NativeCredentialsManagerCxxSpecJSI_signUpWithPa
   );
 }
 static jsi::Value __hostFunction_NativeCredentialsManagerCxxSpecJSI_signUpWithPassword(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeCredentialsManagerCxxSpecJSI *>(&turboModule)->signUpWithPassword(
+  return static_cast<NativeCredentialsManagerCxxSpecJSI *>(&turboModule)->signUpWithPassword(
     rt,
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asObject(rt)
   );
-  return jsi::Value::undefined();
 }
 static jsi::Value __hostFunction_NativeCredentialsManagerCxxSpecJSI_signIn(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeCredentialsManagerCxxSpecJSI *>(&turboModule)->signIn(
@@ -38,6 +37,12 @@ static jsi::Value __hostFunction_NativeCredentialsManagerCxxSpecJSI_signUpWithGo
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asObject(rt)
   );
 }
+static jsi::Value __hostFunction_NativeCredentialsManagerCxxSpecJSI_signUpWithApple(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeCredentialsManagerCxxSpecJSI *>(&turboModule)->signUpWithApple(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asObject(rt)
+  );
+}
 static jsi::Value __hostFunction_NativeCredentialsManagerCxxSpecJSI_signOut(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeCredentialsManagerCxxSpecJSI *>(&turboModule)->signOut(
     rt
@@ -50,6 +55,7 @@ NativeCredentialsManagerCxxSpecJSI::NativeCredentialsManagerCxxSpecJSI(std::shar
   methodMap_["signUpWithPassword"] = MethodMetadata {1, __hostFunction_NativeCredentialsManagerCxxSpecJSI_signUpWithPassword};
   methodMap_["signIn"] = MethodMetadata {2, __hostFunction_NativeCredentialsManagerCxxSpecJSI_signIn};
   methodMap_["signUpWithGoogle"] = MethodMetadata {1, __hostFunction_NativeCredentialsManagerCxxSpecJSI_signUpWithGoogle};
+  methodMap_["signUpWithApple"] = MethodMetadata {1, __hostFunction_NativeCredentialsManagerCxxSpecJSI_signUpWithApple};
   methodMap_["signOut"] = MethodMetadata {0, __hostFunction_NativeCredentialsManagerCxxSpecJSI_signOut};
 }
 

package/android/generated/jni/react/renderer/components/RNCredentialsManagerSpec/RNCredentialsManagerSpecJSI.h

@@ -16,6 +16,145 @@ namespace facebook::react {
 
 
   
+#pragma mark - NativeCredentialsManagerAppleCredential
+
+template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
+struct NativeCredentialsManagerAppleCredential {
+  P0 type;
+  P1 id;
+  P2 idToken;
+  P3 displayName;
+  P4 familyName;
+  P5 givenName;
+  P6 email;
+  bool operator==(const NativeCredentialsManagerAppleCredential &other) const {
+    return type == other.type && id == other.id && idToken == other.idToken && displayName == other.displayName && familyName == other.familyName && givenName == other.givenName && email == other.email;
+  }
+};
+
+template <typename T>
+struct NativeCredentialsManagerAppleCredentialBridging {
+  static T types;
+
+  static T fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    T result{
+      bridging::fromJs<decltype(types.type)>(rt, value.getProperty(rt, "type"), jsInvoker),
+      bridging::fromJs<decltype(types.id)>(rt, value.getProperty(rt, "id"), jsInvoker),
+      bridging::fromJs<decltype(types.idToken)>(rt, value.getProperty(rt, "idToken"), jsInvoker),
+      bridging::fromJs<decltype(types.displayName)>(rt, value.getProperty(rt, "displayName"), jsInvoker),
+      bridging::fromJs<decltype(types.familyName)>(rt, value.getProperty(rt, "familyName"), jsInvoker),
+      bridging::fromJs<decltype(types.givenName)>(rt, value.getProperty(rt, "givenName"), jsInvoker),
+      bridging::fromJs<decltype(types.email)>(rt, value.getProperty(rt, "email"), jsInvoker)};
+    return result;
+  }
+
+#ifdef DEBUG
+  static jsi::String typeToJs(jsi::Runtime &rt, decltype(types.type) value) {
+    return bridging::toJs(rt, value);
+  }
+
+  static jsi::String idToJs(jsi::Runtime &rt, decltype(types.id) value) {
+    return bridging::toJs(rt, value);
+  }
+
+  static jsi::String idTokenToJs(jsi::Runtime &rt, decltype(types.idToken) value) {
+    return bridging::toJs(rt, value);
+  }
+
+  static jsi::String displayNameToJs(jsi::Runtime &rt, decltype(types.displayName) value) {
+    return bridging::toJs(rt, value);
+  }
+
+  static jsi::String familyNameToJs(jsi::Runtime &rt, decltype(types.familyName) value) {
+    return bridging::toJs(rt, value);
+  }
+
+  static jsi::String givenNameToJs(jsi::Runtime &rt, decltype(types.givenName) value) {
+    return bridging::toJs(rt, value);
+  }
+
+  static jsi::String emailToJs(jsi::Runtime &rt, decltype(types.email) value) {
+    return bridging::toJs(rt, value);
+  }
+#endif
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const T &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    auto result = facebook::jsi::Object(rt);
+    result.setProperty(rt, "type", bridging::toJs(rt, value.type, jsInvoker));
+    result.setProperty(rt, "id", bridging::toJs(rt, value.id, jsInvoker));
+    result.setProperty(rt, "idToken", bridging::toJs(rt, value.idToken, jsInvoker));
+    if (value.displayName) {
+      result.setProperty(rt, "displayName", bridging::toJs(rt, value.displayName.value(), jsInvoker));
+    }
+    if (value.familyName) {
+      result.setProperty(rt, "familyName", bridging::toJs(rt, value.familyName.value(), jsInvoker));
+    }
+    if (value.givenName) {
+      result.setProperty(rt, "givenName", bridging::toJs(rt, value.givenName.value(), jsInvoker));
+    }
+    if (value.email) {
+      result.setProperty(rt, "email", bridging::toJs(rt, value.email.value(), jsInvoker));
+    }
+    return result;
+  }
+};
+
+
+
+#pragma mark - NativeCredentialsManagerAppleSignInParams
+
+template <typename P0, typename P1>
+struct NativeCredentialsManagerAppleSignInParams {
+  P0 nonce;
+  P1 requestedScopes;
+  bool operator==(const NativeCredentialsManagerAppleSignInParams &other) const {
+    return nonce == other.nonce && requestedScopes == other.requestedScopes;
+  }
+};
+
+template <typename T>
+struct NativeCredentialsManagerAppleSignInParamsBridging {
+  static T types;
+
+  static T fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    T result{
+      bridging::fromJs<decltype(types.nonce)>(rt, value.getProperty(rt, "nonce"), jsInvoker),
+      bridging::fromJs<decltype(types.requestedScopes)>(rt, value.getProperty(rt, "requestedScopes"), jsInvoker)};
+    return result;
+  }
+
+#ifdef DEBUG
+  static jsi::String nonceToJs(jsi::Runtime &rt, decltype(types.nonce) value) {
+    return bridging::toJs(rt, value);
+  }
+
+  static jsi::Array requestedScopesToJs(jsi::Runtime &rt, decltype(types.requestedScopes) value) {
+    return bridging::toJs(rt, value);
+  }
+#endif
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const T &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    auto result = facebook::jsi::Object(rt);
+    result.setProperty(rt, "nonce", bridging::toJs(rt, value.nonce, jsInvoker));
+    result.setProperty(rt, "requestedScopes", bridging::toJs(rt, value.requestedScopes, jsInvoker));
+    return result;
+  }
+};
+
+
+
 #pragma mark - NativeCredentialsManagerCredObject
 
 template <typename P0, typename P1>
@@ -223,9 +362,10 @@ protected:
 
 public:
   virtual jsi::Value signUpWithPasskeys(jsi::Runtime &rt, jsi::Object requestJson, bool preferImmediatelyAvailableCredentials) = 0;
-  virtual void signUpWithPassword(jsi::Runtime &rt, jsi::Object credObject) = 0;
+  virtual jsi::Value signUpWithPassword(jsi::Runtime &rt, jsi::Object credObject) = 0;
   virtual jsi::Value signIn(jsi::Runtime &rt, jsi::Array options, jsi::Object params) = 0;
   virtual jsi::Value signUpWithGoogle(jsi::Runtime &rt, jsi::Object params) = 0;
+  virtual jsi::Value signUpWithApple(jsi::Runtime &rt, jsi::Object params) = 0;
   virtual jsi::Value signOut(jsi::Runtime &rt) = 0;
 
 };
@@ -265,12 +405,12 @@ private:
       return bridging::callFromJs<jsi::Value>(
           rt, &T::signUpWithPasskeys, jsInvoker_, instance_, std::move(requestJson), std::move(preferImmediatelyAvailableCredentials));
     }
-    void signUpWithPassword(jsi::Runtime &rt, jsi::Object credObject) override {
+    jsi::Value signUpWithPassword(jsi::Runtime &rt, jsi::Object credObject) override {
       static_assert(
           bridging::getParameterCount(&T::signUpWithPassword) == 2,
           "Expected signUpWithPassword(...) to have 2 parameters");
 
-      return bridging::callFromJs<void>(
+      return bridging::callFromJs<jsi::Value>(
           rt, &T::signUpWithPassword, jsInvoker_, instance_, std::move(credObject));
     }
     jsi::Value signIn(jsi::Runtime &rt, jsi::Array options, jsi::Object params) override {
@@ -289,6 +429,14 @@ private:
       return bridging::callFromJs<jsi::Value>(
           rt, &T::signUpWithGoogle, jsInvoker_, instance_, std::move(params));
     }
+    jsi::Value signUpWithApple(jsi::Runtime &rt, jsi::Object params) override {
+      static_assert(
+          bridging::getParameterCount(&T::signUpWithApple) == 2,
+          "Expected signUpWithApple(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::signUpWithApple, jsInvoker_, instance_, std::move(params));
+    }
     jsi::Value signOut(jsi::Runtime &rt) override {
       static_assert(
           bridging::getParameterCount(&T::signOut) == 1,

package/android/src/main/java/com/credentialsmanager/handlers/CredentialHandler.kt

@@ -1,5 +1,6 @@
 package com.credentialsmanager.handlers
 
+import android.app.Activity
 import android.content.Context
 import android.util.Log
 import androidx.credentials.ClearCredentialStateRequest
@@ -16,6 +17,7 @@ import androidx.credentials.GetPublicKeyCredentialOption
 import androidx.credentials.PasswordCredential
 import androidx.credentials.PublicKeyCredential
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.google.android.libraries.identity.googleid.GetGoogleIdOption
@@ -28,6 +30,23 @@ class CredentialHandler(
 ) {
   private val credentialManager = CredentialManager.create(context)
 
+  // Helper function to get activity context
+  private fun getActivityContext(): Context {
+    if (context is ReactApplicationContext) {
+      val activity = context.currentActivity
+      if (activity != null) {
+        return activity
+      } else {
+        Log.w("CredentialManager", "No current activity found. UI operations may fail - ensure you're calling from the main/UI thread.")
+      }
+    } else {
+      Log.w("CredentialManager", "Context is not ReactApplicationContext. UI operations may fail.")
+    }
+    // If we can't get an activity context, use the original context
+    // This might still cause issues for UI operations, but it's better than null
+    return context
+  }
+
   suspend fun signOut() {
     credentialManager.clearCredentialState(ClearCredentialStateRequest())
   }
@@ -36,26 +55,34 @@ class CredentialHandler(
     jsonString: String,
     preferImmediatelyAvailableCredentials: Boolean,
   ): ReadableMap? {
-    val request =
-      CreatePublicKeyCredentialRequest(
-        requestJson = jsonString,
-        preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials,
-      )
+    Log.d("CredentialManager", "Creating passkey with request: $jsonString")
+    
+    try {
+      val request =
+        CreatePublicKeyCredentialRequest(
+          requestJson = jsonString,
+          preferImmediatelyAvailableCredentials = preferImmediatelyAvailableCredentials,
+        )
 
-    val response =
-      credentialManager.createCredential(
-        context,
-        request,
-      ) as CreatePublicKeyCredentialResponse
+      val activityContext = getActivityContext()
+      val response =
+        credentialManager.createCredential(
+          activityContext,
+          request,
+        ) as CreatePublicKeyCredentialResponse
 
-    return response.data.getString("androidx.credentials.BUNDLE_KEY_REGISTRATION_RESPONSE_JSON")?.let { json ->
-      val jsonObject = Arguments.createMap()
-      val parsedObject = JSONObject(json)
+      return response.data.getString("androidx.credentials.BUNDLE_KEY_REGISTRATION_RESPONSE_JSON")?.let { json ->
+        val jsonObject = Arguments.createMap()
+        val parsedObject = JSONObject(json)
 
-      parsedObject.keys().forEach { key ->
-        jsonObject.putString(key, parsedObject.getString(key))
+        parsedObject.keys().forEach { key ->
+          jsonObject.putString(key, parsedObject.getString(key))
+        }
+        jsonObject
       }
-      jsonObject
+    } catch (e: Exception) {
+      Log.e("CredentialManager", "Error creating passkey", e)
+      throw e
     }
   }
 
@@ -63,8 +90,16 @@ class CredentialHandler(
     username: String,
     password: String,
   ) {
-    val createPasswordRequest = CreatePasswordRequest(id = username, password = password)
-    credentialManager.createCredential(context, createPasswordRequest)
+    Log.d("CredentialManager", "Creating password credential for username: $username")
+    
+    try {
+      val activityContext = getActivityContext()
+      val createPasswordRequest = CreatePasswordRequest(id = username, password = password)
+      credentialManager.createCredential(activityContext, createPasswordRequest)
+    } catch (e: Exception) {
+      Log.e("CredentialManager", "Error creating password credential", e)
+      throw e
+    }
   }
 
   suspend fun signIn(
@@ -106,17 +141,19 @@ class CredentialHandler(
     }
 
     val request = GetCredentialRequest(credentialOptions)
-    val result = credentialManager.getCredential(context, request)
+    val activityContext = getActivityContext()
+    val result = credentialManager.getCredential(activityContext, request)
     return handleSignInResult(result)
   }
 
   suspend fun getSavedCredentials(jsonString: String): ReadableMap? {
     val getPublicKeyCredentialOption = GetPublicKeyCredentialOption(jsonString, null)
     val getPasswordOption = GetPasswordOption()
+    val activityContext = getActivityContext()
 
     val result =
       credentialManager.getCredential(
-        context,
+        activityContext,
         GetCredentialRequest(
           listOf(
             getPublicKeyCredentialOption,
@@ -210,10 +247,11 @@ class CredentialHandler(
         .addCredentialOption(googleIdOption)
         .build()
 
+    val activityContext = getActivityContext()
     val result =
       credentialManager.getCredential(
         request = request,
-        context = context,
+        context = activityContext,
       )
 
     return result