omniauth-campus 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f0ac0144ab79714fd31001007ca0462db0b55c
-  data.tar.gz: ebbe61859cea155be7a79aaf2aac0ad6b483545e
+  metadata.gz: a9a1930b5e53c1c8be54b2b337354ed53e93daec
+  data.tar.gz: 6573a9c7e784d5cc592e50a4fba90fdc63f94fe1
 SHA512:
-  metadata.gz: 6f79c9e158305395492225ddd2fa9ce1baa84c3f3b4a79cdd66cc14210001ddca959d7a6642367afeef339e8936441f89a5ce7744198348e58144115c7bbaf8c
-  data.tar.gz: edca576413b21010bb5a56ee1ef3a366a350777b2096019f39adc8ee8ccc27bd4ac9b87a6b1a9ae91f8436b85e54bf885dc3807c09cb7bcffdb9459c169b3d45
+  metadata.gz: aaae4a8eba515292769cb3ae05093b06ee0a227dbbb29e4971815f733b4f4d6d12d3f66f2f1109113e1713b83578adfafb0d74b0b07e6ac3e63527aa3b676da3
+  data.tar.gz: fa7d03ce964fa71f221521ad8202f16582fb61c806520b546ce03e9f6dc81bdd33282de852a5b2241913f085136c6fb3818f142d87088bca071a05731a042ffe

data/lib/omniauth/strategies/campus.rb

@@ -1,82 +1,35 @@
-require 'multi_json'
-require 'faraday'
-require 'net/http'
-require 'open-uri'
-require 'openssl'
-require 'rack/utils'
-require 'oauth'
-require 'omniauth'
-
-require 'uri'
-
-#require 'rack/utils'
+require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
-    # Your code goes here...
-    class Campus
-        include OmniAuth::Strategy
-
-
-        option :name, 'campus'
-        args [:consumer_key, :consumer_secret]
-        option :consumer_key, "YzjVHuk8xoXCTcNwYg57yiCW5w59tucC"
-        option :consumer_secret, "ZDrWuDsunNkRroU5psb6QyMmT86XkYST"
-        option :client_options, {
-            #token_url: '/oauth/access_token',
-            #authorize_url: '/oauth/authorize',
-            #request_token_path: '/oauth/request_token',
-            site: 'http://community3dev.devcloud.acquia-sites.com/api'
-        }
-        option :fields, [:username, :email]
-
+    class Campus < OmniAuth::Strategies::OAuth2
+      option :name, 'campus'
+      option :client_options, {
+              :site => 'http://community3dev.devcloud.acquia-sites.com/api',
+              :proxy => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil
+      }
 
+      uid { raw_info['uid'] }
 
-        attr_accessor :access_token
+      info do
+        {
+          :id => raw_info['id'],
+          :name => raw_info['name'],
+          :email => raw_info['email'],
 
-
-            #site' 'http://community3dev.devcloud.acquia-sites.com/api'
-
-        #option :client_options, {]
-        #    :site => 'http://community3dev.devcloud.acquia-sites.com/api',
-        #    :authorize_url => 'https://www.vistacampus.org/login/oauth/authorize',
-        #    :token_url => 'https://www.vistacampus.org/login/oauth/access_token'
-#
-#        }
-        #
-
-
-         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
-  form = OmniAuth::Form.new(:title => "User Info", :url => callback_path)
-  options.fields.each do |field|
-    form.text_field field.to_s.capitalize.gsub("_", " "), field.to_s
-  end
-  form.button "Sign In"
-  form.to_response
-end
-
-      uid {raw_info['uid']}
-
-        info do {
-            name: raw_info['name'],
-            email: raw_info['email']
-        }
-        end
+      extra do
+        { :raw_info => raw_info }
+      end
 
-        def raw_info
-        @raw_info ||= MultiJson.decode(access_token.get('/me').body )
-        end
+      def raw_info
+        @raw_info ||= MultiJson.load(access_token.get('/users').body)['users'][0]['user']
+      rescue ::Errno::ETIMEDOUT
+        raise ::Timeout::Error
+      end
 
     end
   end
 end
-
-
-

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end
 

data/omniauth-campus.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
-  #spec.add_runtime_dependency 'omniauth-oauth2', '~> 1.1', '>= 1.1.1'
+  #spec.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
+  spec.add_runtime_dependency 'omniauth-oauth2', '~> 1.1', '>= 1.1.1'
   #spec.add_runtime_dependency 'oauth'
   #spec.add_dependency 'oauth2', '~> 0.8.0'
   spec.add_dependency 'faraday', ['>= 0.8', '<0.10']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-campus
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - johnvehr
@@ -39,19 +39,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth
+  name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement