omniauth-campus 3.5 → 3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5baf7973c9029caac8b8e8fc3ca76872b1e5913f
-  data.tar.gz: dc115ca8e264590fa56c61a85f982f74b98d0b1e
+  metadata.gz: f6b56a4db2f34d1942c266dae65587fb0917f771
+  data.tar.gz: 0b47057576b54653559852a1766e0be3e229ab92
 SHA512:
-  metadata.gz: b3490915f414180e62981fa7ec6e1e38f5c9d6c7b4f45116306c1ff30cfa06fd1b9f8a4d660493bf772cb8e1263c318dec0cab0a149fc9fb7606af83d44d5cb6
-  data.tar.gz: 677bf21c7bd30a778661562fb9a68db56a832c9c460b0449572727046bfa59e20fbbb764f9ddc188f1ef91fcccc9a988cd3b7efd6efeb2771db8f5217a42a7ee
+  metadata.gz: 5b7650c85f9caae15f28319acc4549072bad0b59fdbf22771b76a147a7d55fc9b39740fbbaddcb5280421b5fe75dd2705a8cfbdf2987c26c1c3a535b4c2c47da
+  data.tar.gz: 2574bc2dd0d445e5556e5af395abe6acfa5e0c658cc8e2cca9bb8618fbecc9fae142631a60529245ba6261a34f5dfb5b13ab6aa0453edfde58ba19e4d03889cf

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "3.5"
+    VERSION = "3.6"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -30,68 +30,17 @@ module OmniAuth
                                #:proxy => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil}
 
 
+       uid{access_token.params['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']
+       info do {
+           :email => access_token.params['email']
        }
+       end
 
-       credentials do
-        {'token' => access_token.token, 'secret' => access_token.secret}
-      end
-
-      extra do
-        {'access_token' => access_token}
-      end
+       extra do {
+           'raw_info' => raw_info
+       }
+       end
 
        def raw_info
         @raw_info ||= MultiJson.decode(access_token.get('/users.json').body)
@@ -99,6 +48,11 @@ module OmniAuth
             raise ::Timeout::Error
        end
 
+       def request_phase
+        options[:authorize_params] = {:perms => options[:scope]} if options[:scope]
+        super
+      end
+
 
 
         #def auth_hash
@@ -108,7 +62,7 @@ module OmniAuth
         #end
 
 
-      end
   end
 end
+end
 

metadata

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