From 2722029d38394f67b202a47c91e33705789260d5 Mon Sep 17 00:00:00 2001
From: Dmitriy Budnik <dmitriy.budnik@gmail.com>
Date: Tue, 25 Jun 2013 18:23:23 +0300
Subject: [PATCH] stylistic refactorings w/ less syntactic sugar
---
.../users/omniauth_callbacks_controller.rb | 37 ++++++-------------
app/controllers/users_controller.rb | 2 +-
2 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index c99eac4c6d6..01a6d3a926b 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -61,7 +61,7 @@ class Users::OmniauthCallbacksController < ApplicationController
}
if user_info
- if user_info.user.active
+ if user_info.user.active?
if Guardian.new(user_info.user).can_access_forum?
log_on_user(user_info.user)
@data[:authenticated] = true
@@ -92,7 +92,7 @@ class Users::OmniauthCallbacksController < ApplicationController
session[:authentication] = {
facebook: {
- facebook_user_id: fb_uid ,
+ facebook_user_id: fb_uid,
link: raw_info["link"],
username: raw_info["username"],
first_name: raw_info["first_name"],
@@ -116,12 +116,8 @@ class Users::OmniauthCallbacksController < ApplicationController
}
if user_info
- user = user_info.user
- if user
- unless user.active
- user.active = true
- user.save
- end
+ if user = user_info.user
+ user.toggle(:active).save unless user.active?
# If we have to approve users
if Guardian.new(user).can_access_forum?
@@ -132,13 +128,9 @@ class Users::OmniauthCallbacksController < ApplicationController
end
end
else
- user = User.where(email: email).first
- if user
- FacebookUserInfo.create!(session[:authentication][:facebook].merge(user_id: user.id))
- unless user.active
- user.active = true
- user.save
- end
+ if user = User.where(email: email).first
+ user.create_facebook_user_info! session[:authentication][:facebook]
+ user.toggle(:active).save unless user.active?
log_on_user(user)
@data[:authenticated] = true
end
@@ -173,12 +165,8 @@ class Users::OmniauthCallbacksController < ApplicationController
}
if user_info
- user = user_info.user
- if user
- unless user.active
- user.active = true
- user.save
- end
+ if user = user_info.user
+ user.toggle(:active).save unless user.active?
log_on_user(user)
@data[:authenticated] = true
end
@@ -186,10 +174,7 @@ class Users::OmniauthCallbacksController < ApplicationController
user = User.where(email: email).first
if user
CasUserInfo.create!(session[:authentication][:cas].merge(user_id: user.id))
- unless user.active
- user.active = true
- user.save
- end
+ user.toggle(:active).save unless user.active?
log_on_user(user)
@data[:authenticated] = true
end
@@ -268,7 +253,7 @@ class Users::OmniauthCallbacksController < ApplicationController
}
if user_info
- if user_info.user.active
+ if user_info.user.active?
if Guardian.new(user_info.user).can_access_forum?
log_on_user(user_info.user)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8dc2bb7ba4a..a763e688e67 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -306,7 +306,7 @@ class UsersController < ApplicationController
@user = fetch_user_from_params
@email_token = @user.email_tokens.unconfirmed.active.first
if @user
- @email_token = @user.email_tokens.create(email: @user.email) if @email_token.nil?
+ @email_token ||= @user.email_tokens.create(email: @user.email)
Jobs.enqueue(:user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
end
render nothing: true