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

Merge pull request '新增授权木兰邮箱地址判定' (#170) from gua2048/forgeplus:mulanoss_server into mulanoss_server

This commit is contained in:
jasder 2021-09-30 10:13:05 +08:00
parent ab9bdfd109 8c2f0e9fdb
commit 7812996894
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ class Oauth::MulanossController < Oauth::BaseController
begin
code = params['code'].to_s.strip
tip_exception("code不能为空") if code.blank?
new_user = false
result = MulanossOauth::Service.access_token(code)
result = MulanossOauth::Service.user_info(result[:access_token])
@ -17,9 +16,9 @@ class Oauth::MulanossController < Oauth::BaseController
successful_authentication(open_user.user)
else
if current_user.blank? || !current_user.logged?
new_user = true
login = User.generate_login('ML')
reg_result = autologin_register(login, "#{login}@forge.com" , "M#{login}2021#", 'mulan', true)
mail = result["email"].to_s.match(CustomRegexp::EMAIL).present? ? result["email"].to_s : "#{login}@mulan.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)
successful_authentication(open_user.user)
else