From ae8b9ec828f0f488ed8da80e1faed1e592d5dae8 Mon Sep 17 00:00:00 2001 From: Dave Parfitt Date: Wed, 4 Nov 2015 13:51:04 -0500 Subject: [PATCH] nil username breaks Analytics login --- src/oc-id/app/models/user.rb | 2 +- src/oc-id/spec/models/user_spec.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/oc-id/app/models/user.rb b/src/oc-id/app/models/user.rb index abb67c4dc1..82f6e66320 100644 --- a/src/oc-id/app/models/user.rb +++ b/src/oc-id/app/models/user.rb @@ -126,7 +126,7 @@ def admin?(username) def find(username) begin - if (username.include?('@')) + if (username != nil && username.include?('@')) users = self.new.chef.get( "users?#{{ email: username }.to_query}" ) diff --git a/src/oc-id/spec/models/user_spec.rb b/src/oc-id/spec/models/user_spec.rb index a7d59f7d3e..abb47bdbbd 100644 --- a/src/oc-id/spec/models/user_spec.rb +++ b/src/oc-id/spec/models/user_spec.rb @@ -60,6 +60,10 @@ expect(User.find(jimmy.email)).to eql(jimmy) end + it 'doesnt blow up when user is nil' do + expect(User.find(nil)).to be_nil + end + describe 'updating a password' do fields = [:current_password, :new_password, :password_confirmation] fields.each do |f|