Optimize avatar validation logic

user/component/user.go

@@ -308,6 +308,13 @@ func (c *userComponentImpl) UpdateByUUID(ctx context.Context, req *types.UpdateU
 		return errorx.ErrUserNotFound
 	}
 	var oldUser = *user
+
+	if req.Avatar != nil && *req.Avatar != "" && *req.Avatar != user.Avatar {
+		if err := common.ValidateImageURL(*req.Avatar); err != nil {
+			return errorx.ReqParamInvalid(err, errorx.Ctx().Set("param", "avatar"))
+		}
+	}
+
 	opUserName := req.OpUser
 	var opUser database.User
 	if user.Username != opUserName {

user/component/user_test.go

@@ -479,6 +479,7 @@ func TestUserComponent_UpdateByUUID_NoSyncWhenOnlyOtherFieldsChanged(t *testing.
 		Username:    "user1",
 		Email:       "user1@example.com",
 		RegProvider: "casdoor",
+		Avatar:      "https://example.com/avatar.jpg",
 	}
 	mockUserStore.EXPECT().FindByUUID(mock.Anything, "user1").Return(user, nil)
 	mockUserStore.EXPECT().Update(mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -591,6 +592,7 @@ func TestUserComponent_UpdateByUUID_NoRollbackWhenNoSync(t *testing.T) {
 		Username:    "user1",
 		Email:       "user1@example.com",
 		RegProvider: "casdoor",
+		Avatar:      "https://example.com/avatar.jpg",
 	}
 	mockUserStore.EXPECT().FindByUUID(mock.Anything, "user1").Return(user, nil)
 	mockUserStore.EXPECT().Update(mock.Anything, mock.Anything, mock.Anything).Return(errors.New("database error"))

user/handler/user.go

@@ -143,14 +143,6 @@ func (h *UserHandler) Update(ctx *gin.Context) {
 		return
 	}
 
-	if req.Avatar != nil && *req.Avatar != "" {
-		if err := common.ValidateImageURL(*req.Avatar); err != nil {
-			slog.ErrorContext(ctx.Request.Context(), "invalid avatar url", slog.Any("error", err))
-			httpbase.BadRequestWithExt(ctx, errorx.ReqParamInvalid(err, errorx.Ctx().Set("param", "avatar")))
-			return
-		}
-	}
-
 	id := ctx.Param("id")
 	req.UUID = &id
 	req.OpUser = currentUser
@@ -165,6 +157,10 @@ func (h *UserHandler) Update(ctx *gin.Context) {
 			httpbase.NotFoundError(ctx, err)
 			return
 		}
+		if errors.Is(err, errorx.ErrReqParamInvalid) {
+			httpbase.BadRequestWithExt(ctx, err)
+			return
+		}
 		httpbase.ServerError(ctx, err)
 		return
 	}