omniauth-campus 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b3624ed9f880116dc64155630ae4fc797ba426c
-  data.tar.gz: 762766d465585783b4e5148b3af69eab8316b1a4
+  metadata.gz: d61b4d1bcc51de8749c20cecdc0bd617eb527ae9
+  data.tar.gz: de1664a6603236f29b5220ef4af39ca266807bab
 SHA512:
-  metadata.gz: eaea6b184428695052ec587b030f6cd94195a5be8f9ce997fce2c9e7a341455998d0e389675b59f0146047a934f078ebff7bed37931a0b7302050ea6cb064def
-  data.tar.gz: 7c0fd8883d467cd8d0ff984f591829fd57670b78cf00854fd469839b03474d1bad50b175a6c5242f7d003baa6968ce332e6a4719c68380950a718dfc31dc9914
+  metadata.gz: 83c7b5f71e720833372a7f20ebd3bd3f7c84a4f4a0e5819b9bbd42972abb38cc23148ee863050f224d1e7f9099819aabb502ea052a5022171690211d57f370de
+  data.tar.gz: 9e790a4095aa4e48c3754b525e6d0393c048be46d7a7e00e68b831ae59ecd51cd948b6ca205fd54b16205735b4fc6a988303f42133f6f54eb53b740287823c38

data/lib/omniauth/strategies/campus.rb

@@ -1,4 +1,4 @@
-require 'oauth2'
+require 'oauth'
 #require 'oauth'
 require 'omniauth'
 require 'multi_json'
@@ -18,12 +18,13 @@ module OmniAuth
         include OmniAuth::Strategy
 
         option :name, 'campus'
-        args [:client_id, :client_secret]
+        args [:consumer_key, :consumer_secret]
         #option :consumer_key, "YzjVHuk8xoXCTcNwYg57yiCW5w59tucC"
         #option :consumer_secret, "ZDrWuDsunNkRroU5psb6QyMmT86XkYST"
         option :client_options, {
-            authorize_url: '/oauth/authorize',
-            token_url: '/oauth/token',
+            access_token_path: '/oauth/access_token',
+            authorize_path: '/oauth/authorize',
+            request_token_path: '/oauth/request_token',
             site: 'http://vistacampus.org'
         }
 
@@ -62,32 +63,9 @@ module OmniAuth
         }
         end
 
-        def callback_url
-        options.authorize_params.callback_url or super
-      end
-
-        def request_phase
-        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(options.authorize_params))
-      end
-
         def raw_info
-        @raw_info ||= access_token.get('/api/v1/me.json').parsed
-      rescue ::Errno::ETIMEDOUT
-        raise ::Timeout::Error
-      end
-
-        def build_access_token
-        token_params = options.token_params.merge({
-            code:          request.params['code'],
-            redirect_uri:  callback_url,
-            client_id:     client.id,
-            client_secret: client.secret
-          })
-
-        client.get_token(token_params, deep_symbolize(options.auth_token_params))
-      end
-
-
+        @raw_info ||= MultiJson.decode( access_token.get('/users/me').body )["users"].first
+        end
 
     end
   end

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.4.5"
+    VERSION = "0.4.6"
   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', '~> 1.0'
-  spec.add_runtime_dependency 'omniauth-oauth2', '~> 1.1.1'
+  spec.add_runtime_dependency 'omniauth', '~> 1.0'
+  #spec.add_runtime_dependency 'omniauth-oauth2', '~> 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.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - johnvehr
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth2
+  name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement