omniauth-campus 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fef39e076b6c20d3bbdebe70e7613e0f94187d3
-  data.tar.gz: 75ad73e23db32c536f8c7041627b0067bab97a2e
+  metadata.gz: 84d8b42e36087c256a8c423496008d1e4232d6c9
+  data.tar.gz: bb5b6cb310dd1a8bc8146b595989d447cb1928fe
 SHA512:
-  metadata.gz: a5764a3a2a9e3199c094beb97cb483361f02125481315f07ddc25b4f36ae19944f85badf4278c1c6209adc050c3cea0cef712717f02c95252d7e5f658cddc58c
-  data.tar.gz: 14ad0a5e5155a4317ff2c7ad864171c64c84c32b6f19c8efc23808665723705b5542f849cd6f636d00979e4cfa56a539d372be9a39b2f0ee7483c75d0c9423f8
+  metadata.gz: f08bb406e2a21ccaf8d68af4c3a37dc84b7e29a02c22c3bfcee5998a1942a5c6372d3ef158c1434a414d0d6e451902cec3d913a97ba6a57a41f9d349b06c406d
+  data.tar.gz: 57e3221478813c102c404323a6e262a346f4874ce94d655d6117c47e6f17062afc26f002a314f5aae860a8b00ffc893d4c810a650dcc67cbabb5a99b93eb3dec

data/lib/omniauth/strategies/campus.rb

@@ -2,7 +2,7 @@ require 'oauth'
 #require 'oauth'
 require 'omniauth'
 require 'multi_json'
-require 'omniauth-http-basic'
+require 'net/http'
 require 'uri'
 
 #require 'rack/utils'
@@ -18,7 +18,8 @@ module OmniAuth
         option :endpoint, 'http://community3dev.devcloud.acquia-sites.com/api'
         option :consumer_key, "YzjVHuk8xoXCTcNwYg57yiCW5w59tucC"
         option :consumer_secret, "ZDrWuDsunNkRroU5psb6QyMmT86XkYST"
-
+        option :authorize_params, {}
+        option :request_params, {}
 
         option :fields, [:name, :email]
 
@@ -47,51 +48,29 @@ module OmniAuth
             form.to_response
         end
 
-
-        def api_uri
-            options.endpoint
+        def callback_phase
+            return fail!(:invalid_credentials) if !authentication_response
+            return fail!(:invalid_credentials) if authentication_response.code.to_i >= 400
+            super
         end
 
-        def name
-            request['name']
-        end
 
-        def email
-            request['email']
-        end
+        uid {raw_info['uid']}
 
+        info do {
+            name: raw_info['name'],
+            email: raw_info['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)
-            http.use_ssl = OpenSSL::SSL::VERIFY_PEER
-
-            req = Net::HTTP::Get.new(uri.request_uri)
-            req.basic_auth name, email
-            @authentication_response = http.request(req)
-          end
+        extra do
+            raw_info
+        end
 
-          @authentication_response
+        def raw_info
+            @raw_info ||= MultiJson.decode(access_token.get('')).body
         end
+
     end
   end
 end

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end
 

data/omniauth-campus.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_runtime_dependency 'omniauth', '~> 1.0'
   spec.add_runtime_dependency 'oauth'
-  spec.add_dependency 'omniauth-http-basic', '~> 1.0'
   #spec.add_dependency 'oauth2', '~> 0.8.0'
   spec.add_dependency 'faraday', ['>= 0.8', '<0.10']
   spec.add_dependency 'multi_json', '~> 1.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-campus
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - johnvehr
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: omniauth-http-basic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement