fix(auth): resolve the conflict markers left in the verification OTP path - #595
Closed
AbdullahM07 wants to merge 1 commit into
Closed
fix(auth): resolve the conflict markers left in the verification OTP path#595AbdullahM07 wants to merge 1 commit into
AbdullahM07 wants to merge 1 commit into
Conversation
…path
`74ec3f72` ("patch v0.6.6") committed unresolved merge conflict markers into
the `emailOTP` plugin's `sendVerificationOTP`, so `main` stops at
`TS1185: Merge conflict marker encountered` and 48 API test files fail to load
— esbuild cannot parse the file, and everything importing it through
`middleware/auth.ts` dies at transform time.
Keeps the fail-loudly side. It is what the `forget-password` branch directly
below already does: check `sendMail`'s result and throw SERVICE_UNAVAILABLE
rather than tell someone to check their inbox for a code that was never sent.
The discarded side is the fire-and-forget behavior v0.6.6 was replacing.
No behavior change beyond removing the markers.
Member
Author
|
Superseded by b2223b9, which landed the same fix — closing. For the record the two resolutions are byte-identical: both go The compile break on |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #594.
74ec3f72("patch v0.6.6") committed unresolved merge conflict markers intoapps/api/src/lib/auth.ts, in theemailOTPplugin'ssendVerificationOTP.mainhas not typechecked since.Before
esbuild also cannot parse the file, so 48 API test files fail at transform time — everything that reaches
auth.tsthroughmiddleware/auth.ts.After
The one remaining failure is
service-exec-isolation.test.tshitting the 20s test timeout under full-suite load; it passes in isolation in ~8s and is unrelated to this change.packages/coreis 608/608.Which side this keeps
The fail-loudly one:
That is already what the
forget-passwordbranch does a few lines below in the same function, and its comment states the reasoning:sendMailreturns silently when no transport is configured, so without the result check the user is told to check their inbox for a code that was never sent. The discardedHEADside was the older fire-and-forget call that v0.6.6 was in the process of replacing.Four deleted lines, no behavior change beyond removing the markers. No test asserted the silent behavior.
Not addressed here
#594 also notes that #586 merged with
TypecheckandTestred. This PR only unbreaksmain; the branch protection gap that allowed it is left for a separate discussion.