omniauth-campus 3.3 → 3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e49926150ad0e4db2ede7d4f88a496f274f44477
-  data.tar.gz: 7f8b88e5e84c7f3b75c07d45b29ba716b5631da0
+  metadata.gz: fc3b877ea945bffcf1d74bb89b75367c31f762e5
+  data.tar.gz: b4b458094626c6dedaf1a4f7d40d384b733d27cd
 SHA512:
-  metadata.gz: 56a2c280cbae96c94be5bf92dd03348c8a58a0f730817ca38c75957732fda230c6f13dc2f0a0ff40fed635c33603ca7fb8d9ca7dcec23a470ebe1473a3051b70
-  data.tar.gz: 40d9eab0cebcb5f3fe6546b888e8541d2ccc6b36590efd39f5bd9c5283b129be02fddbbcf113017f9001c1cf15b2dcca4e234c67f06526532678046306b187d0
+  metadata.gz: e405613132a75cc7ded7e23a6c631fd9e8b48b643de7027758ca55db43c4f0cfedf46a2a60d30d3aeb2d30c98ae8d7e7a6f1e4f666970c7f34d5ae4040dc0002
+  data.tar.gz: e249b9cb5560bd04f5e9fb02bf5b4c94f24d13345aebca4b8d730298a88e3dbd7bf4a61e3f5dc184f42da74ffa8612ff12ff8e3e83f2bd4cf5b47849065b3219

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "3.3"
+    VERSION = "3.4"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -31,7 +31,59 @@ module OmniAuth
 
 
 
-       uid {user_info['uid']}
+                               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))
+        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'))
+
+        opts = {}
+        if session['oauth'][name.to_s]['callback_confirmed']
+          opts[:oauth_verifier] = request['oauth_verifier']
+        else
+          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
+
+       uid {
+           access_token.params['uid']
+       }
 
        extra do
            {
@@ -45,12 +97,7 @@ module OmniAuth
             raise ::Timeout::Error
        end
 
-       def request_phase
-        #options[:authorize_params] = {:perms => options[:scope]} if options[:scope]
-        options[:scope] ||= 'basic'
-        options[:response_type] ||= 'code'
-        super
-       end
+
 
         #def auth_hash
         #    OmniAuth::Utils.deep_merge(super(), {

metadata

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