omniauth-campus 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67627e723de80738c791907eeb6d7b3569e1fe2c
-  data.tar.gz: 597401fd1122f2ba52a89a98bc87d3fd477f49df
+  metadata.gz: a9f430848d7a3c9fb3b749f702dfa72f6835d13c
+  data.tar.gz: ef1b240908d2aa9c677fd297006d52836f7dbd9e
 SHA512:
-  metadata.gz: 993538711c5b393162aa122ebde78566cf712f01d868a857b7cb467bbafb3d7904aaeb3fc746a542682d626810cdb75e682171b520faee56601bb6fea61d1afd
-  data.tar.gz: 6ab62ed7eb38e31e5cc957238c1a84d2b099a104275ebaa3df7928dd3dbde5c67f82f0be98cac8ed58fcf1fee90f08a139e76a8ab48f4547c41183b83f0fd59d
+  metadata.gz: 57aa1b0fa61831d63046ec0a9edadb633f83326f7a4761ae4d296f2a5d3b43a3a1a9948fb69954abd1ca1ff77463d6edd9c0a108ff2d1b28feb583f4ab6a0a1c
+  data.tar.gz: 9f4edf8b516030280fb7adcd8ad6bf77a39eb004c5dbc53a11921bb7ae474752d11e166ad6416556dcd69852219235b293a3ce98d0772e97f12ebfe85b3e162b

data/lib/omniauth-campus/version.rb

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

data/lib/omniauth/strategies/campus.rb

@@ -1,4 +1,4 @@
-require "omniauth-oauth2"
+require "omniauth"
 require 'multi_json'
 require 'faraday'
 require 'net/http'
@@ -12,20 +12,17 @@ require 'uri'
 module OmniAuth
   module Strategies
     # Your code goes here...
-    class Campus < OmniAuth::Strategies::OAuth2
+    class Campus
+        include OmniAuth::Strategy
 
-        DEFAULT_RESPONSE_TYPE = 'code'
-        DEFAULT_GRANT = 'authorization_code'
-
-        option :name, 'campus'
-        args [:client_id, :client_secret]
+        args [:client_id, :client_secret, :endpoint]
         #option :consumer_key, "YzjVHuk8xoXCTcNwYg57yiCW5w59tucC"
         #option :consumer_secret, "ZDrWuDsunNkRroU5psb6QyMmT86XkYST"
         option :client_options, {
-            token_url: '/oauth/access_token',
-            authorize_url: '/oauth/authorize',
+            client_id: nil,
+            client_secret: nil,
             #request_token_path: '/oauth/request_token',
-            site: 'http://community3dev.devcloud.acquia-sites.com/api'
+            endpoint: 'https://community3dev.devcloud.acquia-sites.com/api'
         }
 
         option :fields, [:name, :email]
@@ -41,25 +38,20 @@ module OmniAuth
 #        }
         #
 
-        def authorize_params
-        super.tap do |params|
-          params[:response_type] ||= DEFAULT_RESPONSE_TYPE
-          params[:client_id] = client.id
+        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
-      end
-
-      def token_params
-        super.tap do |params|
-          params[:grant_type] ||= DEFAULT_GRANT
-          params[:client_id] = client.id
-          params[:client_secret] = client.secret
+        form.button "Sign In"
+        form.to_response
         end
-      end
-
-       def request_phase
-  redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(options.authorize_params))
-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']}
@@ -71,7 +63,38 @@ end
         end
 
         def raw_info
-        @raw_info ||= MultiJson.decode(access_token.get('/me').body )
+        @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
         end
 
     end

metadata

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