floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed 修改用户参数错误

This commit is contained in:
xxqfamous 2023-05-30 12:32:41 +08:00
parent 5fa1709664
commit dbdd2f8968
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/accounts_controller.rb
View File

@ -8,7 +8,7 @@ class AccountsController < ApplicationController
simple_update_params.merge!(username: params[:username]&.gsub(/\s+/, "")) simple_update_params.merge!(username: params[:username]&.gsub(/\s+/, ""))
simple_update_params.merge!(email: params[:email]&.gsub(/\s+/, "")) simple_update_params.merge!(email: params[:email]&.gsub(/\s+/, ""))
simple_update_params.merge!(platform: (params[:platform] || 'forge')&.gsub(/\s+/, "")) simple_update_params.merge!(platform: (params[:platform] || 'forge')&.gsub(/\s+/, ""))
simple_update_params.merge!(user: current_user) simple_update_params.merge!(user_id: current_user.id)
Register::RemoteForm.new(simple_update_params).validate! Register::RemoteForm.new(simple_update_params).validate!
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
@ -28,7 +28,7 @@ class AccountsController < ApplicationController
# 其他平台同步注册的用户 # 其他平台同步注册的用户
def remote_register def remote_register
remote_register_params.merge!(user: nil) remote_register_params.merge!(user_id: nil)
Register::RemoteForm.new(remote_register_params).validate! Register::RemoteForm.new(remote_register_params).validate!
username = params[:username]&.gsub(/\s+/, "") username = params[:username]&.gsub(/\s+/, "")
tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username) tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username)
@ -180,7 +180,8 @@ class AccountsController < ApplicationController
render_result(-6, e.message) render_result(-6, e.message)
rescue Exception => e rescue Exception => e
Gitea::User::DeleteService.call(user.login) unless user.nil? Gitea::User::DeleteService.call(user.login) unless user.nil?
uid_logger_error(e.message) Rails.logger.error("##:register error--#{user.try(:id)}")
logger_error(e)
tip_exception(-1, e.message) tip_exception(-1, e.message)
end end
end end

5
app/forms/register/remote_form.rb
View File

@ -1,13 +1,14 @@
module Register module Register
class RemoteForm < Register::BaseForm class RemoteForm < Register::BaseForm
# login 登陆方式，支持邮箱、登陆、手机号等 # login 登陆方式，支持邮箱、登陆、手机号等
attr_accessor :username, :email, :password, :platform, :user attr_accessor :username, :email, :password, :platform, :user_id
validates :username, :email, :password, presence: true validates :username, :email, :password, presence: true
validate :check! validate :check!
def check! def check!
Rails.logger.info "Register::RemoteForm params: username: #{username}; email: #{email}; password: #{password}; platform: #{platform}" user = User.find_by(id: user_id)
Rails.logger.info "Register::RemoteForm params: id: #{user&.id}; username: #{username}; email: #{email}; password: #{password}; platform: #{platform}"
check_login(username, user) check_login(username, user)
check_mail(email,user) check_mail(email,user)
check_password(password) check_password(password)

2
app/services/admins/import_user_from_excel_service.rb
View File

@ -45,7 +45,7 @@ class Admins::ImportUserFromExcelService < ApplicationService
password = data.password password = data.password
nickname = data.nickname&.gsub(/\s+/, "") nickname = data.nickname&.gsub(/\s+/, "")
raise Error, "无法使用以下关键词：#{username}，请重新命名" if ReversedKeyword.check_exists?(data.login) raise Error, "无法使用以下关键词：#{username}，请重新命名" if ReversedKeyword.check_exists?(data.login)
Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge', user: nil}).validate! Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge', user_id: nil}).validate!
user = User.new(admin: false, login: username, mail: email, nickname: nickname, platform: 'forge' , type: "User") user = User.new(admin: false, login: username, mail: email, nickname: nickname, platform: 'forge' , type: "User")
user.password = password user.password = password
user.activate user.activate