omniauth-campus 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36b9b46d367ade70cb22b57ca862942db5ff7bc
-  data.tar.gz: da02ca398497e87bc569606b14aea493bf7b3f58
+  metadata.gz: 906a0718fa48d59ead21b2ffa93e81dcdeb3b7b9
+  data.tar.gz: df946044012de80f8141aef8656151c1aa514460
 SHA512:
-  metadata.gz: 07fbc928226308b24e475424a7b02c8d52a6794db67694171da61dcef582868e0ef13651a443cf6b9a6c6767acee342bc59ed4a2782931343cf65b3bb0127852
-  data.tar.gz: 794155355488f1db0b65ee324a90a35d7b587f202ce6f9fe9a46d5963238fef568dcfc768b18526e9fad6b6ad8a4c64a1b98ae062695bd9c3adb66fe7d1c4a19
+  metadata.gz: f5a2f5bf7c2e8ee948bee97e7d308f2ae1afbd907a98733b7c2d664b8317f4f4dabce6d693015cad334d6e4b72102dc1ad00129c425f5acd7facbe961f47d933
+  data.tar.gz: 81648f274247e04161540b82971ef19e06b0ba87b58efded82318a4a8a7ec020d7d9464f4b1ed3a33f6935feb91871b4530dbb043c480e207d59a9bcde4bba0f

data/lib/omniauth/strategies/campus.rb

@@ -1,7 +1,8 @@
-require 'oauth2'
+require 'oauth'
 #require 'oauth'
 require 'omniauth'
 require 'multi_json'
+require 'net/http'
 require 'uri'
 
 #require 'rack/utils'
@@ -13,32 +14,18 @@ module OmniAuth
         include OmniAuth::Strategy
 
         option :name, 'campus'
-        args [:consumer_key, :consumer_secret]
+        args [:consumer_key, :consumer_secret, :endpoint]
+        option :endpoing, 'http://community3dev.devcloud.acquia-sites.com/api'
         option :consumer_key, nil
         option :consumer_secret, nil
+        option :authorize_params, {}
+        option :request_params, {}
 
-        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 => "www.vistacampus.org/",
-            :token_url => '/oauth/access_token',
-            :ssl => {:version => "SSLv3"}
-        }
         option :fields, [:name, :email]
 
-        option :access_token_options, {
-        :header_format => 'OAuth %s',
-        :param_name => 'access_token'
-      }
 
       attr_accessor :access_token
 
-      def client
-        ::OAuth2::Client.new(options.consumer_id, options.consumer_secret, deep_symbolize(options.client_options))
-      end
 
 
             #site: 'http://community3dev.devcloud.acquia-sites.com/api'
@@ -61,23 +48,59 @@ module OmniAuth
             form.to_response
         end
 
+        def callback_phase
+            return fail!(:invalid_credentials) if !authentication_response
+            return fail!(:invalid_credentials) if authentication_response.code.to_i >= 400
+            super
+        end
 
-        uid {raw_info['uid']}
-
-        info do {
-            name: raw_info['name'],
-            email: raw_info['email']
-        }
+        def api_uri
+            options.endpoint
         end
 
-        extra do
-            raw_info
+        def name
+            request['name']
         end
 
-        def raw_info
-            @raw_info ||= MultiJson.decode(access_token.get('/me')).body
+        def email
+            request['email']
         end
 
+
+       #uid {raw_info['uid']}
+
+        #info do {
+        #    name: raw_info['name'],
+        #    email: raw_info['email']
+        #}
+        #end
+#
+#        extra do
+#            raw_info
+#        end
+
+#        def raw_info
+#            @raw_info ||= MultiJson.decode(access_token.get('/me')).body
+#        end
+
+        def authentication_response
+          unless @authentication_response
+            return unless name && email
+
+            uri = URI(api_uri)
+            http = Net::HTTP.new(uri.host, uri.port)
+            if uri.scheme == 'https'
+              http.use_ssl = true
+              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            end
+
+            req = Net::HTTP::Get.new(uri.request_uri)
+            req.basic_auth name, email
+            @authentication_response = http.request(req)
+          end
+
+          @authentication_response
+        end
     end
   end
 end

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end
 

data/omniauth-campus.gemspec

@@ -21,8 +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_dependency 'oauth2', '~> 0.8.0'
+  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.3
+  version: 0.2.4
 platform: ruby
 authors:
 - johnvehr
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement