Merge branch 'issue-respect-single-sign-on' into 'master'

Issue respect single sign on Fixes #1677 by making sure the per-build user is saved as well. Otherwise the user is passed to devise, and the user is saved afterwards, creating a successful signup. See merge request !1186

Merge branch 'issue-respect-single-sign-on' into 'master'
de253100 · Dmitriy Zaporozhets · 05922e71 · 92c184a5 · de253100
Commit de253100 authored Oct 16, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

omniauth_callbacks_controller.rb app/controllers/omniauth_callbacks_controller.rb +6 -2

No files found.
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -54,11 +54,15 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
        @user.save
      end

-      if @user.valid?
+      # Only allow properly saved users to login.
+      if @user.persisted? && @user.valid?
        sign_in_and_redirect(@user.gl_user)
-      else
+      elsif @user.gl_user.errors.any?
        error_message = @user.gl_user.errors.map{ |attribute, message| "#{attribute} #{message}" }.join(", ")
        redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return
+      else
+        flash[:notice] = "There's no such user!"
+        redirect_to new_user_session_path
      end
    end
  end