app/controllers/contour/authentications_controller.rb in contour-0.5.3 vs app/controllers/contour/authentications_controller.rb in contour-0.5.4

- old
+ new

@@ -21,16 +21,19 @@ omniauth['uid'] = omniauth['user_info']['email'] if omniauth['provider'] == 'google_apps' and omniauth['user_info'] authentication = Authentication.find_by_provider_and_uid(omniauth['provider'], omniauth['uid']) logger.info "OMNI AUTH INFO: #{omniauth.inspect}" omniauth['user_info']['email'] = omniauth['extra']['user_hash']['email'] if omniauth['user_info'] and omniauth['user_info']['email'].blank? and omniauth['extra'] and omniauth['extra']['user_hash'] if authentication + logger.info "Existing authentication found." session["user_return_to"] = request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] if request.env and request.env["action_dispatch.request.unsigned_session_cookie"] and request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] and session["user_return_to"].blank? flash[:notice] = "Signed in successfully." if authentication.user.active_for_authentication? sign_in_and_redirect(:user, authentication.user) elsif current_user + logger.info "Logged in user found, creating associated authentication." current_user.authentications.create!(:provider => omniauth['provider'], :uid => omniauth['uid']) redirect_to authentications_path, :notice => "Authentication successful." else + logger.info "Creating new user with new authentication." user = User.new(params[:user]) user.apply_omniauth(omniauth) if user.save session["user_return_to"] = request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] if request.env and request.env["action_dispatch.request.unsigned_session_cookie"] and request.env["action_dispatch.request.unsigned_session_cookie"]["user_return_to"] and session["user_return_to"].blank? flash[:notice] = "Signed in successfully." if user.active_for_authentication? \ No newline at end of file