omniauth-desk 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5c9d6a35eec35c54d835aa245a32b592d95d88
-  data.tar.gz: a32777466a42a486ca39f37232f9b90432547b65
+  metadata.gz: 78ae51cd756cb4ce1389d03aadad0ff24920bdbc
+  data.tar.gz: b5299b0606bbf76e9e888952da4732d751a1a24c
 SHA512:
-  metadata.gz: 386f5c66038ce6945e2dc79d883c68ceb14ecf21a8166a60cb84423c4a618df20b93219c4aa7329d65b330bf6d2ed91867e5cc600164f2b40d4bf349177eb383
-  data.tar.gz: 74ef9e42d60c969c47e0ce50e955466a65ab07036f4a6e9991880c90fe6e022cffc21fa6f8afd1da9c429595e313224b059395dfe1d846c77f62ef8f5d2bc4eb
+  metadata.gz: 737efb1f76b076c0b84d997105b8eff2e55008be070d3972fcfaae73545d108844d8bf391afbb07199b63e5e20c989bef56b1266fa2da84a236285dd194d8abd
+  data.tar.gz: cca26acc58fa1cd48a543d2726657c5570e4ca05afa708f44ed7c46b0a1cb38f8612ac0e5906848477cd057a01a90cbebea49e125330f72e436fcb45fcb8ed02

data/lib/omniauth/strategies/desk.rb

@@ -15,11 +15,11 @@ module OmniAuth
         :access_token_path    => '/oauth/access_token',
       }
 
-      uid { 
+      uid {
         user_info['id']
       }
-      
-      info do 
+
+      info do
         {
           :name        => user_info['name'],
           :name_public => user_info['name_public'],
@@ -29,14 +29,14 @@ module OmniAuth
           :site        => session[:site]
         }
       end
-            
+
       extra do
         {
           :raw_info => raw_info
         }
       end
 
-      # Return info gathered from the verify_credentials API call 
+      # Return info gathered from the verify_credentials API call
       def raw_info
         @raw_info ||= MultiJson.decode(access_token.get('/api/v2/users/me').body) if access_token
       rescue ::Errno::ETIMEDOUT
@@ -47,38 +47,36 @@ module OmniAuth
       def user_info
         @user_info ||= raw_info.nil? ? {} : raw_info
       end
-      
+
       def identifier
         session[:site] = options.client_options.site = options.site || validate_site(request.params[options.site_param.to_s])
         session[:site] = options.client_options.site = nil if options.client_options.site == ''
         options.client_options.site
       end
-      
+
       def uri?(uri)
         uri = URI.parse(uri)
         uri.scheme == 'https'
-      rescue URI::BadURIError
-        false
-      rescue URI::InvalidURIError
-        false
       end
-      
+
       def validate_site(site)
         if site and site != ''
           uri?(site) ? site : "https://#{site}.desk.com"
         end
       end
-      
+
       def get_identifier
-        f = OmniAuth::Form.new :title => 'Desk.com Authorization'
-        f.text_field 'Desk.com Site', options.site_param.to_s
+        f = OmniAuth::Form.new title: 'Desk.com Authorization'
+        f.text_field 'Site', options.site_param.to_s
         f.html '<p><strong>Hint:</strong> https://YOURSITE.desk.com'
         f.button 'Login'
         f.to_response
       end
-      
+
       def request_phase
         identifier ? super : get_identifier
+      rescue ::OAuth::Unauthorized => err
+        fail!(:unathorized, err)
       end
 
       def callback_phase
@@ -87,4 +85,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/lib/omniauth-desk/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Desk
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
-end
+end

data/omniauth-desk.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_runtime_dependency 'omniauth', '>= 1.0'
   s.add_runtime_dependency 'omniauth-oauth', '>= 1.0'
   s.add_runtime_dependency 'multi_json', '>= 1.3.6'
-  
-  s.add_development_dependency 'rspec', '~> 2.7'
+
+  s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'webmock'
-end
+end

data/spec/omniauth/strategies/desk_spec.rb

@@ -4,90 +4,102 @@ describe OmniAuth::Strategies::Desk, :type => :strategy do
   def app
     strat = OmniAuth::Strategies::Desk
     Rack::Builder.new {
-      use Rack::Session::Cookie
+      use Rack::Session::Cookie, :secret => "MY_SECRET"
       use strat
       run lambda {|env| [404, {'Content-Type' => 'text/plain'}, [nil || env.key?('omniauth.auth').to_s]] }
     }.to_app
   end
-  
+
   describe '/auth/desk without a site URL' do
     before do
       get '/auth/desk'
     end
-    
+
     it 'should respond with OK' do
-      last_response.should be_ok
+      expect(last_response)
     end
-    
+
     it 'should respond with HTML' do
-      last_response.content_type.should == 'text/html'
+      expect(last_response.content_type).to eq('text/html')
     end
 
     it 'should render an identifier URL input' do
-      last_response.body.should =~ %r{<input[^>]*desk_site}
+      expect(last_response.body).to match(/<input[^>]*desk_site/)
     end
   end
 
   describe '/auth/desk with a site name' do
     before do
       @stub_devel = stub_request(:post, "https://devel.desk.com/oauth/request_token")
-                      .to_return(:status => 200, :body => 'oauth_token=&oauth_token_secret=')
-      post '/auth/desk', { :desk_site => 'devel' }
+                      .to_return(status: 200, body: 'oauth_token=&oauth_token_secret=')
+      post '/auth/desk', desk_site: 'devel'
     end
 
     it 'should have been requested' do
-      @stub_devel.should have_been_requested
+      expect(@stub_devel).to have_been_requested
     end
   end
-  
+
   describe '/auth/desk with a custom site name' do
     before do
       @stub_devel = stub_request(:post, "https://devel.desk.com/oauth/request_token")
-                      .to_return(:status => 200, :body => 'oauth_token=&oauth_token_secret=')
-      post '/auth/desk', { :desk_site => 'https://devel.desk.com' }
+                      .to_return(status: 200, body: 'oauth_token=&oauth_token_secret=')
+      post '/auth/desk', desk_site: 'https://devel.desk.com'
     end
-    
+
     it 'should have been requested' do
-      @stub_devel.should have_been_requested
+      expect(@stub_devel).to have_been_requested
     end
   end
-  
+
   describe 'followed by /auth/desk/callback' do
     context 'successful' do
-      it 'should set provider to desk'
+      before do
+        stub_request(:post, "https://devel.desk.com/oauth/request_token")
+          .to_return(status: 200, body: 'oauth_token=&oauth_token_secret=')
+
+        post '/auth/desk', desk_site: 'https://devel.desk.com'
+
+        @access_token = stub_request(:post, "https://devel.desk.com/oauth/access_token")
+                          .to_return(status: 200, body: "oauth_token=6253282-eWudHldSbIaelX7swmsiHImEL4KinwaGloHANdrY&oauth_token_secret=2EEfA6BG3ly3sR3RjE0IBSnlQu4ZrUzPiYKmrkVU&user_id=6253282&screen_name=twitterapi")
+
+        @api_request  = stub_request(:get, "https://devel.desk.com/api/v2/users/me")
+                          .to_return(status: 200, body: '{"id":1,"name":"John Doe","public_name":"John Doe","email":"john@acme.com","level":"agent","created_at":"2015-05-11T14:40:01Z","updated_at":"2016-05-04T14:40:01Z","current_login_at":"2016-05-10T14:40:01Z","last_login_at":"2016-05-04T14:40:01Z","_links":{"self":{"href":"/api/v2/users/1","class":"user"},"preferences":{"href":"/api/v2/users/1/preferences","class":"user_preference"},"macros":{"href":"/api/v2/users/1/macros","class":"macro"},"filters":{"href":"/api/v2/users/1/filters","class":"filter"},"integration_urls":{"href":"/api/v2/users/1/integration_urls","class":"integration_url"},"groups":{"href":"/api/v2/users/1/groups","class":"group"},"searches":{"href":"/api/v2/users/1/searches","class":"search"}}}')
+
+        get '/auth/desk/callback?code=aWekysIEeqM9PiT2hEfm0Cnr6MoLIfwWyRJcqOqHdF8f9INokharAS09ia7UNP6RiVScerfhc4w%3D%3D'
+      end
+
+      it 'should request the access token' do
+        expect(@access_token).to have_been_requested
+      end
+
+      it 'should request the user data' do
+        expect(@api_request).to have_been_requested
+      end
     end
-    
+
     context 'unsuccessful' do
       before do
         get '/auth/desk/callback'
       end
-      
+
       it 'should be redirected to failure' do
-        last_response.should be_redirect
-        last_response.headers['Location'].should =~ %r{failure}
+        expect(last_response).to be_redirect
+        expect(last_response.headers['Location']).to match(/failure/)
       end
     end
   end
 
-  # context "client options" do
-  #   it 'should have correct name' do
-  #     subject.options.name.should eq("desk")
-  #   end
-  # 
-  #   it 'should have correct authorize path' do
-  #     subject.options.client_options.authorize_path.should eq('/oauth/authorize')
-  #   end
-  # 
-  #   it 'should have correct request token path' do
-  #     subject.options.client_options.request_token_path.should eq('/oauth/request_token')
-  #   end
-  # 
-  #   it 'should have correct access token path' do
-  #     subject.options.client_options.access_token_path.should eq('/oauth/access_token')
-  #   end
-  #   
-  #   it 'should have an empty user_info' do
-  #     subject.user_info.should eq({})
-  #   end
-  # end
-end
+  context 'invalid site' do
+    before do
+      stub_request(:post, "https://thisdoesnotexist.desk.com/oauth/request_token")
+        .to_return(status: 403, body: 'oauth_token=&oauth_token_secret=')
+      post '/auth/desk', desk_site: 'https://thisdoesnotexist.desk.com'
+    end
+
+    it 'should be redirected to failure' do
+      expect(last_response).to be_redirect
+      expect(last_response.headers['Location']).to match(/failure/)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,4 +12,4 @@ RSpec.configure do |config|
   config.include WebMock::API
   config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
-end
+end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-desk
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Thomas Stachl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: OmniAuth strategy for Desk.com
@@ -115,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
 - Gemfile
 - LICENSE
 - README.md
@@ -137,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: omniauth-desk
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Desk.com