omniauth-campus 6.6 → 6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9029b4afae58395925fa25b47980e0b331d894a3
-  data.tar.gz: f3092a21f66864bd17268a9dfb2ce6ae9ad14898
+  metadata.gz: e71a5d888c21dfaf8429e982204762d7d3436144
+  data.tar.gz: 6bd98ed410a44fb614220dd0e66915f466311bfe
 SHA512:
-  metadata.gz: 10899ec7b86a2e65ba2228d1927d7ae460eef992ee35e52884410084205e28efb7d93cc908edd91d4d1dc42e5a7bcc502c353fb407da957ef3a349065e62453c
-  data.tar.gz: 494ffb0d229741b6f083f0a9beb7d5a02b71b14dcabc7b8e8c2fb6e4dc34632e37676a2537ccb4939ac4183b3820c44e698cd02f223ad7f46123d7083c8317cd
+  metadata.gz: 2a77bf93d98125e8abbc18f41c620ea10b45a27f08a6c3a0a995ec4ff34af6d47d2c9b7016fa1c96ae9e3c8d869f0057f36448722ab02087e674d05d74a45560
+  data.tar.gz: c0272520f20c8473e48d0c61d3d7a3e8a44716e03aec2c630426fb616809c19dbfd09dc8a157c344134ea2cbe9aa82af400fc5bc61c004bcea9a9a330bbb9ee9

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "6.6"
+    VERSION = "6.7"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -46,16 +46,33 @@ module OmniAuth
        }
        end
 
+       def request_phase
+        request_token = consumer.get_request_token(:oauth_callback => callback_url)
+        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].merge(:oauth_consumer_key => consumer.key))
+        else
+          redirect request_token.authorize_url(options[:authorize_params].merge(:oauth_callback => callback_url, :oauth_consumer_key => consumer.key))
+        end
+
+      rescue ::Timeout::Error => e
+        fail!(:timeout, e)
+      rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
+        fail!(:service_unavailable, e)
+      end
+
        def raw_info
-        @raw_info ||= MultiJson.decode(access_token.get("#{options[:client_options][:site]}/myawesomejson/user.json").body)
+        @raw_info ||= MultiJson.decode(access_token.get("#{options[:client_options][:site]}/myawesomejson/user/#{@access_token.params[:uid]}.json").body)
         rescue ::Errno::ETIMEDOUT
             raise ::Timeout::Error
        end
 
-       def request_phase
-        options[:authorize_params] = {:perms => options[:scope]} if options[:scope]
-        super
-      end
+       #def request_phase
+       # options[:authorize_params] = {:perms => options[:scope]} if options[:scope]
+       # super
+      #end
 
 
 

metadata

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