omniauth-campus 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2e48a1c70a40a4c42083a4877ecb8ba58c7b87f
-  data.tar.gz: 6dd5345f7a93a7cf3266aa0fd89d7c32da24a269
+  metadata.gz: 9a3dc9cc4d549e8900c5630a91715580d7a4e963
+  data.tar.gz: a172090acfc9fcdc494a04e2d4b07b972cc3ef9b
 SHA512:
-  metadata.gz: 7fcad70abc4f9e57cc16da3d62e602263e5f6408de7f52dc21c366e618250bc565d4ff57f9802ba5870d10352fc4b4249e757123611c189a7ba8c7d137a6d0ba
-  data.tar.gz: 13401030493e204976332b1b1f829961953adb2ee10f3edc2e5005013a94e0ecd3ea53a61258b027016c1eb50cd9b686d8722b92d1ccbe2bdc80039bd1d95e2e
+  metadata.gz: e0fd69cf8113164e14f8d0a061f93a3e48f6f54515553b20e9f3c573734a2204dd23f6dd7f3f8bc1e42c7e45cd36a238efb3f27fc906bd78698a59f01fde32a2
+  data.tar.gz: 9d281bd205969fcc733f0cac9dd311574959baf6414626fad47d655e091c35ce138fa1acf0a2bc74ea286a8de0df8a6b6df47ca8ba16457f512fbcb3657151e8

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -1,6 +1,8 @@
-require 'oauth'
-require 'omniauth'
+require 'oauth2'
+#require 'oauth'
+#require 'omniauth'
 require 'multi_json'
+require 'uri'
 
 #require 'rack/utils'
 
@@ -16,15 +18,28 @@ module OmniAuth
         option :consumer_secret, nil
 
         option :client_options, {
-            :site => 'http://community3dev.devcloud.acquia-sites.com/api',
-            :token_url => "/oauth/request_token",
-            :access_url => "/oauth/request_access",
-            :authorize_path => "/oauth/authorize"
+            #:site => 'http://community3dev.devcloud.acquia-sites.com/api',
+            #:token_url => "/oauth/request_token",
+            #:access_url => "/oauth/request_access",
+            #:authorize_path => "/oauth/authorize"
 
+            :site => "www.vistacampus.org/",
+            :token_url => '/oauth/access_token',
+            :ssl => {:version => "SSLv3"}
         }
         option :fields, [:name, :email]
 
-        attr_reader :access_token
+        option :access_token_options, {
+        :header_format => 'OAuth %s',
+        :param_name => 'access_token'
+      }
+
+      attr_accessor :access_token
+
+      def client
+        ::OAuth2::Client.new(options.client_id, options.client_secret, deep_symbolize(options.client_options))
+      end
+
 
             #site: 'http://community3dev.devcloud.acquia-sites.com/api'
 
@@ -37,19 +52,17 @@ module OmniAuth
         #
         #
 
-        #def request_phase
-        #    form = OmniAuth::Form.new(:title => options.title, :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
         def request_phase
-            super
+            form = OmniAuth::Form.new(:title => options.title, :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['user_id']}
+
+        uid {raw_info['uid']}
 
         info do {
             name: raw_info['name'],
@@ -62,7 +75,7 @@ module OmniAuth
         end
 
         def raw_info
-            @raw_info ||= MultiJson.decode(access_token.get('/oauth/request_access')).body
+            @raw_info ||= MultiJson.decode(access_token.get('/me')).body
         end
 
     end

data/omniauth-campus.gemspec

@@ -21,7 +21,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 'oauth'
+  #spec.add_runtime_dependency 'oauth'
+  spec.add_dependency 'oauth2', '~> 0.8.0'
   spec.add_dependency 'faraday', ['>= 0.8', '<0.10']
   spec.add_dependency 'multi_json', '~> 1.3'
 end

metadata

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