omniauth-campus 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f430848d7a3c9fb3b749f702dfa72f6835d13c
-  data.tar.gz: ef1b240908d2aa9c677fd297006d52836f7dbd9e
+  metadata.gz: 7744bb8ce6c6137b8a4aaaaf8f76eaa0cb5913be
+  data.tar.gz: f9058de3aaccee16fbd4144845a2543b22ff8dc0
 SHA512:
-  metadata.gz: 57aa1b0fa61831d63046ec0a9edadb633f83326f7a4761ae4d296f2a5d3b43a3a1a9948fb69954abd1ca1ff77463d6edd9c0a108ff2d1b28feb583f4ab6a0a1c
-  data.tar.gz: 9f4edf8b516030280fb7adcd8ad6bf77a39eb004c5dbc53a11921bb7ae474752d11e166ad6416556dcd69852219235b293a3ce98d0772e97f12ebfe85b3e162b
+  metadata.gz: 57106fbdb104c035894c9e1e2ed4f8313a6188f103eb355500080c54c17ad63b9fcdb2dd38806c56bf655933ae6b75092c614eda25202815aaeab598445b79e0
+  data.tar.gz: 6d10dcb69500cc56fedd148d4cb9b6767ca36ab2ed563420a324490cf2194228a9e82a6eecdc97d6e31030582b73c69606f3675fefa8357bec74cd778961c52a

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.5.9"
+    VERSION = "0.6.0"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -1,4 +1,4 @@
-require "omniauth"
+require "omniauth-oauth2"
 require 'multi_json'
 require 'faraday'
 require 'net/http'
@@ -12,21 +12,26 @@ require 'uri'
 module OmniAuth
   module Strategies
     # Your code goes here...
-    class Campus
-        include OmniAuth::Strategy
+    class Campus < OmniAuth::Strategies::OAuth2
 
-        args [:client_id, :client_secret, :endpoint]
+        DEFAULT_RESPONSE_TYPE = 'code'
+        DEFAULT_GRANT = 'authorization_code'
+
+        option :name, 'campus'
+        args [:client_id, :client_secret]
         #option :consumer_key, "YzjVHuk8xoXCTcNwYg57yiCW5w59tucC"
         #option :consumer_secret, "ZDrWuDsunNkRroU5psb6QyMmT86XkYST"
         option :client_options, {
-            client_id: nil,
-            client_secret: nil,
+            token_url: '/oauth/access_token',
+            authorize_url: '/oauth/authorize',
             #request_token_path: '/oauth/request_token',
-            endpoint: 'https://community3dev.devcloud.acquia-sites.com/api'
+            site: 'http://community3dev.devcloud.acquia-sites.com/api'
         }
 
         option :fields, [:name, :email]
 
+        attr_accessor :access_token
+
 
             #site' 'http://community3dev.devcloud.acquia-sites.com/api'
 
@@ -38,21 +43,6 @@ module OmniAuth
 #        }
         #
 
-        def request_phase
-        form = OmniAuth::Form.new(:title => "User Info", :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 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']}
 
@@ -63,41 +53,12 @@ module OmniAuth
         end
 
         def raw_info
-        @raw_info ||= MultiJson.decode(access_token.get(@authentication_response).body )
-        end
-
-        def api_uri
-            options.endpoint
-        end
-
-        def name
-            request['name']
-        end
-
-        def email
-            request['email']
-        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
+        @raw_info ||= MultiJson.decode(access_token.get('/me').body )
         end
 
     end
   end
 end
 
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-campus
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - johnvehr