fixed 第三方授权登录(github,gitee,qq,wechat)

This commit is contained in:
2022-12-01 17:22:22 +08:00
parent 9b39446dfb
commit 763d7b499e
11 changed files with 172 additions and 22 deletions

View File

@@ -11,7 +11,7 @@ module LoginHelper
def set_autologin_cookie(user)
token = Token.get_or_create_permanent_login_token(user, "autologin")
sync_user_token_to_trustie(user.login, token.value)
# sync_user_token_to_trustie(user.login, token.value)
Rails.logger.info "###### def set_autologin_cookie and get_or_create_permanent_login_token result: #{token&.value}"
cookie_options = {

View File

@@ -1,14 +1,17 @@
module RegisterHelper
extend ActiveSupport::Concern
def autologin_register(username, email, password, platform= 'forge')
def autologin_register(username, email, password, platform = 'forge', phone = nil, nickname =nil)
result = {message: nil, user: nil}
email = email.blank? ? "#{username}@example.org" : email
user = User.new(admin: false, login: username, mail: email, type: "User")
user.password = password
user.platform = platform
user.phone = phone if phone.present?
user.nickname = nickname if nickname.present?
user.activate
return unless user.valid?
interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
@@ -36,7 +39,7 @@ module RegisterHelper
user.password = params[:password]
user.mail = params[:email]
if user.save!
if user.save!
sync_params = {
password: params[:password].to_s,
email: params[:email],
@@ -44,9 +47,9 @@ module RegisterHelper
new_name: params[:username],
source_id: 0
}
interactor = Gitea::User::UpdateInteractor.call(before_login, sync_params)
if interactor.success?
if interactor.success?
result[:user] = user
else
result[:message] = '用户同步Gitea失败!'