Skip to content

Use 1.9 hash syntax in omniauth callbacks controller to stay consistent with the rest of the app #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Intrepidd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use 1.9 hash syntax in omniauth callbacks controller to stay consistent with the rest of the app #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/controllers/users/omniauth_callbacks_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.')
Expand All @@ -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