Added failOnConflict to both update UserService.updateEmail and updatePhone

[slavikm]

Related Issues

Fixes https://github.com/descope/etc/issues/17716

Description

Add failOnConflict boolean flag to the updates

Must

• Tests
• Documentation (if applicable)

[shuni-bot]

🐕 Review complete — View session on Shuni Portal 🐾

[shuni-bot]

🐕 Suggested Reviewers

This PR adds a failOnConflict boolean flag to UserService email and phone update methods. The optimal review strategy combines deep expertise in the affected modules with broad coverage: aviadl has the most extensive history across all three files and can provide comprehensive architectural review; Bars92 offers equally broad coverage and can validate the implementation pattern; orius123 adds test-specific expertise to ensure proper test coverage; and dorsha provides additional perspective on the interface and implementation layer. This combination ensures thorough review of the API changes, implementation, and test completeness.

Reviewer	Reason
aviadl	Most active contributor on all three changed files (6 commits). Essential for reviewing the overall impact of adding the failOnConflict flag to UserService interface and its implementation details.
Bars92	Second most experienced reviewer with 3 commits across all three files, matching the PR's scope. Provides independent validation of the design and implementation approach.
orius123	Strong test expertise with 2 commits including UserServiceImplTest.java. Critical for ensuring the new failOnConflict parameter has adequate test coverage and correct test scenarios.
dorsha	2 commits on both the interface and implementation files. Provides additional review of the public API changes and their implementation consistency.

_{Suggested by Shuni based on git history and PR context. Names are not @-mentioned to avoid notifying anyone — request a review from whoever fits best.}

[shuni-bot]

🐕 Shuni's Review

This PR adds a failOnConflict flag to UserService.updateEmail/updatePhone and threads it through to the request body.
Sniffed out 1 issue:

• 2 🟠 HIGH: breaking public API change (no overload preserving old signature)

See inline comments for details. Woof!

---

Declared coverage: FULL — 3/3 changed files reviewed.

[shuni-bot]

🐕 Review complete — View session on Shuni Portal 🐾

[shuni-bot]

🐕 Shuni's Review

Follow-up on the failOnConflict PR: the author restored the 3-arg updateEmail/updatePhone overloads, delegating to the 4-arg versions with false as the default, which fixes both breaking-change findings from the last pass.
Sniffed out 0 issues.

Both prior threads are resolved — nothing new here. Good bones! Woof!

---

Declared coverage: FULL — 3/3 changed files reviewed.