omniauth-campus 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11d76f850d83a2c32e4029f8deee0183beaa763d
-  data.tar.gz: 5108dbbd16f99e2f2d47c967d40075617eda4b84
+  metadata.gz: d8f3502ca0c026e3ac77aa9a953bff5cf30b1167
+  data.tar.gz: 490ad205651c633aaadbe77db0ac99c7c05afcec
 SHA512:
-  metadata.gz: 20c186d4867f97d23297ba00d3caf5f5c7844e92aedf8c3b1a0faf5c2399be6f67ee5b960bb08b9eddf461c2e2104152f27026adff5276f47f4e2fd85ec16724
-  data.tar.gz: 71bf53dee42371cc8fd925cfa69b5a8f7316e3a450d69aac62fa54512568a83333abf828aa3cac2c075b26205ccfb78c7698d045b33b26dd2397455fb95162d5
+  metadata.gz: 68f6c4d690704b8573ff37d6503b2a3f8d83118cb95929a135c3c05616aa923f1b220b83895c26d1b9f7ca7fa50cf000ccf53eb711ccc54bde95204ec7d80409
+  data.tar.gz: ec5eafef80568b337022a4f77d311a22c7f8f9a6812ec68c9db8d4d4ef0c66c057bb7e26c0bfd48093a6c739953db887a7361ce138e6f54fd331d650762a8f50

data/lib/omniauth/strategies/campus.rb

@@ -18,53 +18,31 @@ module OmniAuth
         option :consumer_key, nil
         option :consumer_secret, nil
 
-        option :client_options, {:authorize_path => '/oauth/authenticate',
-                               :site => 'http://dev-oauth-test.gotpantheon.com/myawesomejson',
-                               :proxy => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil}
+        #option :client_options, {:authorize_path => '/oauth/authenticate'
+                               #:site => 'http://dev-oauth-test.gotpantheon.com/myawesomejson',
+                               #:proxy => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil}
 
-      uid { access_token.params[:uid] }
 
-  info do
+        uid{ request.params['user_id'] }
+
+      info do
         {
-          :email => raw_info['email'],
           :name => raw_info['name'],
-           }
+          :location => raw_info['city']
+        }
       end
 
-
-        extra do
-        { :raw_info => raw_info }
+      extra do
+        {
+          'raw_info' => raw_info
+        }
       end
 
       def raw_info
-        @raw_info ||= MultiJson.load(access_token.get('/1.1/account/verify_credentials.json?include_entities=false&skip_status=true').body)
-      rescue ::Errno::ETIMEDOUT
-        raise ::Timeout::Error
+        @raw_info ||= MultiJson.decode(access_token.get('/me.json')).body
       end
 
-      alias :old_request_phase :request_phase
-
-      def request_phase
-        %w[force_login lang screen_name].each do |v|
-          if request.params[v]
-            options[:authorize_params][v.to_sym] = request.params[v]
-          end
-        end
 
-        %w[x_auth_access_type].each do |v|
-          if request.params[v]
-            options[:request_params][v.to_sym] = request.params[v]
-          end
-        end
-
-        if request.params['use_authorize'] == 'true'
-          options[:client_options][:authorize_path] = '/oauth/authorize'
-        else
-          options[:client_options][:authorize_path] = '/oauth/authenticate'
-        end
-
-        old_request_phase
-      end
       end
   end
 end

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "1.1"
+    VERSION = "1.2"
   end
 end
 

metadata

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