omniauth-campus 2.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc60d7df8ef6f6ef8545d6f77a4ae7dd6236d79
-  data.tar.gz: e7a941aab44da8085dfb8bc8cf7e8855b75b323f
+  metadata.gz: 20607bf77c647b4c95ba4ddd68f5c6688b13e911
+  data.tar.gz: 75dd6d7f1d2f1b2a6f98de14c54dc63dfea40373
 SHA512:
-  metadata.gz: eb2903d75b3be39fb800e25f6d5a751f92e823c8a9399a941764793e34c646426184f54c03ca06221539089dd374436da14c6ac313122c53628dbfd577f928dd
-  data.tar.gz: 0fee707b02c1475b9ff42512236844988487aefe5e7c314650c5a97ba539ee355da772f5b4badd36baa3b5467e4d9b2e0566fc89d30758e59c6050a7b9ca1c83
+  metadata.gz: 72c7844d90dd7c0d9a37a16850c2359f40fba504b29b60a882fc161209968ba9dc6ae480c108234be21e2d4ac7821c3861bed1f9d783664467c8fe1cef524d57
+  data.tar.gz: ff863e02c813ea16fc0d5e68c95eea1fcaaf5727ec61619a79dcf36b7b7337a2ab05d5b4aed970661590b36ef83aa85352bf42e2f99e5296209573a50c795590

data/lib/omniauth/strategies/campus.rb

@@ -2,6 +2,7 @@ require 'oauth'
 require 'omniauth'
 require 'multi_json'
 require 'openssl'
+require 'omniauth/core'
 require 'uri'
 #require 'rack/utils'
 
@@ -30,79 +31,27 @@ module OmniAuth
                                #:site => 'http://dev-oauth-test.gotpantheon.com/myawesomejson',
                                #:proxy => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil}
 
-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))
+        def initialize(app, secret, auth_redirect, options = {})
+            @secret = secret
+            @auth_redirect = auth_redirect
+            super(app, :campus, options)
         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
+        def request_phase
+            r = Rack::Response.new
+            r.redirect @auth_redirect
+            r.finish
         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['uid'] }
-
-      info do
-        {
-          :name => raw_info['name'],
-          :email => raw_info['email']
-        }
-      end
 
-      extra do
-        {
-          'raw_info' => raw_info
-        }
-      end
+        def callback_phase
+        end
 
-      def raw_info
-        @raw_info ||= MultiJson.decode(access_token.get('/me.json')).body
-      end
+        def auth_hash
+            OmniAuth::Utils.deep_merge(super(), {
+                'uid' => @uid
+            })
+        end
 
 
       end

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "2.0"
+    VERSION = "2.1"
   end
 end
 

metadata

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