-
Notifications
You must be signed in to change notification settings - Fork 265
React Vanilla Sample App Improvements for Passkey #1293
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
KaveeshaPiumini
wants to merge
1
commit into
asgardeo:main
Choose a base branch
from
KaveeshaPiumini:passkey-bug-fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+39
−8
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -313,6 +313,15 @@ const LoginPage = () => { | |||||||
| setRegOnlySuccess(true); | ||||||||
| } | ||||||||
| } else if (data.type === "VIEW") { | ||||||||
| // Check for passkey creation options in additionalData - check this first | ||||||||
| if (data.data?.additionalData?.passkeyCreationOptions) { | ||||||||
| setPasskeyCreationOptions(data.data.additionalData.passkeyCreationOptions); | ||||||||
| } | ||||||||
| // Check for passkey authentication challenge in additionalData - check this first | ||||||||
| if (data.data?.additionalData?.passkeyChallenge) { | ||||||||
| setPasskeyChallenge(data.data.additionalData.passkeyChallenge); | ||||||||
| } | ||||||||
|
|
||||||||
| // Handle the VIEW response | ||||||||
| // Check if this is an input prompt (has inputs to collect) | ||||||||
| if (data.data?.inputs && data.data.inputs.length > 0) { | ||||||||
|
|
@@ -325,14 +334,6 @@ const LoginPage = () => { | |||||||
| if (data.data?.actions) { | ||||||||
| setAvailableActions(data.data.actions); | ||||||||
| } | ||||||||
| // Check for passkey creation options in additionalData | ||||||||
| if (data.data?.additionalData?.passkeyCreationOptions) { | ||||||||
| setPasskeyCreationOptions(data.data.additionalData.passkeyCreationOptions); | ||||||||
| } | ||||||||
| // Check for passkey authentication challenge in additionalData | ||||||||
| if (data.data?.additionalData?.passkeyChallenge) { | ||||||||
| setPasskeyChallenge(data.data.additionalData.passkeyChallenge); | ||||||||
| } | ||||||||
| } else if (data.data?.actions && data.data.actions.length > 1) { | ||||||||
| // This is a decision screen - multiple actions to choose from | ||||||||
| setNeedsDecision(true); | ||||||||
|
|
@@ -404,6 +405,8 @@ const LoginPage = () => { | |||||||
| setRedirectURL(null); | ||||||||
| setSocialIdpName(''); | ||||||||
| setRegOnlySuccess(false); | ||||||||
| setPasskeyCreationOptions(null); | ||||||||
| setPasskeyChallenge(null); | ||||||||
|
|
||||||||
| initiateNativeAuthFlow(isSignupMode ? 'REGISTRATION' : 'LOGIN') | ||||||||
| .then((result) => { | ||||||||
|
|
@@ -419,6 +422,15 @@ const LoginPage = () => { | |||||||
| setError(true); | ||||||||
| setErrorMessage(data.failureReason || defaultMessage); | ||||||||
| } else if (data.type === "VIEW") { | ||||||||
| // Check for passkey creation options in additionalData - check this first | ||||||||
| if (data.data?.additionalData?.passkeyCreationOptions) { | ||||||||
| setPasskeyCreationOptions(data.data.additionalData.passkeyCreationOptions); | ||||||||
| } | ||||||||
| // Check for passkey authentication challenge in additionalData - check this first | ||||||||
| if (data.data?.additionalData?.passkeyChallenge) { | ||||||||
| setPasskeyChallenge(data.data.additionalData.passkeyChallenge); | ||||||||
| } | ||||||||
|
|
||||||||
| // Handle the VIEW response | ||||||||
| // Check if this is an input prompt (has inputs to collect) | ||||||||
| if (data.data?.inputs && data.data.inputs.length > 0) { | ||||||||
|
|
@@ -483,6 +495,8 @@ const LoginPage = () => { | |||||||
| setSocialIdpName(''); | ||||||||
| setRegOnlySuccess(false); | ||||||||
| setPromptRegistration(false); | ||||||||
| setPasskeyCreationOptions(null); | ||||||||
| setPasskeyChallenge(null); | ||||||||
|
|
||||||||
| // Ensure all input fields are present in formData, even if empty | ||||||||
| const completeFormData = { ...formData }; | ||||||||
|
|
@@ -504,6 +518,15 @@ const LoginPage = () => { | |||||||
| setError(true); | ||||||||
| setErrorMessage(data.failureReason || 'Registration failed. Please check your information.'); | ||||||||
| } else if (data.type === "VIEW") { | ||||||||
| // Check for passkey creation options in additionalData - check this first | ||||||||
| if (data.data?.additionalData?.passkeyCreationOptions) { | ||||||||
| setPasskeyCreationOptions(data.data.additionalData.passkeyCreationOptions); | ||||||||
| } | ||||||||
| // Check for passkey authentication challenge in additionalData - check this first | ||||||||
| if (data.data?.additionalData?.passkeyChallenge) { | ||||||||
| setPasskeyChallenge(data.data.additionalData.passkeyChallenge); | ||||||||
| } | ||||||||
|
|
||||||||
| // Handle the VIEW response | ||||||||
| // Check if this is an input prompt (has inputs to collect) | ||||||||
| if (data.data?.inputs && data.data.inputs.length > 0) { | ||||||||
|
|
@@ -634,6 +657,9 @@ const LoginPage = () => { | |||||||
| }) | ||||||||
| .catch((error) => { | ||||||||
| console.error("Error submitting passkey credential:", error); | ||||||||
| setConnectionError(false); | ||||||||
| setNeedsDecision(false); | ||||||||
| setAvailableActions([]); | ||||||||
| handleSubmissionError(error); | ||||||||
| }); | ||||||||
| }; | ||||||||
|
|
@@ -667,6 +693,11 @@ const LoginPage = () => { | |||||||
| }) | ||||||||
| .catch((error) => { | ||||||||
| console.error("Error submitting passkey assertion:", error); | ||||||||
| setNeedsDecision(false); | ||||||||
| setAvailableActions([]); | ||||||||
| setSelectedAction(null); | ||||||||
| setFormData({}); | ||||||||
| setInputs([]); | ||||||||
|
||||||||
| setInputs([]); | |
| setInputs([]); | |
| setConnectionError(false); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The error handling for passkey credential submission (lines 660-662) clears fewer state variables compared to the passkey assertion error handler (lines 696-700). For consistency and to ensure a clean UI state on errors, consider also clearing
setSelectedAction(null),setFormData({}), andsetInputs([])in this error handler, similar to the passkey assertion error handler.