From ded1e1f5c47bf642577d313cd1a53a7f118acc54 Mon Sep 17 00:00:00 2001 From: chan Date: Wed, 1 Apr 2026 13:45:56 +0900 Subject: [PATCH] fix(backend): fix merge conflict artifact and undefined explicitLoginID in UserHandler --- backend/internal/handler/user_handler.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/internal/handler/user_handler.go b/backend/internal/handler/user_handler.go index 25755f2c..6ed76d90 100644 --- a/backend/internal/handler/user_handler.go +++ b/backend/internal/handler/user_handler.go @@ -1250,10 +1250,15 @@ func (h *UserHandler) UpdateUser(c *fiber.Ctx) error { finalLoginID := extractTraitString(traits, "id") userEmail := extractTraitString(traits, "email") 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()) } - 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)