Skip to content

fix(auth): resolve the merge conflict markers committed in v0.6.6 - #590

Closed
Farahat612 wants to merge 1 commit into
oblien:mainfrom
Farahat612:fix/main-conflict-markers
Closed

fix(auth): resolve the merge conflict markers committed in v0.6.6#590
Farahat612 wants to merge 1 commit into
oblien:mainfrom
Farahat612:fix/main-conflict-markers

Conversation

@Farahat612

Copy link
Copy Markdown

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).

Noticed while rebasing another branch: the API workspace stopped compiling
on main. CI runs bun run --cwd apps/api lint (tsc --noEmit), so this is
currently 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.

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).
@Farahat612

Copy link
Copy Markdown
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.

@Farahat612 Farahat612 closed this Aug 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant