Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-09 12:21:04 +08:00
Code Packages Activity Actions 1

Refactored user_name suggestion methods into a module to reduce the complexity of User model

Browse source
This commit is contained in:
Juan de Dios Herrero 2013-06-06 16:40:10 +02:00
parent a3d62fdf69
commit 96d23ddd8d
6 changed files with 216 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/users/omniauth_callbacks_controller.rb
View file

@ -1,6 +1,7 @@
# -*- encoding : utf-8 -*-
require_dependency 'email'
require_dependency 'enum'
require_dependency 'user_name_suggester'
class Users::OmniauthCallbacksController < ApplicationController
skip_before_filter :redirect_to_login_if_required
@ -87,7 +88,7 @@ class Users::OmniauthCallbacksController < ApplicationController
fb_uid = auth_token["uid"]
username = User.suggest_username(name)
username = UserNameSuggester.suggest(name)
session[:authentication] = {
facebook: {
@ -232,7 +233,7 @@ class Users::OmniauthCallbacksController < ApplicationController
@data = {
email: email,
name: User.suggest_name(name),
username: User.suggest_username(username),
username: UserNameSuggester.suggest(username),
email_valid: true ,
auth_provider: data[:provider] || params[:provider].try(:capitalize)
}
@ -306,7 +307,7 @@ class Users::OmniauthCallbacksController < ApplicationController
email: email,
email_valid: true,
name: User.suggest_name(email),
username: User.suggest_username(email),
username: UserNameSuggester.suggest(email),
auth_provider: params[:provider].try(:capitalize)
}