omniauth-campus 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c16d37434b9fe9e988bc915ecdcf8937926026c
-  data.tar.gz: 2f33553fcad05d329a81d6fd82adb156ffb479c6
+  metadata.gz: 5a16303cd3e95f66adcdba091178fd3f39e32e1c
+  data.tar.gz: 9a755593eab4e01aacdc49836ac84fe6a2adffa9
 SHA512:
-  metadata.gz: 93902abf2bf2375ed66de1e79d6d9b050cea1b11232f6d18d0d056b7c557cc4d4a4a99c38a51a8e0f58f352339c6541fc75ebd0e8c0562899ec7ae8603da062c
-  data.tar.gz: 67a15df8815a6e56cad25f7ce6d122383cfebc072130e25e703e30b1c5d288892b52bc48c980c035dc8e471d1ef0bed5de21485a8f75d327d3bd8133f40f61fb
+  metadata.gz: 01cb02fa21f1369af15fa92274362cd37b13a2bf3b5be3546bcff786c5f7ea6776c328caabf3d5e37ae96390289f0920221e0f7bea84edb31df71758af8c55b4
+  data.tar.gz: 52bf61422a9c82a449fbf294df4cb3700d95158b88759058925b1ed9c3a65bd758955309c2b16606b694fb9aeff203cb7629932d4551b8cc1cda8276a34cf98f

data/lib/omniauth/strategies/campus.rb

@@ -18,6 +18,9 @@ module OmniAuth
         option :consumer_key, nil
         option :consumer_secret, nil
 
+        option :name, "campus"
+
+        attr_reader :access_token
         #option :client_options, {:authorize_path => '/oauth/authenticate'
                                #:site => 'http://dev-oauth-test.gotpantheon.com/myawesomejson',
                                #:proxy => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil}
@@ -46,13 +49,43 @@ def consumer
         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
+
+      credentials do
+        {'token' => access_token.token, 'secret' => access_token.secret}
+      end
+
 
-        uid{ request.params['user_id'] }
+        uid{ request.params['uid'] }
 
       info do
         {
           :name => raw_info['name'],
-          :location => raw_info['city']
+          :email => raw_info['email']
         }
       end
 

data/lib/omniauth-campus/version.rb

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

metadata

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