Merge remote-tracking branch 'origin/main'

backend/internal/handler/auth_handler.go

@@ -2338,6 +2338,7 @@ func (h *AuthHandler) GetMe(c *fiber.Ctx) error {
 					Department:      dept,
 					AffiliationType: affType,
 					CompanyCode:     compCode,
+					Metadata:        userResponse.CustomAttributes,
 				}
 
 				if compCode != "" {
@@ -4132,7 +4133,20 @@ func (h *AuthHandler) getKratosProfile(sessionToken string) (*domain.UserProfile
 		Department:      dept,
 		AffiliationType: affType,
 		CompanyCode:     compCode,
+		Metadata:        make(map[string]any),
 	}
+
+	coreTraits := map[string]bool{
+		"email": true, "name": true, "phone_number": true,
+		"grade": true, "companyCode": true, "department": true,
+		"affiliationType": true,
+	}
+	for k, v := range traits {
+		if !coreTraits[k] {
+			profile.Metadata[k] = v
+		}
+	}
+
 	return profile, nil
 }
 
@@ -4157,7 +4171,20 @@ func (h *AuthHandler) getKratosProfileWithCookie(cookie string) (*domain.UserPro
 		Department:      dept,
 		AffiliationType: affType,
 		CompanyCode:     compCode,
+		Metadata:        make(map[string]any),
 	}
+
+	coreTraits := map[string]bool{
+		"email": true, "name": true, "phone_number": true,
+		"grade": true, "companyCode": true, "department": true,
+		"affiliationType": true,
+	}
+	for k, v := range traits {
+		if !coreTraits[k] {
+			profile.Metadata[k] = v
+		}
+	}
+
 	return profile, nil
 }