Browse Source

FIX 解决用户同步问题

pull/141/head
jasder 5 years ago
parent
commit
a7e20dcae2
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      app/controllers/accounts_controller.rb
  2. +2
    -2
      app/forms/users/sync_gitea_form.rb

+ 1
- 1
app/controllers/accounts_controller.rb View File

@@ -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])


+ 2
- 2
app/forms/users/sync_gitea_form.rb View File

@@ -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



Loading…
Cancel
Save