omniauth-campus 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 284181887d94a216f467dbe617e1f3cf4738d029
-  data.tar.gz: f41ea8f962036ab321fb7d2f902340bff1e409e0
+  metadata.gz: 3c16d37434b9fe9e988bc915ecdcf8937926026c
+  data.tar.gz: 2f33553fcad05d329a81d6fd82adb156ffb479c6
 SHA512:
-  metadata.gz: 52a21f58e5c700ff58e2f86c56b2368863e948026e79537541a74770b79ccdb45334cab3f8b873cae26901a6add691cbb6b4a2509aff666cf3e720f6373b0d1c
-  data.tar.gz: db670b804c70f1e03030261052a6195f8ea9d90fe239e7df5bd7e97f21f0172d85a1196c9e4da216960969783bd4f8962e322d264cf9d064ca33f48cd1aea290
+  metadata.gz: 93902abf2bf2375ed66de1e79d6d9b050cea1b11232f6d18d0d056b7c557cc4d4a4a99c38a51a8e0f58f352339c6541fc75ebd0e8c0562899ec7ae8603da062c
+  data.tar.gz: 67a15df8815a6e56cad25f7ce6d122383cfebc072130e25e703e30b1c5d288892b52bc48c980c035dc8e471d1ef0bed5de21485a8f75d327d3bd8133f40f61fb

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "1.3"
+    VERSION = "1.4"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -22,11 +22,31 @@ module OmniAuth
                                #: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
-        options[:authorize_params] = {:perms => options[:scope]} if options[:scope]
-        super
+        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
+
+      rescue ::Timeout::Error => e
+        fail!(:timeout, e)
+      rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
+        fail!(:service_unavailable, e)
       end
 
+
         uid{ request.params['user_id'] }
 
       info do

metadata

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