calib-rails 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a169448262ad90005944b50c2a715536f06f14ce4c3f7c9410b8c626cb06153d
-  data.tar.gz: 0a8a6d38c66d06ba4aa7cad08688627e912ee52913cfc5fe1f4654013726583e
+  metadata.gz: 96047a475a532a0f692f9ee1fbbde4989e6d563ae91706c054defd7cfdd21a32
+  data.tar.gz: fc81798aa5b2a5b8ff45f2b187ae5f3e63e41e79917260fbb28c993095b65b08
 SHA512:
-  metadata.gz: 9aedee16b3782063afeb706fea29e76be213b916997b2b0ad8867f185aac994f5fb08fc1594711a2d5510c4ff7876732e6fa0df5ce6a8706d4412a69612f1da0
-  data.tar.gz: 681cf919772a6c90f154d6d539c8bb9dbebc1959d0e8a9c151e394b431fa0fcc34e9a5db07325be22f13aafdb98fd888f520feaeba2dcf0f3599044c4090e980
+  metadata.gz: 39ff9a79b7f682c4c7351016c490ed98b691f7b81f8a137baa84e9038e0d4b25f4b6be056896da1a126024edf3a0629c2138d8c63ee5bc622f7514759004f0b1
+  data.tar.gz: a88fa475189412f5d24ec13b6aa3a618d12340889cacbcb8406bc1399ea4e84bf7475c66bed59262b5e6799e09961c0e909a71a5aa7d8d02be919c49bdbb8912

data/lib/calib/devise/friendly_forwardable.rb

@@ -3,25 +3,30 @@ module Calib::Devise::FriendlyForwardable
 
   included do
     # @see https://github.com/plataformatec/devise/wiki/How-To:-Redirect-back-to-current-page-after-sign-in,-sign-out,-sign-up,-update
-    before_action :store_access_location!, if: :storable_location?
+    before_action :store_location!, if: :storable_location?
   end
 
   private
 
+  def after_sign_in_path_for(resource)
+    friendly_forwarding_path(resource)
+  end
+
   # path with stored_location or root
-  def smart_path(r = devise_key_for_store_location)
-    stored_location_for(r) || root_path
+  # @see https://github.com/plataformatec/devise/wiki/How-To:-redirect-to-a-specific-page-on-successful-sign-in
+  def friendly_forwarding_path(r = devise_key_for_store_location)
+    request.env['omniauth.origin'] || stored_location_for(r) || signed_in_root_path(r)
   end
 
   def storable_location?
     request.get? &&
       is_navigational_format? &&
       !devise_controller? &&
-      request.fullpath != root_path && # for return on creating new account
+      request.fullpath != signed_in_root_path(devise_key_for_store_location) && # for return on creating new account
       !request.xhr?
   end
 
-  def store_access_location!
+  def store_location!
     Rails.logger.debug("store_#{devise_key_for_store_location}_location!: #{request.fullpath}")
     store_location_for(devise_key_for_store_location, request.fullpath)
   end

data/lib/calib/rails/version.rb

@@ -1,5 +1,5 @@
 module Calib
   module Rails
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calib-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - ms2sato