omniauth-campus 1.9 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bee7fea4d1e5c1c8fa43c8ed004fedd63a13bf9e
-  data.tar.gz: 34724feb16cd3238eb7582c96726e0657b3db062
+  metadata.gz: 8dc60d7df8ef6f6ef8545d6f77a4ae7dd6236d79
+  data.tar.gz: e7a941aab44da8085dfb8bc8cf7e8855b75b323f
 SHA512:
-  metadata.gz: c07b0979f864165111181fa0c807bae9d1764ebcc0bbcd02836080142cb96d2246be6951793a5f6b918a7980bfea4b3d881c7514cd728ab1e505e51617de4112
-  data.tar.gz: 6e63ae8d8fc42361e036b73a4bc61f2c3224e38f408970f2d7d21f33616471ab197246070f7162c9a3089c9462f3044e49e7db938e0a7caf6945e1bef2fae465
+  metadata.gz: eb2903d75b3be39fb800e25f6d5a751f92e823c8a9399a941764793e34c646426184f54c03ca06221539089dd374436da14c6ac313122c53628dbfd577f928dd
+  data.tar.gz: 0fee707b02c1475b9ff42512236844988487aefe5e7c314650c5a97ba539ee355da772f5b4badd36baa3b5467e4d9b2e0566fc89d30758e59c6050a7b9ca1c83

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "1.9"
+    VERSION = "2.0"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -19,32 +19,69 @@ module OmniAuth
         option :consumer_secret, nil
 
         option :client_options, {
-            :site => "http://dev-oauth-test.gotpantheon.com/myawesomejson",
+            :site => "http://dev-oauth-test.gotpantheon.com",
             :proxy => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil
         }
 
         option :name, "campus"
 
-           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
+        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
 
-        %w[x_auth_access_type].each do |v|
-          if request.params[v]
-            options[:request_params][v.to_sym] = request.params[v]
-          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))
         end
 
-        if request.params['use_authorize'] == 'true'
-          options[:client_options][:authorize_path] = '/oauth/authorize'
+      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'))
+
+        opts = {}
+        if session['oauth'][name.to_s]['callback_confirmed']
+          opts[:oauth_verifier] = request['oauth_verifier']
         else
-          options[:client_options][:authorize_path] = '/oauth/authenticate'
+          opts[:oauth_callback] = callback_url
         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}
       end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-campus
 version: !ruby/object:Gem::Version
-  version: '1.9'
+  version: '2.0'
 platform: ruby
 authors:
 - johnvehr