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

新增木兰授权的邮箱地址判定

This commit is contained in:
chenjing 2021-09-30 08:58:19 +08:00
parent ab9bdfd109
commit b43ab281df
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/oauth/mulanoss_controller.rb
View File

@ -7,7 +7,6 @@ class Oauth::MulanossController < Oauth::BaseController
begin begin
code = params['code'].to_s.strip code = params['code'].to_s.strip
tip_exception("code不能为空") if code.blank? tip_exception("code不能为空") if code.blank?
new_user = false
result = MulanossOauth::Service.access_token(code) result = MulanossOauth::Service.access_token(code)
result = MulanossOauth::Service.user_info(result[:access_token]) result = MulanossOauth::Service.user_info(result[:access_token])
@ -17,9 +16,10 @@ class Oauth::MulanossController < Oauth::BaseController
successful_authentication(open_user.user) successful_authentication(open_user.user)
else else
if current_user.blank? || !current_user.logged? if current_user.blank? || !current_user.logged?
new_user = true
login = User.generate_login('ML') login = User.generate_login('ML')
reg_result = autologin_register(login, "#{login}@forge.com" , "M#{login}2021#", 'mulan', true) email_regexp = "^([a-z0-9A-Z]+[-|_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$"
mail = result["email"].to_s.match(email_regexp).present? ? result["email"].to_s : "#{login}@forge.com"
reg_result = autologin_register(login, mail , "M#{login}2021#", 'mulan', true)
open_user = OpenUsers::Mulan.create!(user_id: reg_result[:user][:id], uid: result['id'], extra: result) open_user = OpenUsers::Mulan.create!(user_id: reg_result[:user][:id], uid: result['id'], extra: result)
successful_authentication(open_user.user) successful_authentication(open_user.user)
else else