omniauth-lyft 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cea8e5a986d40fab33e9279a5aa78d090b283f97
-  data.tar.gz: 0e4938fa1a491912fde8cfeabe1634e93b1065e9
+  metadata.gz: eb92324268160dfb558ef9e14002d1a0e29203b5
+  data.tar.gz: 3fa3b1618d46c1e499bd29a6e99f11f5bd50ca51
 SHA512:
-  metadata.gz: 56dd1a379253228eee104dfc0dd6f305f5642230a540c4896b5843b91aac95486aca9029c709abfbe68deb95feaa992474a30ac4e8a1ecfca964a19a0333a521
-  data.tar.gz: 7827d53d48959a6a963eda604f9670af7439929166a96fb59764967951a8d2bb54208be1b8df5e9d89620135e02e9f424b4b7bb5388bb1ac41cbf3aa14bb658d
+  metadata.gz: c3e0b93d9cb43708edb57682092de2d2099c1fcc80f1275fc36f384452f8cd6265eb4dbf50ea736cf8ce03568497174e8ce71e8da849f37e7167fe86ff723676
+  data.tar.gz: d2a52d7c8290d055a39932db3a4415e86f95ef5dd92f60216477fa5cf539113656edc78a3d1b8c2cad076278f4289b1f790ad39468b95b8677cb0c9ed6ec58ec

data/lib/omniauth/lyft/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Lyft
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/omniauth/strategies/lyft.rb

@@ -1,45 +1,46 @@
 require 'omniauth-oauth2'
 
+# Shamelessly lifted from @rforgeon: https://github.com/rforgeon/dash-api/blob/master/lib/omniauth/strategies/lyft.rb
+
 module OmniAuth
   module Strategies
     class Lyft < OmniAuth::Strategies::OAuth2
-      DEFAULT_SCOPE = 'profile'
-
-      option :client_options, :site          => 'https://api.lyft.com',
-                              :authorize_url => 'https://api.lyft.com/oauth/authorize',
-                              :token_url     => 'https://api.lyft.com/oauth/token'
-
-      uid { raw_info['uuid'] }
-
-      info do
-        {
-          :first_name => raw_info['first_name'],
-          :last_name  => raw_info['last_name'],
-          :email      => raw_info['email'],
-          :picture    => raw_info['picture'],
-          :promo_code => raw_info['promo_code']
-        }
-      end
 
-      extra do
-        {
-          :raw_info => raw_info
-        }
-      end
+      # Give your strategy a name.
+      option :name, "lyft"
+
+      # This is where you pass the options you would pass when
+      # initializing your consumer from the OAuth gem.
+      option :client_options, {
+        site: "https://api.lyft.com/v1",
+        authorize_url: "https://api.lyft.com/oauth/authorize?response_type=code",
+        token_url: 'https://api.lyft.com/oauth/token'
+      }
+
+      option :authorize_options, [:scope]
+
+      option :token_params, :grant_type => 'authorization_code'
+
+      # These are called after authentication has succeeded. If
+      # possible, you should try to set the UID without making
+      # additional calls (if the user id is returned with the token
+      # or as a URI parameter). This may not be possible with all
+      # providers.
+
 
       def raw_info
-        @raw_info ||= access_token.get('/profile').parsed || {}
+        @raw_info ||= access_token.get("#{options[:client_options][:site]}/profile").parsed
       end
 
-      def request_phase
-        options[:authorize_params] = {
-          :client_id     => options['client_id'],
-          :response_type => 'code',
-          :scopes        => (options['scope'] || DEFAULT_SCOPE)
-        }
-
+      def build_access_token
+        options.token_params.merge!(:code => request.params["code"], :headers => {'Authorization' => basic_auth_header })
         super
       end
+
+      def basic_auth_header
+        "Basic " + Base64.strict_encode64("#{options[:client_id]}:#{options[:client_secret]}")
+      end
+
     end
   end
 end

data/spec/app.rb

@@ -11,7 +11,7 @@ Dotenv.load
 enable :sessions
 
 use OmniAuth::Builder do
-  provider :lyft, ENV['CLIENT_ID'], ENV['CLIENT_SECRET'] # , :scope => 'profile'
+  provider :lyft, 'raJvYFp-ZFhN', 'wRqziw1FYxz2iiL22i7d3HKe3p4qazSh', :scope => 'profile rides.request'
 end
 
 get '/' do

data/spec/omniauth/strategies/lyft_spec.rb

@@ -15,11 +15,11 @@ describe OmniAuth::Strategies::Lyft do
     end
 
     it 'should have correct site' do
-      expect(subject.options.client_options.site).to eq('https://api.lyft.com')
+      expect(subject.options.client_options.site).to eq('https://api.lyft.com/v1')
     end
 
     it 'should have correct authorize url' do
-      expect(subject.options.client_options.authorize_url).to eq('https://api.lyft.com/oauth/authorize')
+      expect(subject.options.client_options.authorize_url).to eq('https://api.lyft.com/oauth/authorize?response_type=code')
     end
 
     it 'should have correct access token url' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-lyft
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Chris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth