Kratos SoT 정합화

backend/internal/handler/user_handler.go

@@ -252,6 +252,18 @@ func (h *UserHandler) CreateUser(c *fiber.Ctx) error {
 		"grade":           role,
 	}
 
+	// [Resolve TenantID before Kratos creation]
+	var tenantID string
+	if req.CompanyCode != "" && h.TenantService != nil {
+		if tenant, err := h.TenantService.GetTenantBySlug(c.Context(), req.CompanyCode); err == nil && tenant != nil {
+			tenantID = tenant.ID
+		}
+	}
+	attributes["role"] = role
+	if tenantID != "" {
+		attributes["tenant_id"] = tenantID
+	}
+
 	// Merge custom metadata into attributes
 	for k, v := range req.Metadata {
 		// Don't overwrite core fields
@@ -288,11 +300,8 @@ func (h *UserHandler) CreateUser(c *fiber.Ctx) error {
 		Status:          "active",
 		Metadata:        req.Metadata,
 	}
-
-	if req.CompanyCode != "" && h.TenantService != nil {
-		if tenant, err := h.TenantService.GetTenantBySlug(c.Context(), req.CompanyCode); err == nil && tenant != nil {
-			localUser.TenantID = &tenant.ID
-		}
+	if tenantID != "" {
+		localUser.TenantID = &tenantID
 	}
 
 	if h.UserRepo != nil {
@@ -392,7 +401,14 @@ func (h *UserHandler) UpdateUser(c *fiber.Ctx) error {
 		traits["phone_number"] = normalizePhoneNumber(strings.TrimSpace(*req.Phone))
 	}
 	if req.CompanyCode != nil {
-		traits["companyCode"] = strings.TrimSpace(*req.CompanyCode)
+		code := strings.TrimSpace(*req.CompanyCode)
+		traits["companyCode"] = code
+		// Resolve TenantID for Kratos Trait
+		if h.TenantService != nil && code != "" {
+			if tenant, err := h.TenantService.GetTenantBySlug(c.Context(), code); err == nil && tenant != nil {
+				traits["tenant_id"] = tenant.ID
+			}
+		}
 	}
 	if req.Department != nil {
 		traits["department"] = strings.TrimSpace(*req.Department)
@@ -403,13 +419,14 @@ func (h *UserHandler) UpdateUser(c *fiber.Ctx) error {
 			role = "user"
 		}
 		traits["grade"] = role
+		traits["role"] = role
 	}
 
 	// [Refined] Metadata synchronization: replace non-core traits with new Metadata
 	coreTraits := map[string]bool{
 		"email": true, "name": true, "phone_number": true,
 		"grade": true, "companyCode": true, "department": true,
-		"affiliationType": true,
+		"affiliationType": true, "role": true, "tenant_id": true,
 	}
 
 	// 1. Remove existing non-core traits to handle deletions