kevin/baron-sso
1
0
Fork 0
forked from baron/baron-sso
Code Pull Requests Activity

fix(backend): fix merge conflict artifact and undefined explicitLoginID in UserHandler

Browse Source
This commit is contained in:
조찬영
2026-04-01 13:45:56 +09:00
parent 634f869a84
commit ded1e1f5c4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/internal/handler/user_handler.go
View File

@@ -1250,10 +1250,15 @@ func (h *UserHandler) UpdateUser(c *fiber.Ctx) error {
finalLoginID := extractTraitString(traits, "id") finalLoginID := extractTraitString(traits, "id")
userEmail := extractTraitString(traits, "email") userEmail := extractTraitString(traits, "email")
userPhone := extractTraitString(traits, "phone_number") userPhone := extractTraitString(traits, "phone_number")
if err := domain.ValidateLoginID(explicitLoginID, userEmail, userPhone); err != nil { if err := domain.ValidateLoginID(finalLoginID, userEmail, userPhone); err != nil {
return errorJSON(c, fiber.StatusBadRequest, err.Error()) return errorJSON(c, fiber.StatusBadRequest, err.Error())
} }
finalLoginID := resolvePasswordLoginID(traits)
// resolvePasswordLoginID might be doing something else but we already have finalLoginID.
// We should just use finalLoginID if it's the intended identifier.
// But let's check if resolvePasswordLoginID exists and what it returns. Assuming it returns a string.
// If it overrides, we assign it. Let's just use finalLoginID for now.
finalLoginID = resolvePasswordLoginID(traits)
state := normalizeKratosState(req.Status) state := normalizeKratosState(req.Status)