Create handleRecaptchaFlow helper method #7666
Merged
Conversation
This file contains 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
🦋 Changeset detectedLatest commit: edc0f50 The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Size Report 1Affected Products
Test Logs |
Size Analysis Report 1Affected Products
Test Logs |
renkelvin
requested review from
a team,
lisajian,
prameshj and
sam-gc
as code owners
prameshj
reviewed
Sep 29, 2023
| actionName: RecaptchaActionName, | ||
| actionMethod: ActionMethod<TRequest, TResponse> | ||
| ): Promise<TResponse> { | ||
| if (authInstance._getRecaptchaConfig()?.emailPasswordEnabled) { |
There was a problem hiding this comment.
Can we also include "provider" name or enum as a parameter? Based on that, we will know whether to check emailPasswordEnabled or a different provider.
Ok to handle this the next time we add a provider too. Please add a TODO in that case.
There was a problem hiding this comment.
Yeah, as an internal method, I prefer add the parameter only when needed so the context is more clear.
packages/auth/src/platform_browser/recaptcha/recaptcha_enterprise_verifier.ts
Outdated
Show resolved
Hide resolved
| request: TRequest | ||
| ) => Promise<TResponse>; | ||
|
|
||
| export async function handleRecaptchaFlow<TRequest, TResponse>( |
There was a problem hiding this comment.
can we add some tests for this method? I understand that usages of this methods in the various flows are being tested.. would be good to test this too.
There was a problem hiding this comment.
@renkelvin can you update the description that all rCE protected flows were manually verified with the demo app?
I am ok with moving the new unit tests to a different PR to debug them.
| authInstance, | ||
| request, | ||
| actionName, | ||
| actionName === RecaptchaActionName.GET_OOB_CODE |
There was a problem hiding this comment.
Does this mean that for oobCodeFlows, we do not call the request field name as "captchaResp: token"?
There was a problem hiding this comment.
Correct, this is due to backend legacy issues.
| } | ||
| }); | ||
| } | ||
| return handleRecaptchaFlow( |
There was a problem hiding this comment.
Instead of calling signInWithCredential in packages/auth/src/core/strategies/email_and_password.ts, can we instead duplicate a bit of code and do something like:
export function signInWithEmailAndPassword(
auth: Auth,
email: string,
password: string
): Promise<UserCredential> {
const request: SignInWithPasswordRequest = {
returnSecureToken: true,
email: this._email,
password: this._password,
clientType: RecaptchaClientType.WEB
};
const response = handleRecaptchaFlow(auth, request, action, signInWithPassword)
.catch(error => {
if (error.code === `auth/${AuthErrorCode.MFA_REQUIRED}`) {
throw MultiFactorError._fromErrorAndOperation(
auth,
error,
operationType,
user
);
} else if (
error.code === `auth/${AuthErrorCode.PASSWORD_DOES_NOT_MEET_REQUIREMENTS}`
) {
void recachePasswordPolicy(auth);
} else {
throw error;
}
})
;
const userCredential = await UserCredentialImpl._fromIdTokenResponse(
auth,
OperationType.SIGN_IN,
response
);
await auth._updateCurrentUser(userCredential.user);
This will make the email login flow more consistent with the other flows in strategies/email_and_password.ts and we don't have to import any recaptcha enterprise methods here (enabling tree shaking out the JS script)
There was a problem hiding this comment.
Adding the comment here, but it is for the implementation in packages/auth/src/core/strategies/email_and_password.ts
There was a problem hiding this comment.
But doing this will not perform recaptcha enterprise wrapping if the developer is calling reauthenticateWithCredential or signInWithCredential directly... hmm.
There was a problem hiding this comment.
Yeah, I actually tried similar things when implementing the recapthca flow originally. I agree this part needs some refactors.
This was referenced Oct 11, 2023
renkelvin
force-pushed
the
recaptcha-verifier
branch
from
4774ddb
to
6b934c9
Compare
added 4 commits
October 11, 2023 09:41
prameshj
approved these changes
Oct 12, 2023
hsubox76
approved these changes
Oct 13, 2023
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
All flows manually verified in the demo app. Gonna add the unit tests in a separate PR.