yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update remote register forr military platform

This commit is contained in:
Jasder 2020-08-18 17:33:12 +08:00
parent 2bd15d9746
commit 230b934de4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/concerns/register_helper.rb
View File

@ -3,8 +3,11 @@ module RegisterHelper
def autologin_register(username, email, password, platform= '') def autologin_register(username, email, password, platform= '')
result = {message: nil, user: nil} 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.password = password
user.platform = platform user.platform = platform
user.activate user.activate
@ -16,7 +19,7 @@ module RegisterHelper
user.gitea_token = result['sha1'] user.gitea_token = result['sha1']
user.gitea_uid = gitea_user['id'] user.gitea_uid = gitea_user['id']
if user.save! 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} result[:user] = {id: user.id, token: user.gitea_token}
end end
else else