cla fix and add token verify

This commit is contained in:
chenjing
2023-06-20 15:27:03 +08:00
parent d35bbcf6fb
commit 65816a980b
9 changed files with 123 additions and 10 deletions

View File

@@ -4,9 +4,9 @@ class ProjectsController < ApplicationController
include ProjectsHelper
include Acceleratorable
before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend banner_recommend about menu_list]
before_action :require_profile_completed, only: [:create, :migrate]
before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_recommend]
before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend banner_recommend about menu_list verify_auth_token]
before_action :require_profile_completed, only: [:create, :migrate,:verify_auth_token]
before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_recommend verify_auth_token]
before_action :authorizate_user_can_edit_project!, only: %i[update]
before_action :project_public?, only: %i[fork_users praise_users watch_users]
before_action :request_limit, only: %i[index]
@@ -63,6 +63,15 @@ class ProjectsController < ApplicationController
tip_exception(e.message)
end
def verify_auth_token
data = Projects::VerifyAuthTokenService.call(params[:clone_addr], params[:auth_token])
if data
render_ok
else
render_error('token验证不通过')
end
end
def migrate
Projects::MigrateForm.new(mirror_params).validate!

View File

@@ -11,14 +11,16 @@ class Users::ClasController < Users::BaseController
def create
@user_cla = current_user.user_clas.find_by(cla_id: params[:cla_id])
if @user_cla
@user_cla.update_attributes(state: 1)
else
if @user_cla.nil?
ActiveRecord::Base.transaction do
Users::UserClaForm.new(user_cla_params).validate!
@user_cla = UserCla.build(user_cla_params, current_user.id)
end
elsif @user_cla.state == "failed"
@user_cla.update_by_params(user_cla_params)
elsif @user_cla.state == "signed"
return render_error('协议生效中,请勿重复签署')
end
render_ok
rescue Exception => e