omniauth-linkedin-oauth2 0.1.5 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c1ea4a52194f6a78191049881d96bf753e48037
-  data.tar.gz: fd5aeb28503ef56bba18876b5784b755585cbbb6
+  metadata.gz: ab29207dc1df42074dfd2f67013de227d2c6975d
+  data.tar.gz: 2228ae416dc859c6de0e475e5af90f3becba4160
 SHA512:
-  metadata.gz: c703d367e0f9922e72d5bc2f73e10c8f926d4038a2abb77897f4a3e070445076d1557ddd04eeb8724207e981838c5ddd72792a95062a5ce0bc1ba3c4e1394245
-  data.tar.gz: 76cccbed6fac06e22be7e027056a3099c3b4870cc2c6b6cbaa7fe4895bd835bf19cf9b14a6888b057bb160cc74c56fcd149714f2f0ead1d294496a85434f1cb9
+  metadata.gz: 61991a55b3fd1294691f8be37afa2abca4812fb6f48b381bca66fa3e8655862cb6f0fe7e866a523f0d59467a610c5c8185252d2c37e8e2e997da56f59a38f0b6
+  data.tar.gz: 1cdae475837c9c89d7d41769f73799754c84b92f80686502e87b30919c9d3f380c27836804d23977d709c14c11514afcce8554a7a9235427644f07b2413830a4

data/README.md

