github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix broken Yahoo! signup.

Browse Source
This commit is contained in:
Robin Ward
2013-02-13 12:36:59 -05:00
parent f850fe1e75
commit f00006ee7d
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/users/omniauth_callbacks_controller.rb
View File

@ -124,6 +124,10 @@ class Users::OmniauthCallbacksController < ApplicationController
email = data[:email]
# If the auth supplies a name / username, use those. Otherwise start with email.
name = data[:name] || data[:email]
username = data[:nickname] || data[:email]
user_open_id = UserOpenId.find_by_url(identity_url)
if user_open_id.blank? && user = User.find_by_email(email)
@ -147,8 +151,8 @@ class Users::OmniauthCallbacksController < ApplicationController
else
@data = {
email: email,
name: User.suggest_name(email),
username: User.suggest_username(email),
name: User.suggest_name(name),
username: User.suggest_username(username),
email_valid: true ,
auth_provider: data[:provider]
}