From a7e20dcae2fe522ed2fdfc253a4a7d94a0a9f9d6 Mon Sep 17 00:00:00 2001 From: jasder Date: Fri, 9 Jul 2021 17:53:14 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/accounts_controller.rb | 2 +- app/forms/users/sync_gitea_form.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 4b53ec62..07d5f7d3 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -8,8 +8,8 @@ class AccountsController < ApplicationController # 为了同步平台上未注册gitea的用户 def gitea_register - Users::SyncGiteaForm.new(sync_gitea_params).validate! user = User.find_by(login: sync_gitea_params[:login]) + Users::SyncGiteaForm.new(sync_gitea_params.merge(user: user)).validate! return render_error("该用户已同步协作平台") if user.gitea_token.present? && user.gitea_uid.present? result = create_gitea_user!(user, sync_gitea_params[:login], sync_gitea_params[:email], sync_gitea_params[:password]) diff --git a/app/forms/users/sync_gitea_form.rb b/app/forms/users/sync_gitea_form.rb index 19751bfd..f786b6c6 100644 --- a/app/forms/users/sync_gitea_form.rb +++ b/app/forms/users/sync_gitea_form.rb @@ -1,4 +1,4 @@ -class Users::SyncGiteaForm +class Users::SyncGiteaForm include ActiveModel::Model attr_accessor :login, :password, :email, :user @@ -8,7 +8,7 @@ class Users::SyncGiteaForm validate :check_user, :check_password def check_user - @user = User.find_by(login: login) + user = User.find_by(login: login) raise '用户不存在.' unless user.present? end