@@ -71,6 +71,10 @@ provider :linkedin, ENV['LINKEDIN_KEY'], ENV['LINKEDIN_SECRET'], :fields => ['id
 
 To see a complete list of available fields, consult the LinkedIn documentation at: https://developer.linkedin.com/documents/profile-fields
 
+## Other Options
+
+* `secure_image_url` - Set to `true` to use https for the profile picture url. Default is `false`.
+
 ## Contributing
 
 1. Fork it

data/lib/omniauth-linkedin-oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module LinkedInOAuth2
-    VERSION = "0.1.5"
+    VERSION = "0.2.5"
   end
 end

data/lib/omniauth/strategies/linkedin.rb

@@ -10,8 +10,8 @@ module OmniAuth
       # initializing your consumer from the OAuth gem.
       option :client_options, {
         :site => 'https://api.linkedin.com',
-        :authorize_url => 'https://www.linkedin.com/uas/oauth2/authorization?response_type=code',
-        :token_url => 'https://www.linkedin.com/uas/oauth2/accessToken'
+        :authorize_url => 'https://www.linkedin.com/oauth/v2/authorization?response_type=code',
+        :token_url => 'https://www.linkedin.com/oauth/v2/accessToken'
       }
 
       option :scope, 'r_basicprofile r_emailaddress'
@@ -44,6 +44,10 @@ module OmniAuth
         { 'raw_info' => raw_info }
       end
 
+      def callback_url
+        full_host + script_name + callback_path
+      end
+
       alias :oauth2_access_token :access_token
 
       def access_token
@@ -56,11 +60,17 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get("/v1/people/~:(#{options.fields.join(',')})?format=json").parsed
+        @raw_info ||= access_token.get("/v1/people/~:(#{option_fields.join(',')})?format=json").parsed
       end
 
       private
 
+      def option_fields
+        fields = options.fields
+        fields.map! { |f| f == "picture-url" ? "picture-url;secure=true" : f } if !!options[:secure_image_url]
+        fields
+      end
+
       def user_name
         name = "#{raw_info['firstName']} #{raw_info['lastName']}".strip
         name.empty? ? nil : name

data/omniauth-linkedin-oauth2.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bundler', '~> 1.3'
   gem.add_development_dependency 'rake'
 
-  gem.add_development_dependency 'rspec', '~> 2.13.0'
+  gem.add_development_dependency 'rspec', '~> 2.14.1'
   gem.add_development_dependency 'simplecov'
 end

data/spec/omniauth/strategies/linkedin_spec.rb

@@ -5,82 +5,86 @@ describe OmniAuth::Strategies::LinkedIn do
   subject { OmniAuth::Strategies::LinkedIn.new(nil) }
 
   it 'should add a camelization for itself' do
-    OmniAuth::Utils.camelize('linkedin').should == 'LinkedIn'
+    expect(OmniAuth::Utils.camelize('linkedin')).to eq('LinkedIn')
   end
 
   describe '#client' do
     it 'has correct LinkedIn site' do
-      subject.client.site.should eq('https://api.linkedin.com')
+      expect(subject.client.site).to eq('https://api.linkedin.com')
     end
 
     it 'has correct authorize url' do
-      subject.client.options[:authorize_url].should eq('https://www.linkedin.com/uas/oauth2/authorization?response_type=code')
+      expect(subject.client.options[:authorize_url]).to eq('https://www.linkedin.com/oauth/v2/authorization?response_type=code')
     end
 
     it 'has correct token url' do
-      subject.client.options[:token_url].should eq('https://www.linkedin.com/uas/oauth2/accessToken')
+      expect(subject.client.options[:token_url]).to eq('https://www.linkedin.com/oauth/v2/accessToken')
     end
   end
 
   describe '#callback_path' do
     it 'has the correct callback path' do
-      subject.callback_path.should eq('/auth/linkedin/callback')
+      expect(subject.callback_path).to eq('/auth/linkedin/callback')
     end
   end
 
   describe '#uid' do
     before :each do
-      subject.stub(:raw_info) { { 'id' => 'uid' } }
+      allow(subject).to receive(:raw_info) { { 'id' => 'uid' } }
     end
 
     it 'returns the id from raw_info' do
-      subject.uid.should eq('uid')
+      expect(subject.uid).to eq('uid')
     end
   end
 
   describe '#info' do
     before :each do
-      subject.stub(:raw_info) { {} }
+      allow(subject).to receive(:raw_info) { {} }
     end
 
     context 'and therefore has all the necessary fields' do
-      it { subject.info.should have_key :name }
-      it { subject.info.should have_key :email }
-      it { subject.info.should have_key :nickname }
-      it { subject.info.should have_key :first_name }
-      it { subject.info.should have_key :last_name }
-      it { subject.info.should have_key :location }
-      it { subject.info.should have_key :description }
-      it { subject.info.should have_key :image }
-      it { subject.info.should have_key :urls }
+      it { expect(subject.info).to have_key :name }
+      it { expect(subject.info).to have_key :email }
+      it { expect(subject.info).to have_key :nickname }
+      it { expect(subject.info).to have_key :first_name }
+      it { expect(subject.info).to have_key :last_name }
+      it { expect(subject.info).to have_key :location }
+      it { expect(subject.info).to have_key :description }
+      it { expect(subject.info).to have_key :image }
+      it { expect(subject.info).to have_key :urls }
     end
   end
 
   describe '#extra' do
     before :each do
-      subject.stub(:raw_info) { { :foo => 'bar' } }
+      allow(subject).to receive(:raw_info) { { :foo => 'bar' } }
     end
 
-    it { subject.extra['raw_info'].should eq({ :foo => 'bar' }) }
+    it { expect(subject.extra['raw_info']).to eq({ :foo => 'bar' }) }
   end
 
   describe '#access_token' do
     before :each do
-      subject.stub(:oauth2_access_token) { double('oauth2 access token', :expires_in => 3600, :expires_at => 946688400).as_null_object }
+      allow(subject).to receive(:oauth2_access_token) { double('oauth2 access token', :expires_in => 3600, :expires_at => 946688400).as_null_object }
     end
 
-    it { subject.access_token.expires_in.should eq(3600) }
-    it { subject.access_token.expires_at.should eq(946688400) }
+    it { expect(subject.access_token.expires_in).to eq(3600) }
+    it { expect(subject.access_token.expires_at).to eq(946688400) }
   end
 
   describe '#raw_info' do
     before :each do
+      access_token = double('access token')
       response = double('response', :parsed => { :foo => 'bar' })
-      subject.stub(:access_token) { double('access token', :get => response) }
+      expect(access_token).to receive(:get).with("/v1/people/~:(baz,qux)?format=json").and_return(response)
+
+      allow(subject).to receive(:option_fields) { ['baz', 'qux'] }
+      allow(subject).to receive(:access_token) { access_token }
     end
 
     it 'returns parsed response from access token' do
-      subject.raw_info.should eq({ :foo => 'bar' })
+      expect(subject.raw_info).to eq({ :foo => 'bar' })
     end
   end
 
@@ -91,8 +95,27 @@ describe OmniAuth::Strategies::LinkedIn do
       end
 
       it 'sets default scope' do
-        subject.authorize_params['scope'].should eq('r_basicprofile r_emailaddress')
+        expect(subject.authorize_params['scope']).to eq('r_basicprofile r_emailaddress')
       end
     end
   end
+
+  describe '#option_fields' do
+    it 'returns options fields' do
+      subject.stub(:options => double('options', :fields => ['foo', 'bar']).as_null_object)
+      expect(subject.send(:option_fields)).to eq(['foo', 'bar'])
+    end
+
+    it 'http avatar image by default' do
+      subject.stub(:options => double('options', :fields => ['picture-url']))
+      allow(subject.options).to receive(:[]).with(:secure_image_url).and_return(false)
+      expect(subject.send(:option_fields)).to eq(['picture-url'])
+    end
+
+    it 'https avatar image if secure_image_url truthy' do
+      subject.stub(:options => double('options', :fields => ['picture-url']))
+      allow(subject.options).to receive(:[]).with(:secure_image_url).and_return(true)
+      expect(subject.send(:option_fields)).to eq(['picture-url;secure=true'])
+    end
+  end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-linkedin-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.5
 platform: ruby
 authors:
 - Décio Ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   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: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A LinkedIn OAuth2 strategy for OmniAuth.
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A LinkedIn OAuth2 strategy for OmniAuth.