omniauth-campus 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4335ee1dab94f5e073335f9c867245c9a57d62
-  data.tar.gz: 04e9f3bd91d4e19d514b4dcfef067244d2a75eb9
+  metadata.gz: d7c4cef6ca65e57faf61483baad188235d685258
+  data.tar.gz: 0cbfa5068f923e53c58fd0e95519dae5d21b9b92
 SHA512:
-  metadata.gz: c84a883ef893c6b73ddd421821286f13527b3220867220191eff24006e28b779f59a103eece5c964b501dc427c426f40352febc287ba07888d3dfc734f6fed6c
-  data.tar.gz: 50e00747220c596e4d2e94f2a6a5aea753c8504a2a907ab60406f92afdcb8308b3855537dcd345731c638f5dd6f75d66d4cd965a58b6e418645106f2a01c0abd
+  metadata.gz: 65876abb1bb8643dcac208c620c024ce6e9893331269f75f63e782077eccd3d3cbdf4c36c98d417793fc2044759044f07e39b9f9374da03a9f756da425ede5c6
+  data.tar.gz: 19b2209d9363feef5af109f6325b32b672a17ee9e61733af139ac5d46af9fd2771a27bac69548f1a7b5eeeae9066dfb4e3159b3941ed5285926e3663215892a6

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -11,32 +11,77 @@ module Omniauth
     class Campus
         include OmniAuth::Strategy
 
-        option :name, 'campus'
 
-        option :client_options, {
-            site: 'http://community3dev.devcloud.acquia-sites.com/api'
-        }
-        option :client_id, nil
-        option :client_secret, nil
+            #site: 'http://community3dev.devcloud.acquia-sites.com/api'
 
-       uid{ raw_info['id'] }
+        args [:consumer_key, :consumer_secret]
+        option :consumer_key, nil
+        option :consumer_secret, nil
+        option :client_options, {}
+        option :open_timeout, 30
+        option :read_timeout, 30
+        option :authorize_params, {}
+        option :request_params, {}
 
-      info do
-        {
-          :name => raw_info['name'],
-          :email => raw_info['email']
-        }
+        attr_reader :access_tokens
+
+        def consumer
+            consumer = ::Campus::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
+
+        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 = ::Campus::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)
       end
 
-      extra do
-        {
-          'raw_info' => raw_info
-        }
+      credentials do
+        {'token' => access_token.token, 'secret' => access_token.secret}
       end
 
-      def raw_info
-        @raw_info ||= access_token.get('/me').parsed
+      extra do
+        {'access_token' => access_token}
       end
+
     end
   end
 end

metadata

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