fix(auth): resolve the merge conflict markers committed in v0.6.6 - #590
Closed
Farahat612 wants to merge 1 commit into
Closed
fix(auth): resolve the merge conflict markers committed in v0.6.6#590Farahat612 wants to merge 1 commit into
Farahat612 wants to merge 1 commit into
Conversation
apps/api/src/lib/auth.ts carries unresolved conflict markers from the v0.6.6 patch, so `tsc --noEmit` fails with TS1185 and the API workspace does not compile. CI runs that typecheck, so main is red and so is every pull request opened against it. Kept the v0.6.6 side, which is the change that patch was making and the behaviour the sibling forget-password branch a few lines below already implements: sendMail returns a boolean, and a verification code that was never delivered has to fail loudly rather than tell the user to check an inbox that will stay empty. Verified: bun run --cwd apps/api lint is clean again, and the apps/api lib suite passes (90 files, 1376 tests).
Author
|
Closing: this is already fixed on main. b2223b9 resolves the markers in apps/api/src/lib/auth.ts to the same side this PR did, the guarded sendMail that surfaces SERVICE_UNAVAILABLE rather than reporting a success no transport could deliver, and the API workspace compiles again. Thanks for getting it in. |
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.
apps/api/src/lib/auth.ts carries unresolved conflict markers from the
v0.6.6 patch, so
tsc --noEmitfails with TS1185 and the API workspacedoes not compile. CI runs that typecheck, so main is red and so is every
pull request opened against it.
Kept the v0.6.6 side, which is the change that patch was making and the
behaviour the sibling forget-password branch a few lines below already
implements: sendMail returns a boolean, and a verification code that was
never delivered has to fail loudly rather than tell the user to check an
inbox that will stay empty.
Verified: bun run --cwd apps/api lint is clean again, and the apps/api
lib suite passes (90 files, 1376 tests).
Noticed while rebasing another branch: the API workspace stopped compiling
on main. CI runs
bun run --cwd apps/api lint(tsc --noEmit), so this iscurrently failing on main and on every open pull request against it.
I kept the v0.6.6 side of the conflict because that is the change the patch
was making, and because the sibling forget-password branch a few lines below
already implements exactly that pattern: sendMail returns a boolean, and a
verification code that was never delivered should fail loudly rather than
tell the user to check an inbox that stays empty.
Happy to flip it to the other side instead if the intent was different.