omniauth-granicus 1.1.3 → 1.1.4

data/lib/omniauth/granicus/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GranicusAdmin
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
   end
 end

data/lib/omniauth/strategies/granicus-admin.rb

@@ -6,14 +6,12 @@ module OmniAuth
   module Strategies
     class GranicusAdmin < OmniAuth::Strategies::OAuth2
       class NoAuthorizationCodeError < StandardError; end
-      class InvalidTokenHostError < StandardError; end
 
       DEFAULT_SCOPE = ''
       
       option :name, 'granicus_admin'
       
       option :client_options, {
-        :site => 'https://citizen.dev.granicus.com',
         :token_url => '/auth/oauth/token',
         :authorize_url => '/auth/oauth/authorize',
         :token_method => :get,
@@ -25,7 +23,7 @@ module OmniAuth
         :parse => :json
       }
 
-      option :authorize_options, [:scope, :host]
+      option :authorize_options, [ :scope ]
 
       uid { raw_info['userid'] }
 
@@ -51,10 +49,16 @@ module OmniAuth
         })
       end
 
+      def client
+        options.client_options[:site] = "https://#{options.host}"
+
+        super
+      end
+
       def raw_info
         @raw_info ||= access_token.get('/auth/identity/me').parsed
         @raw_info['name'] ||= @raw_info['username']
-        @raw_info['email'] ||= "#{@raw_info['username']}@#{request.params['host']}"
+        @raw_info['email'] ||= "#{@raw_info['username']}@#{options.host}"
       
         @raw_info
       end
@@ -64,28 +68,15 @@ module OmniAuth
             token.options.merge!(access_token_options)
         end
       end
-
-      ##
-      # Add the host param to the callback url so that we know where to go for our token
-      #
-      def callback_url
-        full_host + script_name + callback_path + "?host=#{request.params['host']}"
-      end
       
       ##
       # Implement multi-tenancy support in the callback phase with a check to ensure we are still
       # talking to the right domain to prevent hijacking of the oauth token process
       #
       def callback_phase
-        if !request.params['host'].nil? && request.params['host'] =~ /\.granicus\.com$/
-          options.client_options[:site] = "https://#{request.params['host']}"
-        else 
-          raise InvalidTokenHostError.new
-        end
+        options.client_options[:site] = "https://#{options.host}"
         
         super
-      rescue InvalidTokenHostError => e
-          fail!(:invalid_token_host, e)
       end
 
       def access_token_options
@@ -97,15 +88,12 @@ module OmniAuth
       # you need to set them dynamically. You can also set these options
       # in the OmniAuth config :authorize_params option.
       #
-      # /auth/granicus_admin?host=sacramento.granicus.com
       #
       def authorize_params
         super.tap do |params|
-          %w[host scope].each { |v| params[v.to_sym] = request.params[v] if request.params[v] }
+          %w[scope].each { |v| params[v.to_sym] = request.params[v] if request.params[v] }
           params[:scope] ||= DEFAULT_SCOPE
-          if !params[:host].nil?
-            options.client_options[:site] = "https://#{params[:host]}"
-          end
+          params[:host] = options.host
         end
       end
 

data/spec/omniauth/strategies/granicus_spec.rb

@@ -9,7 +9,8 @@ describe OmniAuth::Strategies::GranicusAdmin do
     @request.stub(:params) { {} }
     @request.stub(:cookies) { {} }
     @request.stub(:env) { {} }
-
+    @options = { :host => 'citizen.dev.granicus.com' }
+      
     @client_id = '123'
     @client_secret = '53cr3tz'
   end
@@ -33,6 +34,7 @@ describe OmniAuth::Strategies::GranicusAdmin do
     end
 
     it 'has correct token url' do
+      @options = { :host => 'citizen.dev.granicus.com' }
       subject.client.options[:token_url].should eq('/auth/oauth/token')
     end
   end
@@ -41,18 +43,16 @@ describe OmniAuth::Strategies::GranicusAdmin do
     it "returns the default callback url" do
       url_base = 'http://auth.request.com'
       @request.stub(:url) { "#{url_base}/some/page" }
-      @request.stub(:params) { { 'host' => 'dev.dev.granicus.com' }}
       subject.stub(:script_name) { '' } # as not to depend on Rack env
-      subject.callback_url.should eq("#{url_base}/auth/granicus_admin/callback?host=dev.dev.granicus.com")
+      subject.callback_url.should eq("#{url_base}/auth/granicus_admin/callback?host=citizen.dev.granicus.com")
     end
 
     it "returns path from callback_path option" do
-      @options = { :callback_path => "/auth/FB/done"}
+      @options[:callback_path] = "/auth/FB/done"
       url_base = 'http://auth.request.com'
       @request.stub(:url) { "#{url_base}/page/path" }
-      @request.stub(:params) { { 'host' => 'dev.dev.granicus.com' }}
       subject.stub(:script_name) { '' } # as not to depend on Rack env
-      subject.callback_url.should eq("#{url_base}/auth/FB/done?host=dev.dev.granicus.com")
+      subject.callback_url.should eq("#{url_base}/auth/FB/done?host=citizen.dev.granicus.com")
     end
 
   end
@@ -64,10 +64,9 @@ describe OmniAuth::Strategies::GranicusAdmin do
     end
 
     it 'changes site to site defined by host param in request when present' do
-      @request.stub(:params) { { 'host' => 'dev.dev.granicus.com' } }
       subject.authorize_params.should be_a(Hash)
-      subject.authorize_params[:host].should eq('dev.dev.granicus.com')
-      subject.client.site.should eq('https://dev.dev.granicus.com')
+      subject.authorize_params[:host].should eq('citizen.dev.granicus.com')
+      subject.client.site.should eq('https://citizen.dev.granicus.com')
     end
 
     it 'overrides default scope with parameter passed from request' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-granicus
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000Z
+date: 2012-04-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &2152544460 !ruby/object:Gem::Requirement
+  requirement: &2152507980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152544460
+  version_requirements: *2152507980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152543220 !ruby/object:Gem::Requirement
+  requirement: &2152507080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152543220
+  version_requirements: *2152507080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152540540 !ruby/object:Gem::Requirement
+  requirement: &2152502600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152540540
+  version_requirements: *2152502600
 description: 
 email:
 - javier@granicus.com