Implement conditional create in Shrine #189

cy245 · 2026-01-30T20:50:08Z

Implements Conditional Create (also called Automatic Passkey Upgrade) in Shrine

Also fixes login function to use more correct server endpoint (original returns an empty object which was causing a bug).

gemini-code-assist · 2026-01-30T20:50:30Z

Summary of Changes

Hello @cy245, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request introduces the capability for conditional passkey creation within the Shrine application. It refactors the existing authentication mechanism to support a unified username and password login, which then seamlessly allows for the creation of a passkey if the user has logged in with traditional credentials. This change improves the security and convenience of user authentication by promoting passkey adoption after a successful password-based sign-in.

Highlights

Conditional Passkey Creation: The createPasskey function in CredentialManagerUtils.kt now accepts an isConditional parameter, enabling conditional passkey creation based on the authentication context.
Authentication API Refactoring: The AuthApiService.kt has been updated to replace separate setUsername and setPassword endpoints with a single loginWithUsernamePassword endpoint for a more unified authentication process.
Login Request Model Update: The LoginRequest.kt file now defines a LoginUsernamePasswordRequest data class, which includes both username and password, replacing the older EditUsernameRequest and PasswordRequest models for login operations.
Repository Authentication Logic Streamlining: The AuthRepository.kt has been modified to utilize the new loginWithUsernamePassword API, streamlining the login process and removing the deprecated setSessionWithPassword function.
UI/ViewModel Integration for Passkey Adoption: The AuthenticationScreen.kt and AuthenticationViewModel.kt now incorporate logic to trigger conditional passkey creation immediately following a successful password-based login, enhancing user experience by promoting passkey adoption.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request successfully implements conditional passkey creation after a password-based login, which is a great step towards encouraging passkey adoption. The refactoring of the login flow into a single API call is also a significant improvement for both code clarity and efficiency. I've identified a couple of potential issues related to error handling and a possible race condition in the UI flow that could lead to a confusing user experience. Addressing these points will make the implementation more robust.

Shrine/app/src/main/java/com/authentication/shrine/ui/AuthenticationScreen.kt

Shrine/app/src/main/java/com/authentication/shrine/ui/viewmodel/AuthenticationViewModel.kt

…ditional create to work with create restore key, and ensure CreatePasskeyScreen isn't shown on passkey login

niharika2810

Minor comments, Kindly check

niharika2810 · 2026-02-12T08:28:31Z

Shrine/app/src/main/java/com/authentication/shrine/ui/viewmodel/AuthenticationViewModel.kt

-                    }
-                }
+    ): Boolean {
+        return registerPasskey(createRestoreKeyOnCredMan, "Error creating restore key.")


nit : Add in string res

niharika2810 · 2026-02-12T08:29:27Z

Shrine/app/src/main/java/com/authentication/shrine/ui/viewmodel/AuthenticationViewModel.kt

+    ): Boolean {
+        return when (val result = repository.registerPasskeyCreationRequest()) {
+            is AuthResult.Success -> {
+                val createPasskeyResponse = createPasskeyOnCredMan(result.data)


Can we have a better for createPasskeyOnCredMan method? Also CredMan might not be the external term we want to use :)

niharika2810 · 2026-02-12T08:30:13Z

Shrine/app/src/main/java/com/authentication/shrine/ui/AuthenticationScreen.kt

+                    val conditionalSuccess = viewModel.conditionalCreatePasskey(
+                        createPasskeyOnCredMan = { createPasskeyRequestObj: JSONObject ->
+                            credentialManagerUtils.createPasskey(
+                                requestResult = createPasskeyRequestObj,


nit : createPasskeyRequestObj to createPasskeyRequestObject?

niharika2810 · 2026-02-12T08:31:37Z

Shrine/app/src/main/java/com/authentication/shrine/ui/RegisterPasswordScreen.kt

+                    createRestoreKeyOnCredMan = { createRestoreCredObject ->
+                        credentialManagerUtils.createRestoreKey(
+                            context = context,
+                            requestResult = createRestoreCredObject,


nit : createRestoreCredObject to createRestoreCredentialsObject?

Implement conditional create in Shrine

a2c3b32

gemini-code-assist bot reviewed Jan 30, 2026

View reviewed changes

Remove invalid imports, refactor some functions to be suspend for con…

047c321

…ditional create to work with create restore key, and ensure CreatePasskeyScreen isn't shown on passkey login

cy245 marked this pull request as ready for review February 6, 2026 21:54

cy245 requested a review from niharika2810 as a code owner February 6, 2026 21:54

niharika2810 approved these changes Feb 12, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement conditional create in Shrine #189

Implement conditional create in Shrine #189

Uh oh!

cy245 commented Jan 30, 2026 •

edited

Loading

Uh oh!

gemini-code-assist bot commented Jan 30, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

niharika2810 left a comment

Uh oh!

niharika2810 Feb 12, 2026

Uh oh!

niharika2810 Feb 12, 2026

Uh oh!

niharika2810 Feb 12, 2026

Uh oh!

niharika2810 Feb 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Implement conditional create in Shrine #189

Are you sure you want to change the base?

Implement conditional create in Shrine #189

Uh oh!

Conversation

cy245 commented Jan 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist bot commented Jan 30, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

niharika2810 left a comment

Choose a reason for hiding this comment

Uh oh!

niharika2810 Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

niharika2810 Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

niharika2810 Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

niharika2810 Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

cy245 commented Jan 30, 2026 •

edited

Loading