Don’t break if email is nil

hpi-swt2 · Aug 9, 2017 · 3837a31 · 3837a31
1 parent 400cd5a
commit 3837a31
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -2,7 +2,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   skip_before_action :verify_authenticity_token, only: :hpiopenid
 
   def hpiopenid
-    if request.env["omniauth.auth"].info.email.empty?
+    if request.env["omniauth.auth"].info.email.to_s.empty?
       return redirect_to user_session_path, :alert => I18n.t('users.openid.missing_email')
     end
     @user = User.from_omniauth(request.env["omniauth.auth"])

diff --git a/spec/features/user_hpiopenid_spec.rb b/spec/features/user_hpiopenid_spec.rb
@@ -43,14 +43,29 @@
     expect(page).to have_css(".alert-success")
   end
 
+  scenario 'Account creation fails due to empty email' do
+    OmniAuth.config.mock_auth[:hpiopenid] = OmniAuth::AuthHash.new({
+                                                                       :provider => @provider,
+                                                                       :uid => @uid,
+                                                                       :info => {
+                                                                           :email => ''
+                                                                       }
+                                                                   })
+    visit new_user_registration_path
+    click_link I18n.t('devise.shared.links.sign_in_with_provider', :provider => 'HPI OpenID')
+
+    expect(page).to have_css(".alert-danger")
+    expect(page).to have_text (I18n.t('users.openid.missing_email'))
+  end
+
   scenario 'Account creation fails due to missing email' do
     OmniAuth.config.mock_auth[:hpiopenid] = OmniAuth::AuthHash.new({
-                                                                     :provider => @provider,
-                                                                     :uid => @uid,
-                                                                     :info => {
-                                                                         :email => ''
-                                                                     }
-                                                                 })
+                                                                       :provider => @provider,
+                                                                       :uid => @uid,
+                                                                       :info => {
+                                                                           :email => nil
+                                                                       }
+                                                                   })
     visit new_user_registration_path
     click_link I18n.t('devise.shared.links.sign_in_with_provider', :provider => 'HPI OpenID')