FIX code review
This commit is contained in:
parent
4f343c7967
commit
c5c6d38497
|
@ -205,8 +205,7 @@ class AccountsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
successful_authentication(@user)
|
successful_authentication(@user)
|
||||||
# TODO用户密码未同步
|
sync_pwd_to_gitea!(@user, {password: params[:password].to_s}) # TODO用户密码未同步
|
||||||
Gitea::User::UpdateInteractor.call(@user.login, {email: @user.mail, password: params[:password].to_s}) unless @user.is_sync_pwd?
|
|
||||||
|
|
||||||
# session[:user_id] = @user.id
|
# session[:user_id] = @user.id
|
||||||
end
|
end
|
||||||
|
|
|
@ -92,4 +92,18 @@ module LoginHelper
|
||||||
session[:ctime] = Time.now.utc.to_i
|
session[:ctime] = Time.now.utc.to_i
|
||||||
session[:atime] = Time.now.utc.to_i
|
session[:atime] = Time.now.utc.to_i
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def sync_pwd_to_gitea!(user, hash={})
|
||||||
|
return true if user.is_sync_pwd?
|
||||||
|
|
||||||
|
sync_params = { email: user.mail }
|
||||||
|
interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params.merge(hash))
|
||||||
|
if interactor.success?
|
||||||
|
Rails.logger.info "########_ login is #{user.login} sync_pwd_to_gitea success _########"
|
||||||
|
true
|
||||||
|
else
|
||||||
|
Rails.logger.info "########_ login is #{user.login} sync_pwd_to_gitea fail!: #{interactor.error}"
|
||||||
|
false
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -123,12 +123,8 @@ class UsersController < ApplicationController
|
||||||
def sync_gitea_pwd
|
def sync_gitea_pwd
|
||||||
return render_error("未找到相关的用户") if @user.blank?
|
return render_error("未找到相关的用户") if @user.blank?
|
||||||
|
|
||||||
sync_params = {
|
flag = sync_pwd_to_gitea!(@user, {password: params[:password].to_s})
|
||||||
email: @user.mail,
|
flag ? render_ok : render_error('同步失败!')
|
||||||
password: params[:password].to_s
|
|
||||||
}
|
|
||||||
interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
|
|
||||||
interactor.success? ? render_ok : render_error(interactor.error)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# TODO
|
# TODO
|
||||||
|
|
Loading…
Reference in New Issue