FIX gitea user register service
This commit is contained in:
parent
0476246585
commit
8f846ae29b
|
@ -152,7 +152,7 @@ class AccountsController < ApplicationController
|
||||||
gitea_user = interactor.result
|
gitea_user = interactor.result
|
||||||
result = Gitea::User::GenerateTokenService.new(login, params[:password]).call
|
result = Gitea::User::GenerateTokenService.new(login, params[:password]).call
|
||||||
@user.gitea_token = result['sha1']
|
@user.gitea_token = result['sha1']
|
||||||
@user.gitea_uid = gitea_user['id']
|
@user.gitea_uid = gitea_user[:body]['id']
|
||||||
if @user.save!
|
if @user.save!
|
||||||
UserExtension.create!(user_id: @user.id)
|
UserExtension.create!(user_id: @user.id)
|
||||||
successful_authentication(@user)
|
successful_authentication(@user)
|
||||||
|
|
|
@ -14,7 +14,7 @@ module RegisterHelper
|
||||||
gitea_user = interactor.result
|
gitea_user = interactor.result
|
||||||
result = Gitea::User::GenerateTokenService.call(username, password)
|
result = Gitea::User::GenerateTokenService.call(username, password)
|
||||||
user.gitea_token = result['sha1']
|
user.gitea_token = result['sha1']
|
||||||
user.gitea_uid = gitea_user['id']
|
user.gitea_uid = gitea_user[:body]['id']
|
||||||
if user.save!
|
if user.save!
|
||||||
UserExtension.create!(user_id: user.id)
|
UserExtension.create!(user_id: user.id)
|
||||||
result[:user] = {id: user.id, token: user.gitea_token}
|
result[:user] = {id: user.id, token: user.gitea_token}
|
||||||
|
|
|
@ -8,7 +8,10 @@ class Gitea::User::RegisterService < Gitea::ClientService
|
||||||
|
|
||||||
def call
|
def call
|
||||||
params = Hash.new.merge(data: user_params, token: @token)
|
params = Hash.new.merge(data: user_params, token: @token)
|
||||||
post(API_REST, params)
|
|
||||||
|
response = post(API_REST, params)
|
||||||
|
status, message, body = render_response(response)
|
||||||
|
json_format(status, message, body)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
@ -24,4 +27,12 @@ class Gitea::User::RegisterService < Gitea::ClientService
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def json_format(status, message, body)
|
||||||
|
case status
|
||||||
|
when 201 then success(body)
|
||||||
|
else
|
||||||
|
error(message, status)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue