omniauth-desk 0.1.1 → 0.1.2

data/lib/omniauth/strategies/desk.rb

@@ -6,6 +6,8 @@ module OmniAuth
     # An omniauth 1.0 strategy for Desk.com authorization
     class Desk < OmniAuth::Strategies::OAuth
       option :name, 'desk'
+      option :site, nil
+      option :site_param, 'desk_site'
       option :client_options, {
         :authorize_path       => '/oauth/authorize',
         :request_token_path   => '/oauth/request_token',
@@ -35,7 +37,7 @@ module OmniAuth
 
       # Return info gathered from the verify_credentials API call 
       def raw_info
-        @raw_info ||= MultiJson.decode(access_token.get('/api/v1/account/verify_credentials.json').body)
+        @raw_info ||= MultiJson.decode(access_token.get('/api/v1/account/verify_credentials.json').body) if access_token
       rescue ::Errno::ETIMEDOUT
         raise ::Timeout::Error
       end
@@ -45,13 +47,32 @@ module OmniAuth
         @user_info ||= raw_info.nil? ? {} : raw_info['user']
       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 validate_site(site)
+        if site and 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.html '<p><strong>Hint:</strong> https://YOURSITE.desk.com'
+        f.button 'Login'
+        f.to_response
+      end
+      
       def request_phase
-        options[:client_options][:site] = options[:site] if options[:site]
-        super
+        identifier ? super : get_identifier
       end
 
       def callback_phase
-        options[:client_options][:site] = options[:site] if options[:site]
+        options.client_options.site = session[:site] if session[:site]
         super
       end
     end

data/lib/omniauth-desk/version.rb

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

data/spec/omniauth/strategies/desk_spec.rb

@@ -1,25 +1,70 @@
 require 'spec_helper'
+require 'omniauth-desk'
 
-describe OmniAuth::Strategies::Desk do
-  subject do
-    OmniAuth::Strategies::Desk.new({})
+describe OmniAuth::Strategies::Desk, :type => :strategy do
+  def app
+    strat = OmniAuth::Strategies::Desk
+    Rack::Builder.new {
+      use Rack::Session::Cookie
+      use strat
+      run lambda {|env| [404, {'Content-Type' => 'text/plain'}, [nil || env.key?('omniauth.auth').to_s]] }
+    }.to_app
   end
-
-  context "client options" do
-    it 'should have correct name' do
-      subject.options.name.should eq("desk")
+  
+  describe '/auth/desk without a site URL' do
+    before do
+      get '/auth/desk'
     end
-
-    it 'should have correct authorize path' do
-      subject.options.client_options.authorize_path.should eq('/oauth/authorize')
+    
+    it 'should respond with OK' do
+      last_response.should be_ok
     end
-
-    it 'should have correct request token path' do
-      subject.options.client_options.request_token_path.should eq('/oauth/request_token')
+    
+    it 'should respond with HTML' do
+      last_response.content_type.should == 'text/html'
     end
 
-    it 'should have correct access token path' do
-      subject.options.client_options.access_token_path.should eq('/oauth/access_token')
+    it 'should render an identifier URL input' do
+      last_response.body.should =~ %r{<input[^>]*desk_site}
     end
   end
+  
+  describe 'followed by /auth/desk/callback' do
+    context 'successful' do
+      it 'should set provider to desk'
+    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}
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-desk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000Z
+date: 2012-06-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &2154258400 !ruby/object:Gem::Requirement
+  requirement: &2166168760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154258400
+  version_requirements: *2166168760
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
-  requirement: &2154250320 !ruby/object:Gem::Requirement
+  requirement: &2166167160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154250320
+  version_requirements: *2166167160
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2154248940 !ruby/object:Gem::Requirement
+  requirement: &2166164200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *2154248940
+  version_requirements: *2166164200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154247860 !ruby/object:Gem::Requirement
+  requirement: &2166159020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2154247860
+  version_requirements: *2166159020
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2154246280 !ruby/object:Gem::Requirement
+  requirement: &2166157120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154246280
+  version_requirements: *2166157120
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2154244600 !ruby/object:Gem::Requirement
+  requirement: &2166155100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154244600
+  version_requirements: *2166155100
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2154235780 !ruby/object:Gem::Requirement
+  requirement: &2166153360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154235780
+  version_requirements: *2166153360
 description: OmniAuth strategy for Desk.com
 email:
 - tstachl@salesforce.com
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -977837911144190117
+      hash: 2082149953503729504
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -977837911144190117
+      hash: 2082149953503729504
 requirements: []
 rubyforge_project: omniauth-desk
 rubygems_version: 1.8.10