omniauth-campus 1.7 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c84cdf71aa7f37baa7bd78adc437c2f701d097e7
-  data.tar.gz: f0dd7853451cab185fa57d7374e6982dcb663427
+  metadata.gz: 4dc378cd97e24a30fe2e7b9375bfb80d7c07fa04
+  data.tar.gz: ff87d4012bc72a88fd34dd91877163fb654c8360
 SHA512:
-  metadata.gz: 59c11da12e50bca9b2bfcee8ec6702a27fb57ab7139075edfef9b700efee643a9128a3d955c11b073f41b74d2d773851c571e62a2609cd4d737aa0109fd7058c
-  data.tar.gz: 2dcf2cbe6dfc8f07d1e59528bdc7e58f198876167e225ca3a32afca43b20ef04c4512cf548e988f33a549eee8657666b838b44e753449d6f54f5f1be5898bfcb
+  metadata.gz: cb30cff6335b8a8313205707448dadf2d1dc5585368ee3d5cb7dd6ed079b31d33fe5481691d73d86c87d05b33663230e5e86a4837ad025423e41c11abeeaf205
+  data.tar.gz: d269e2dcc41df51ab20eb791b76e57f742e9573a9878517495992bc43bf9c9615a3dc70b1a6b1a3bf7d050dfb1d5799bc4fa875ff14ee89c660740338cc2ae10

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "1.7"
+    VERSION = "1.8"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -25,63 +25,26 @@ module OmniAuth
 
         option :name, "campus"
 
-        attr_reader :access_token
-        #option :client_options, {:authorize_path => '/oauth/authenticate'
-                               #:site => 'http://dev-oauth-test.gotpantheon.com/myawesomejson',
-                               #:proxy => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil}
-
-def consumer
-        consumer = ::OAuth::Consumer.new(options.consumer_key, options.consumer_secret, options.client_options)
-        consumer.http.open_timeout = options.open_timeout if options.open_timeout
-        consumer.http.read_timeout = options.read_timeout if options.read_timeout
-        consumer
-      end
-
-      def request_phase
-        request_token = consumer.get_request_token({:oauth_callback => callback_url}, options.request_params)
-        session['oauth'] ||= {}
-        session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
-
-        if request_token.callback_confirmed?
-          redirect request_token.authorize_url(options[:authorize_params])
-        else
-          redirect request_token.authorize_url(options[:authorize_params].merge(:oauth_callback => callback_url))
+           def request_phase
+        %w[force_login lang screen_name].each do |v|
+          if request.params[v]
+            options[:authorize_params][v.to_sym] = request.params[v]
+          end
         end
 
-      rescue ::Timeout::Error => e
-        fail!(:timeout, e)
-      rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
-        fail!(:service_unavailable, e)
-      end
-
-      def callback_phase
-        raise OmniAuth::NoSessionError.new("Session Expired") if session['oauth'].nil?
-
-        request_token = ::OAuth::RequestToken.new(consumer, session['oauth'][name.to_s].delete('request_token'), session['oauth'][name.to_s].delete('request_secret'))
+        %w[x_auth_access_type].each do |v|
+          if request.params[v]
+            options[:request_params][v.to_sym] = request.params[v]
+          end
+        end
 
-        opts = {}
-        if session['oauth'][name.to_s]['callback_confirmed']
-          opts[:oauth_verifier] = request['oauth_verifier']
+        if request.params['use_authorize'] == 'true'
+          options[:client_options][:authorize_path] = '/oauth/authorize'
         else
-          opts[:oauth_callback] = callback_url
+          options[:client_options][:authorize_path] = '/oauth/authenticate'
         end
 
-        @access_token = request_token.get_access_token(opts)
-        super
-      rescue ::Timeout::Error => e
-        fail!(:timeout, e)
-      rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
-        fail!(:service_unavailable, e)
-      rescue ::OAuth::Unauthorized => e
-        fail!(:invalid_credentials, e)
-      rescue ::MultiJson::DecodeError => e
-        fail!(:invalid_response, e)
-      rescue ::OmniAuth::NoSessionError => e
-        fail!(:session_expired, e)
-      end
-
-      credentials do
-        {'token' => access_token.token, 'secret' => access_token.secret}
+        old_request_phase
       end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-campus
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: '1.8'
 platform: ruby
 authors:
 - johnvehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler