omniauth-campus 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec74a47e48a7b3fe746a957901d055737c46616
-  data.tar.gz: aa3f983dddcdb06dc1f2a892713fc2b15c59617f
+  metadata.gz: f13f7355771da8d22c51d987e9a60eb441fd2eef
+  data.tar.gz: 2d0dd935f392b2bab3fe3473724c36d3cd9838f2
 SHA512:
-  metadata.gz: e9072294e221a486605944501142719069bb48e32297461216b3fd38624fca0bdcef74af6f20e0f3cd1d25f4ff21db93c17460d6dee3e21740222daf475a77d4
-  data.tar.gz: 0cc75c44667a977bce3711fecdad33f1a06a49acea74c16d38b0d761c1d4afdc3da17c4740104c0d744fae105c38823f1bf00bd1bfbdd35f3dfde780ce1b999f
+  metadata.gz: a0471f079933c61dd75d2121da1b29ea40c520c0a2f7a15c9da6732fbd6addf6250567e5a1213b8bd24f227793404b066e62f9b4eda574e9652a043235743cc5
+  data.tar.gz: be1b34bddda7184e4f0d69292bcfa393b3e9a2c24bead47f2aee6f2d9e90a2ea6cb1f7286f46ad90ee3f4d72d9a5983f65cdcf98dc5aa7d2e4da5d2f092cf909

data/lib/omniauth/strategies/campus.rb

@@ -25,61 +25,23 @@ module OmniAuth
 
         attr_reader :access_tokens
 
-        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
-        end
+        uid{ raw_info['id'] }
 
-        def request_phase
-        request_token = consumer.get_request_token({:oauth_callback => callback_url}, options.request_params)
-        session['campus'] ||= {}
-        session['campus'][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['campus'].nil?
-
-        request_token = ::Oauth::RequestToken.new(consumer, session['campus'][name.to_s].delete('request_token'), session['campus'][name.to_s].delete('request_secret'))
-
-        opts = {}
-        if session['campus'][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 ::Campus::Unauthorized => e
-        fail!(:invalid_credentials, e)
-      rescue ::MultiJson::DecodeError => e
-        fail!(:invalid_response, e)
-      rescue ::OmniAuth::NoSessionError => e
-        fail!(:session_expired, e)
+      info do
+        {
+          :name => raw_info['name'],
+          :email => raw_info['email']
+        }
       end
 
-      credentials do
-        {'token' => access_token.token, 'secret' => access_token.secret}
+      extra do
+        {
+          'raw_info' => raw_info
+        }
       end
 
-      extra do
-        {'access_token' => access_token}
+      def raw_info
+        @raw_info ||= access_token.get('/me').parsed
       end
 
     end

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end
 

metadata

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