From 5ed92c5019852713143584518d6abbeb8bc63ca6 Mon Sep 17 00:00:00 2001 From: "riccardo.pacifico" Date: Tue, 17 Feb 2026 10:26:27 +0100 Subject: [PATCH 1/3] refactor: removed unused import --- android/src/main/java/com/googleauth/GoogleAuthModule.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/android/src/main/java/com/googleauth/GoogleAuthModule.kt b/android/src/main/java/com/googleauth/GoogleAuthModule.kt index a335eab..6ed85cc 100644 --- a/android/src/main/java/com/googleauth/GoogleAuthModule.kt +++ b/android/src/main/java/com/googleauth/GoogleAuthModule.kt @@ -1,7 +1,6 @@ package com.googleauth import android.app.Activity -import android.content.Context import android.content.SharedPreferences import android.util.Log import androidx.lifecycle.Lifecycle @@ -32,8 +31,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import java.util.Date -import java.util.concurrent.TimeUnit import org.json.JSONObject import java.util.Base64 From 1660f2b2ab8e83830af484b025beaba224d7815b Mon Sep 17 00:00:00 2001 From: "riccardo.pacifico" Date: Tue, 17 Feb 2026 10:27:10 +0100 Subject: [PATCH 2/3] fix: replaced java.util.base64 with android.util.base64 for backwad compatibility --- android/src/main/java/com/googleauth/GoogleAuthModule.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/googleauth/GoogleAuthModule.kt b/android/src/main/java/com/googleauth/GoogleAuthModule.kt index 6ed85cc..f27f3b6 100644 --- a/android/src/main/java/com/googleauth/GoogleAuthModule.kt +++ b/android/src/main/java/com/googleauth/GoogleAuthModule.kt @@ -32,7 +32,7 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.json.JSONObject -import java.util.Base64 +import android.util.Base64 @ReactModule(name = GoogleAuthModule.NAME) class GoogleAuthModule(reactContext: ReactApplicationContext) : @@ -864,7 +864,7 @@ class GoogleAuthModule(reactContext: ReactApplicationContext) : try { val parts = idToken.split(".") if (parts.size >= 2) { - val payload = String(Base64.getUrlDecoder().decode(parts[1])) + val payload = String(Base64.decode(parts[1], Base64.NO_WRAP)) val json = JSONObject(payload) val exp = json.optLong("exp", 0) if (exp > 0) { @@ -880,7 +880,7 @@ class GoogleAuthModule(reactContext: ReactApplicationContext) : try { val parts = idToken.split(".") if (parts.size >= 2) { - val payload = String(Base64.getUrlDecoder().decode(parts[1])) + val payload = String(Base64.decode(parts[1], Base64.NO_WRAP)) val json = JSONObject(payload) return json.optString("email", null) } From 8088262ba067437de7009cc79ff748a84d220954 Mon Sep 17 00:00:00 2001 From: "riccardo.pacifico" Date: Tue, 17 Feb 2026 11:57:51 +0100 Subject: [PATCH 3/3] fix: use URL_SAFE decode flag --- android/src/main/java/com/googleauth/GoogleAuthModule.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/googleauth/GoogleAuthModule.kt b/android/src/main/java/com/googleauth/GoogleAuthModule.kt index f27f3b6..bbce979 100644 --- a/android/src/main/java/com/googleauth/GoogleAuthModule.kt +++ b/android/src/main/java/com/googleauth/GoogleAuthModule.kt @@ -864,7 +864,7 @@ class GoogleAuthModule(reactContext: ReactApplicationContext) : try { val parts = idToken.split(".") if (parts.size >= 2) { - val payload = String(Base64.decode(parts[1], Base64.NO_WRAP)) + val payload = String(Base64.decode(parts[1], Base64.URL_SAFE)) val json = JSONObject(payload) val exp = json.optLong("exp", 0) if (exp > 0) { @@ -880,7 +880,7 @@ class GoogleAuthModule(reactContext: ReactApplicationContext) : try { val parts = idToken.split(".") if (parts.size >= 2) { - val payload = String(Base64.decode(parts[1], Base64.NO_WRAP)) + val payload = String(Base64.decode(parts[1], Base64.URL_SAFE)) val json = JSONObject(payload) return json.optString("email", null) }