Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,16 @@ class CredentialHandler(
val nonce = googleParams?.getString("nonce") ?: ""
val serverClientId = googleParams?.getString("serverClientId") ?: ""
val autoSelectEnabled = googleParams?.getBoolean("autoSelectEnabled") ?: false
// Default to true for sign-in (show only authorized accounts)
val filterByAuthorizedAccounts = if (googleParams?.hasKey("filterByAuthorizedAccounts") == true) {
googleParams.getBoolean("filterByAuthorizedAccounts")
} else {
true
}

credentialOptions.add(
getGoogleId(
true,
filterByAuthorizedAccounts,
nonce,
serverClientId,
autoSelectEnabled,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,16 @@ class CredentialsManagerModule(
val nonce = requestObject.getString("nonce") ?: ""
val serverClientId = requestObject.getString("serverClientId") ?: ""
val autoSelectEnabled = requestObject.getBoolean("autoSelectEnabled")
// Default to false for sign-up (show all accounts)
val filterByAuthorizedAccounts = if (requestObject.hasKey("filterByAuthorizedAccounts")) {
requestObject.getBoolean("filterByAuthorizedAccounts")
} else {
false
}

val googleIdOption =
credentialHandler.getGoogleId(
setFilterByAuthorizedAccounts = true,
setFilterByAuthorizedAccounts = filterByAuthorizedAccounts,
nonce = nonce,
serverClientId = serverClientId,
autoSelectEnabled = autoSelectEnabled,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,16 @@ class CredentialsManagerModule(
val nonce = requestObject.getString("nonce") ?: ""
val serverClientId = requestObject.getString("serverClientId") ?: ""
val autoSelectEnabled = requestObject.getBoolean("autoSelectEnabled")
// Default to false for sign-up (show all accounts)
val filterByAuthorizedAccounts = if (requestObject.hasKey("filterByAuthorizedAccounts")) {
requestObject.getBoolean("filterByAuthorizedAccounts")
} else {
false
}

val googleIdOption =
credentialHandler.getGoogleId(
setFilterByAuthorizedAccounts = false,
setFilterByAuthorizedAccounts = filterByAuthorizedAccounts,
nonce = nonce,
serverClientId = serverClientId,
autoSelectEnabled = autoSelectEnabled,
Expand All @@ -158,7 +164,7 @@ class CredentialsManagerModule(
Log.d("CredentialManager", "NoCredentialException")
val googleIdOption =
credentialHandler.getGoogleId(
setFilterByAuthorizedAccounts = false,
setFilterByAuthorizedAccounts = filterByAuthorizedAccounts,
nonce = nonce,
serverClientId = serverClientId,
autoSelectEnabled = autoSelectEnabled,
Expand Down
4 changes: 4 additions & 0 deletions example/android/.kotlin/errors/errors-1760610500670.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kotlin version: 2.0.21
error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
1. Kotlin compile daemon is ready

4 changes: 4 additions & 0 deletions example/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export default function App() {
googleSignIn: {
serverClientId: WEB_CLIENT_ID,
autoSelectEnabled: true,
// Show only accounts that have previously authorized the app
filterByAuthorizedAccounts: true,
},
appleSignIn: {
requestedScopes: ['fullName', 'email'],
Expand Down Expand Up @@ -116,6 +118,8 @@ export default function App() {
const credential = await signUpWithGoogle({
serverClientId: WEB_CLIENT_ID,
autoSelectEnabled: false,
// Show all Google accounts on the device, not just authorized ones
filterByAuthorizedAccounts: false,
});
if (credential.type === 'google-signin') {
console.log('Google credentials:', {
Expand Down
1 change: 1 addition & 0 deletions src/NativeCredentialsManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type GoogleSignInParams = {
nonce: string;
serverClientId: string;
autoSelectEnabled: boolean;
filterByAuthorizedAccounts?: boolean;
};

export type GoogleCredential = {
Expand Down
5 changes: 5 additions & 0 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type GoogleSignInParams = {
nonce?: string;
serverClientId: string;
autoSelectEnabled?: boolean;
filterByAuthorizedAccounts?: boolean;
};

type AppleSignInParams = {
Expand Down Expand Up @@ -70,6 +71,7 @@ export function signIn<T extends readonly SignInOption[]>(
serverClientId: string;
nonce: string;
autoSelectEnabled: boolean;
filterByAuthorizedAccounts: boolean;
};
appleSignIn?: {
nonce: string;
Expand All @@ -84,6 +86,8 @@ export function signIn<T extends readonly SignInOption[]>(
serverClientId: params.googleSignIn?.serverClientId ?? '',
nonce: params.googleSignIn?.nonce ?? '',
autoSelectEnabled: params.googleSignIn?.autoSelectEnabled ?? true,
filterByAuthorizedAccounts:
params.googleSignIn?.filterByAuthorizedAccounts ?? true,
};
}

Expand Down Expand Up @@ -118,6 +122,7 @@ export function signUpWithGoogle(
...params,
nonce: params.nonce ?? '',
autoSelectEnabled: params.autoSelectEnabled ?? true,
filterByAuthorizedAccounts: params.filterByAuthorizedAccounts ?? false,
});
}

Expand Down
Loading