omniauth-twitter 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52c9f56011876c1784202d2593fdee0700f4af01
-  data.tar.gz: 2f7447de538407c61676c8f43a80d009da16ed6f
+  metadata.gz: dc9119404c4a402c342aec3bfa812d34a8183b9f
+  data.tar.gz: '084e1b33e9441f66fb13d397f3887f9deafea987'
 SHA512:
-  metadata.gz: 8e63d38edb9d7f6c23ce7399caf95a98fd69c83bf1b893fd6d1dd9a46e2c3cd0f6bb6123cddaa093f3a9e64f32d03ad5a721be676dada2f36a01296a33fe973a
-  data.tar.gz: 00b73ca435f092abaa9c15ef6d9a22dbadbd20b55e34c17286b76b85d9aec6f39a63c63c707a9174ab7d54177986ae127a3ef6021ac8f6fc0e9de478a66c403a
+  metadata.gz: d1b25d26296524e0a65ae5fe48e9fdc3c6595ff7bedfca31c0d10fcdecb0e059a9210649816b92ac037b2bc0eedfd92e22404c0f021c2f98b46d59db769065eb
+  data.tar.gz: b09fe1f1a3b7c20cf7705335fbba740da4c022399434b6992b02b77db9e33bae1477a8aa9576cb4b045d633c74cb3d5e42b442312a2c722476d24b24f5fe2fa8

data/lib/omniauth-twitter/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Twitter
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

data/lib/omniauth/strategies/twitter.rb

@@ -61,6 +61,26 @@ module OmniAuth
         old_request_phase
       end
 
+      alias :old_callback_url :callback_url
+
+      def callback_url
+        if request.params['callback_url']
+          request.params['callback_url']
+        else
+          old_callback_url
+        end
+      end
+
+      def callback_path
+        params = session['omniauth.params']
+
+        if params.nil? || params['callback_url'].nil?
+          super
+        else
+          URI(params['callback_url']).path
+        end
+      end
+
       private
 
       def image_url

data/spec/omniauth/strategies/twitter_spec.rb

@@ -130,6 +130,48 @@ describe OmniAuth::Strategies::Twitter do
       end
     end
 
+    context 'with a specified callback_url in the params' do
+      before do
+        params = { 'callback_url' => 'http://foo.dev/auth/twitter/foobar' }
+        allow(subject).to receive(:request) do
+          double('Request', :params => params)
+        end
+        allow(subject).to receive(:session) do
+          double('Session', :[] => { 'callback_url' => params['callback_url'] })
+        end
+        allow(subject).to receive(:old_request_phase) { :whatever }
+      end
+
+      it 'should use the callback_url' do
+        expect(subject.callback_url).to eq 'http://foo.dev/auth/twitter/foobar'
+      end
+
+      it 'should return the correct callback_path' do
+        expect(subject.callback_path).to eq '/auth/twitter/foobar'
+      end
+    end
+
+    context 'with no callback_url set' do
+      before do
+        allow(subject).to receive(:request) do
+          double('Request', :params => {})
+        end
+        allow(subject).to receive(:session) do
+          double('Session', :[] => {})
+        end
+        allow(subject).to receive(:old_request_phase) { :whatever }
+        allow(subject).to receive(:old_callback_url).and_return(:old_callback)
+      end
+
+      it 'callback_url should return nil' do
+        expect(subject.callback_url).to eq :old_callback
+      end
+
+      it 'should return the default callback_path value' do
+        expect(subject.callback_path).to eq '/auth/twitter/callback'
+      end
+    end
+
     context "with no request params set and force_login specified" do
       before do
         allow(subject).to receive(:request) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-twitter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Arun Agrawal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Twitter