Merge pull request #638 from tiagojsag/fix-yields-from-controller-act…

…ions Fix yields from controller actions
lynndylanhurley · May 17, 2016 · 1d6dbdc · 1d6dbdc
2 parents 69efdc7 + 2d9e02b
commit 1d6dbdc
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/app/controllers/devise_token_auth/confirmations_controller.rb b/app/controllers/devise_token_auth/confirmations_controller.rb
@@ -17,7 +17,7 @@ def show
 
         @resource.save!
 
-        yield if block_given?
+        yield @resource if block_given?
 
         redirect_to(@resource.build_auth_url(params[:redirect_url], {
           token:                        token,

diff --git a/app/controllers/devise_token_auth/omniauth_callbacks_controller.rb b/app/controllers/devise_token_auth/omniauth_callbacks_controller.rb
@@ -38,7 +38,7 @@ def omniauth_success
 
       @resource.save!
 
-      yield if block_given?
+      yield @resource if block_given?
 
       render_data_or_redirect('deliverCredentials', @auth_params.as_json, @resource.as_json)
     end

diff --git a/app/controllers/devise_token_auth/passwords_controller.rb b/app/controllers/devise_token_auth/passwords_controller.rb
@@ -47,7 +47,7 @@ def create
       @error_status = 400
 
       if @resource
-        yield if block_given?
+        yield @resource if block_given?
         @resource.send_reset_password_instructions({
           email: @email,
           provider: 'email',
@@ -94,7 +94,7 @@ def edit
         @resource.allow_password_change = true;
 
         @resource.save!
-        yield if block_given?
+        yield @resource if block_given?
 
         redirect_to(@resource.build_auth_url(params[:redirect_url], {
           token:          token,
@@ -126,7 +126,7 @@ def update
       if @resource.send(resource_update_method, password_resource_params)
         @resource.allow_password_change = false
 
-        yield if block_given?
+        yield @resource if block_given?
         return render_update_success
       else
         return render_update_error

diff --git a/app/controllers/devise_token_auth/sessions_controller.rb b/app/controllers/devise_token_auth/sessions_controller.rb
@@ -42,7 +42,7 @@ def create
 
         sign_in(:user, @resource, store: false, bypass: false)
 
-        yield if block_given?
+        yield @resource if block_given?
 
         render_create_success
       elsif @resource and not (!@resource.respond_to?(:active_for_authentication?) or @resource.active_for_authentication?)
@@ -62,7 +62,7 @@ def destroy
         user.tokens.delete(client_id)
         user.save!
 
-        yield if block_given?
+        yield user if block_given?
 
         render_destroy_success
       else

diff --git a/app/controllers/devise_token_auth/token_validations_controller.rb b/app/controllers/devise_token_auth/token_validations_controller.rb
@@ -6,7 +6,7 @@ class TokenValidationsController < DeviseTokenAuth::ApplicationController
     def validate_token
       # @resource will have been set by set_user_token concern
       if @resource
-        yield if block_given?
+        yield @resource if block_given?
         render_validate_token_success
       else
         render_validate_token_error

diff --git a/test/dummy/app/controllers/custom/confirmations_controller.rb b/test/dummy/app/controllers/custom/confirmations_controller.rb
@@ -2,7 +2,7 @@ class Custom::ConfirmationsController < DeviseTokenAuth::ConfirmationsController
 
   def show
     super do |resource|
-      @show_block_called = true
+      @show_block_called = true unless resource.nil?
     end
   end
 

diff --git a/test/dummy/app/controllers/custom/omniauth_callbacks_controller.rb b/test/dummy/app/controllers/custom/omniauth_callbacks_controller.rb
@@ -2,7 +2,7 @@ class Custom::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCallbacksCo
 
   def omniauth_success
     super do |resource|
-      @omniauth_success_block_called = true
+      @omniauth_success_block_called = true unless resource.nil?
     end
   end
 

diff --git a/test/dummy/app/controllers/custom/passwords_controller.rb b/test/dummy/app/controllers/custom/passwords_controller.rb
@@ -2,19 +2,19 @@ class Custom::PasswordsController < DeviseTokenAuth::PasswordsController
 
   def create
     super do |resource|
-      @create_block_called = true
+      @create_block_called = true unless resource.nil?
     end
   end
 
   def edit
     super do |resource|
-      @edit_block_called = true
+      @edit_block_called = true unless resource.nil?
     end
   end
 
   def update
     super do |resource|
-      @update_block_called = true
+      @update_block_called = true unless resource.nil?
     end
   end
 

diff --git a/test/dummy/app/controllers/custom/registrations_controller.rb b/test/dummy/app/controllers/custom/registrations_controller.rb
@@ -8,13 +8,13 @@ def create
 
   def update
     super do |resource|
-      @update_block_called = true
+      @update_block_called = true unless resource.nil?
     end
   end
 
   def destroy
     super do |resource|
-      @destroy_block_called = true
+      @destroy_block_called = true unless resource.nil?
     end
   end
 

diff --git a/test/dummy/app/controllers/custom/sessions_controller.rb b/test/dummy/app/controllers/custom/sessions_controller.rb
@@ -2,13 +2,13 @@ class Custom::SessionsController < DeviseTokenAuth::SessionsController
 
   def create
     super do |resource|
-      @create_block_called = true
+      @create_block_called = true unless resource.nil?
     end
   end
 
   def destroy
     super do |resource|
-      @destroy_block_called = true
+      @destroy_block_called = true unless resource.nil?
     end
   end
 

diff --git a/test/dummy/app/controllers/custom/token_validations_controller.rb b/test/dummy/app/controllers/custom/token_validations_controller.rb
@@ -2,7 +2,7 @@ class Custom::TokenValidationsController < DeviseTokenAuth::TokenValidationsCont
 
   def validate_token
     super do |resource|
-      @validate_token_block_called = true
+      @validate_token_block_called = true unless resource.nil?
     end
   end