Browse Source

Update remote register forr military platform

pull/278/head
Jasder 5 years ago
parent
commit
230b934de4
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      app/controllers/concerns/register_helper.rb

+ 5
- 2
app/controllers/concerns/register_helper.rb View File

@@ -3,8 +3,11 @@ module RegisterHelper

def autologin_register(username, email, password, platform= '')
result = {message: nil, user: nil}
email ||= "#{username@example.org}"

user = User.new(admin: false, login: username, mail: email, type: "User")
user = User.find_by(login: username)
user ||= User.new(admin: false, login: username, mail: email, type: "User")
user.password = password
user.platform = platform
user.activate
@@ -16,7 +19,7 @@ module RegisterHelper
user.gitea_token = result['sha1']
user.gitea_uid = gitea_user['id']
if user.save!
UserExtension.create!(user_id: user.id)
UserExtension.create!(user_id: user.id) if user.user_extension.blank?
result[:user] = {id: user.id, token: user.gitea_token}
end
else


Loading…
Cancel
Save