From 6dd456e5d51fe24661a927f2216627a2ea500709 Mon Sep 17 00:00:00 2001 From: Adrien Siami Date: Wed, 14 May 2014 10:30:38 +0200 Subject: [PATCH] Use 1.9 hash syntax in omniauth callbacks controller to stay consistent with the rest of the app --- .../users/omniauth_callbacks_controller.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index e96482be..aed1a6c7 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -2,17 +2,17 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController def github # render text: "#{request.env["omniauth.auth"].to_json}" info = request.env["omniauth.auth"]["info"] - @user = User.find_by :nickname => info["nickname"] + @user = User.find_by(nickname: info["nickname"]) if @user.nil? and info["verified_emails"].any? - @user = User.find_by :email => info["verified_emails"] + @user = User.find_by(email: info["verified_emails"]) end unless @user if info['primary_email'] generated_password = Devise.friendly_token.first(8) @user = User.create!( - :email => info['primary_email'], - :password => generated_password, - :nickname => info['nickname'] + email: info['primary_email'], + password: generated_password, + nickname: info['nickname'] ) else set_flash_message(:error, :failure, kind: 'GitHub', reason: 'your primary email address should be verified.') @@ -23,8 +23,8 @@ def github @user.name = info['name'] @user.image = info['image'] @user.save - - sign_in_and_redirect @user, :event => :authentication - set_flash_message(:notice, :success, :kind => "GitHub") if is_navigational_format? + + sign_in_and_redirect @user, event: :authentication + set_flash_message(:notice, :success, kind: "GitHub") if is_navigational_format? end end