Merge pull request #125 from nicolas-besnard/ConfirmationOmniauth

Check if confirmable is active before skipping confirmation
lynndylanhurley · Jan 31, 2015 · b40c233 · b40c233
2 parents 9425497 + 9bc64e4
commit b40c233
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/controllers/devise_token_auth/omniauth_callbacks_controller.rb b/app/controllers/devise_token_auth/omniauth_callbacks_controller.rb
@@ -57,8 +57,10 @@ def omniauth_success
       extra_params = whitelisted_params
       @resource.assign_attributes(extra_params) if extra_params
 
-      # don't send confirmation email!!!
-      @resource.skip_confirmation!
+      if resource_class.devise_modules.include?(:confirmable)
+        # don't send confirmation email!!!
+        @resource.skip_confirmation!
+      end
 
       sign_in(:user, @resource, store: false, bypass: false)