omniauth-campus 0.7.5 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef813010ead951d900ba3074b4e3b6bf2bbaa91e
-  data.tar.gz: ae3c6b687d9a740ae09ec15736ca261b5b059059
+  metadata.gz: e8882f4f73a394eb7404a73821c48aef9f638b05
+  data.tar.gz: aeedfcb9f6f9d13dac366573a6777f0d61edced1
 SHA512:
-  metadata.gz: 5f645d144414a0689f5b291ee5e5ef856006d4e29ab7691fa98f12ca41adbe1fa73d28b59608c58b024b32eba7fa442c899a3e0f66aad5b745f27c375a26811f
-  data.tar.gz: cc02f17c7f61221f5aab2b422bfee5aca7b7f9d508761e12a0c6b330e235b5d9e2fe36e3df616453935b8905187c42036aa9f088b0aa4e9efc8fd791c619399f
+  metadata.gz: fabce4f9ca0c424376795489a3599f12dc504e505efa3900c38f2414b23a6015d5b7c581ceb3050bd0016091c531c479a9eced5bdde16401afbf5166e2ea3473
+  data.tar.gz: 65ee39f3d21a9f5e440c0520a5e66a3550651009e1962f613620e47df76883e29af8a459c62b8eefe10902a8536cd1ad5711aa69140c0a095f8722a00c4ad1f4

data/lib/omniauth/strategies/campus.rb

@@ -1,11 +1,11 @@
-require "omniauth-oauth"
 require 'multi_json'
 require 'faraday'
 require 'net/http'
 require 'open-uri'
 require 'openssl'
 require 'rack/utils'
-
+require 'oauth'
+require 'omniauth'
 
 require 'uri'
 
@@ -14,24 +14,21 @@ require 'uri'
 module OmniAuth
   module Strategies
     # Your code goes here...
-    class Campus < OmniAuth::Strategies::OAuth
+    class Campus
+        include OmniAuth::Strategy
 
 
         option :name, 'campus'
         args [:consumer_key, :consumer_secret]
-        #option :consumer_key, "YzjVHuk8xoXCTcNwYg57yiCW5w59tucC"
-        #option :consumer_secret, "ZDrWuDsunNkRroU5psb6QyMmT86XkYST"
+        option :consumer_key, "YzjVHuk8xoXCTcNwYg57yiCW5w59tucC"
+        option :consumer_secret, "ZDrWuDsunNkRroU5psb6QyMmT86XkYST"
         option :client_options, {
-            request_token_path: '/oauth/request_token',
-            access_token_path: '/oauth/access_token',
-            authorize_path: '/oauth/authorize',
+            #token_url: '/oauth/access_token',
+            #authorize_url: '/oauth/authorize',
             #request_token_path: '/oauth/request_token',
-            site: 'http://dev-oauth-test.gotpantheon.com/myawesomejson',
-            http_method: :get,
-            scheme: :query_string
+            site: 'http://dev-oauth-test.gotpantheon.com/myawesomejson'
         }
 
-        option :authorize_options, [:scope, :display, :auth_type]
 
 
         attr_accessor :access_token
@@ -48,6 +45,30 @@ module OmniAuth
         #
 
 
+         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
+
       uid {raw_info['uid']}
 
         info do {

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.7.5"
+    VERSION = "0.7.9"
   end
 end
 

data/omniauth-campus.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   #spec.add_dependency 'oauth2', '~> 0.8.0'
   spec.add_dependency 'faraday', ['>= 0.8', '<0.10']
   spec.add_dependency 'multi_json', '~> 1.3'
+  #spec.add_runtime_dependency 'zendesk_api', '> 0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-campus
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.9
 platform: ruby
 authors:
 - johnvehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler