From 490319d4c046917bdd227c19fd37185d63076b4a Mon Sep 17 00:00:00 2001
From: Russell Wheatley <russellwheatley85@gmail.com>
Date: Tue, 21 May 2024 15:53:48 +0100
Subject: [PATCH] fix(auth, android): allow nullable `accessToken` when
 creating `OAuthProvider` (#12795)

---
 .../java/io/flutter/plugins/firebase/auth/PigeonParser.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/PigeonParser.java b/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/PigeonParser.java
index 228e5b40b6d2..15e8cbf6d122 100644
--- a/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/PigeonParser.java
+++ b/packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/PigeonParser.java
@@ -218,7 +218,9 @@ static AuthCredential getCredential(Map<String, Object> credentialMap) {
           String providerId =
               (String) Objects.requireNonNull(credentialMap.get(Constants.PROVIDER_ID));
           OAuthProvider.CredentialBuilder builder = OAuthProvider.newCredentialBuilder(providerId);
-          builder.setAccessToken(Objects.requireNonNull(accessToken));
+          if (accessToken != null) {
+            builder.setAccessToken(accessToken);
+          }
           if (rawNonce == null) {
             builder.setIdToken(Objects.requireNonNull(idToken));
           } else {