omniauth-zendesk 0.1.1 → 0.1.2

data/lib/omniauth/strategies/zendesk.rb

@@ -26,15 +26,20 @@ module OmniAuth
       extra { { raw_info: identity } }
       
       def request_phase
-        return callback_phase if site && username && password
-        OmniAuth::Form.build(
-          title: (options[:title] || "Zendesk Authentication"),
-          url: callback_path
-        ) do |f|
-          f.text_field 'Username', options.params.username
-          f.password_field 'Password', options.params.password
-          f.text_field 'Zendesk Site', options.params.site
-        end.to_response
+        if site && username && password
+          r = Rack::Response.new
+          r.redirect(callback_path, 307)
+          r.finish
+        else
+          OmniAuth::Form.build(
+            title: (options[:title] || "Zendesk Authentication"),
+            url: callback_path
+          ) do |f|
+            f.text_field 'Username', options.params.username
+            f.password_field 'Password', options.params.password
+            f.text_field 'Zendesk Site', options.params.site
+          end.to_response
+        end
       end
       
       def callback_phase
@@ -68,9 +73,7 @@ module OmniAuth
       def uri?(uri)
         uri = URI.parse(uri)
         uri.scheme == 'https'
-      rescue URI::BadURIError
-        false
-      rescue URI::InvalidURIError
+      rescue
         false
       end
       

data/lib/omniauth-zendesk/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Zendesk
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/omniauth/strategies/zendesk_spec.rb

@@ -39,7 +39,7 @@ describe OmniAuth::Strategies::Zendesk do
       end
 
       it 'should populate the auth hash' do
-        auth_hash.should be_kind_of(Hash)
+        last_response.headers["Location"].should == '/auth/zendesk/callback'
       end
     end
   end
@@ -70,10 +70,15 @@ describe OmniAuth::Strategies::Zendesk do
         OmniAuth.config.on_failure = lambda{|env| [401, {}, [env['omniauth.error.type'].inspect]]}
         stub_request(:get, "https://wrong%40example.com:login@my.zendesk.com/api/v2/users/me").
           to_return(status: 200, body: File.new(File.dirname(__FILE__) + '/../../fixtures/anonymous.json'), headers: {content_type: "application/json; charset=utf-8"})
-        post '/auth/zendesk/callback', email: 'wrong@example.com', password: 'login', site: 'my'
       end
-    
+      
       it 'should fail with :invalid_credentials' do
+        post '/auth/zendesk/callback', email: 'wrong@example.com', password: 'login', site: 'my'
+        last_response.body.should == ':invalid_credentials'
+      end
+      
+      it 'should fail if no/wrong site provided' do
+        post '/auth/zendesk/callback', email: 'wrong@example.com', password: 'login'
         last_response.body.should == ':invalid_credentials'
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-zendesk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3124490689275656540
+      hash: -1961441658039726598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3124490689275656540
+      hash: -1961441658039726598
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24