omniauth-campus 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c6ab4e15231c614c5cfa4341e3ad05ac630815e
-  data.tar.gz: 585dc3acb07de42dc99d0e2764d8ed6a424301cb
+  metadata.gz: 0b3624ed9f880116dc64155630ae4fc797ba426c
+  data.tar.gz: 762766d465585783b4e5148b3af69eab8316b1a4
 SHA512:
-  metadata.gz: d5b90a753a922d1b41f61c4db21b3e1329108b2d75d6b51581958d9d5818049460c0ca835c08212eeab6ccf4ff45fd6a79da7b2639f6a6f374b509b428abf772
-  data.tar.gz: e01c4ff107dcd85c348ca09a55708a3ebf531dcc6b79554c09a280d3189efcae7baa353adeb7da10e93bf5c6ca92287e69a9c746c2eb8135d9d439d3cb4e702e
+  metadata.gz: eaea6b184428695052ec587b030f6cd94195a5be8f9ce997fce2c9e7a341455998d0e389675b59f0146047a934f078ebff7bed37931a0b7302050ea6cb064def
+  data.tar.gz: 7c0fd8883d467cd8d0ff984f591829fd57670b78cf00854fd469839b03474d1bad50b175a6c5242f7d003baa6968ce332e6a4719c68380950a718dfc31dc9914

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.4.4"
+    VERSION = "0.4.5"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -1,4 +1,4 @@
-require 'oauth'
+require 'oauth2'
 #require 'oauth'
 require 'omniauth'
 require 'multi_json'
@@ -18,23 +18,25 @@ module OmniAuth
         include OmniAuth::Strategy
 
         option :name, 'campus'
-        args [:consumer_key, :consumer_secret, :endpoint]
-        option :endpoint, 'http://community3dev.devcloud.acquia-sites.com/api'
-        option :consumer_key, "YzjVHuk8xoXCTcNwYg57yiCW5w59tucC"
-        option :consumer_secret, "ZDrWuDsunNkRroU5psb6QyMmT86XkYST"
-        option :authorize_params, {}
-        option :request_params, {}
+        args [:client_id, :client_secret]
+        #option :consumer_key, "YzjVHuk8xoXCTcNwYg57yiCW5w59tucC"
+        #option :consumer_secret, "ZDrWuDsunNkRroU5psb6QyMmT86XkYST"
+        option :client_options, {
+            authorize_url: '/oauth/authorize',
+            token_url: '/oauth/token',
+            site: 'http://vistacampus.org'
+        }
 
         option :fields, [:name, :email]
 
+        option :auth_token_params, {
+            param_name: 'access_token',
+            mode: :query
+        }
 
-      attr_accessor :access_token
 
-      def request_phase
-        response = Rack::Response.new
-        response.redirect(options.endpoint)
-        response.finish
-      end
+
+      attr_accessor :access_token
 
 
 
@@ -52,14 +54,39 @@ module OmniAuth
 
 
 
-        uid {request['uid']}
+        uid {raw_info['uid']}
 
         info do {
-            name: request['name'],
-            email: request['email']
+            name: raw_info['name'],
+            email: raw_info['email']
         }
         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
+
 
 
     end

data/omniauth-campus.gemspec

@@ -20,7 +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', '~> 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.4
+  version: 0.4.5
 platform: ruby
 authors:
 - johnvehr
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        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.1
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement