Browse Source

FIX gitea user register service

tags/v3.0.0
Jasder 5 years ago
parent
commit
8f846ae29b
3 changed files with 14 additions and 3 deletions
  1. +1
    -1
      app/controllers/accounts_controller.rb
  2. +1
    -1
      app/controllers/concerns/register_helper.rb
  3. +12
    -1
      app/services/gitea/user/register_service.rb

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

@@ -152,7 +152,7 @@ class AccountsController < ApplicationController
gitea_user = interactor.result
result = Gitea::User::GenerateTokenService.new(login, params[:password]).call
@user.gitea_token = result['sha1']
@user.gitea_uid = gitea_user['id']
@user.gitea_uid = gitea_user[:body]['id']
if @user.save!
UserExtension.create!(user_id: @user.id)
successful_authentication(@user)


+ 1
- 1
app/controllers/concerns/register_helper.rb View File

@@ -14,7 +14,7 @@ module RegisterHelper
gitea_user = interactor.result
result = Gitea::User::GenerateTokenService.call(username, password)
user.gitea_token = result['sha1']
user.gitea_uid = gitea_user['id']
user.gitea_uid = gitea_user[:body]['id']
if user.save!
UserExtension.create!(user_id: user.id)
result[:user] = {id: user.id, token: user.gitea_token}


+ 12
- 1
app/services/gitea/user/register_service.rb View File

@@ -8,7 +8,10 @@ class Gitea::User::RegisterService < Gitea::ClientService

def call
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

private
@@ -24,4 +27,12 @@ class Gitea::User::RegisterService < Gitea::ClientService
}
end

def json_format(status, message, body)
case status
when 201 then success(body)
else
error(message, status)
end
end

end

Loading…
Cancel
Save