omniauth-orcid 1.2 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODMzNWYwZWQyZTQ0MmZmZTk3MGRlNzhjNzU3ZTM3NDA4NzI0ODZjMw==
+    OTUxMmYyMzNkMWQ5MDY2NWY4MzlkZWY3Yjk2ZDljNDA3ZmU5YTQzZA==
   data.tar.gz: !binary |-
-    OGQzOTVkYmY4OWFhZjllY2VmZGY2MWY3NzFlMjMwN2RkOGI2NDQwOA==
+    ODFjZjAxOTA3MjFlMWY5ZDVkOGE2Y2MxMmNhOGI2NDg3YzZmN2VkMg==
 SHA512:
   metadata.gz: !binary |-
-    ZjQzZjkyZmVlNmQzZGRjODcwYjI3MWE1MjhhZmJmMzBmZGMyMGZhOWMwMjZi
-    YjRmYzM1MzViMThmODQyNGQ0MjRmYThlYzE4ZjJmNTY2MTVhMjFjOTcwYTUy
-    ZWFlZjYwMzZmMmZiY2IzNjY2Mjk4ZjYzNzUzZGVjYmY0ZmVlY2E=
+    MDE4YWFmMWVjODJiNTUwMDYzZGJjNDRjZDY5MmQ0NDU3OGZmM2ExYjYxMWEx
+    MTU5MjA1ZWQ5MmZhZTViZjQyYTE0NGU4MzAyYjUyODAxYTI1NzhlNGRiZjZk
+    OTYzNGYwNzAxNDczYzYwYzhhYzM1MWUxZWYxYTcyMTVlOWFhYTg=
   data.tar.gz: !binary |-
-    YjdiN2E0MWJhMzRmYTM2MzFmMzBjOGI4YzcyNjJiNmRiZWU5YzZjYmJiNGQw
-    Y2M4MzVhNTE0OTRlMzM5YzdmYTJhMzc2Mjg1OGNjYTM3NWJiYTk5MmQ0ZGNi
-    ZjE4ZmY3MDkxYThkY2RiZTM5ZTg1MGNkNGIyZjJlZjM4ZTAxNGE=
+    MWFhYjZhNTQxNDNhMDcwYTE1OWQ4Zjc5OWJjZGZmZjdkZDdmNDkyNTE3YTNm
+    MjEzMjMxZDlhYjM5NWMzZDU1NGFhZDY4NWRkZDQxZTRmOWJhYzllZDA5ZjUw
+    NWQ0MWNmYzg0YTY3MjMyMzRkYmM2ZjlhNDNkNThkNzIxOGIzMTI=

data/README.md

@@ -2,6 +2,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/omniauth-orcid.svg)](https://badge.fury.io/rb/omniauth-orcid)
 [![Build Status](https://travis-ci.org/datacite/omniauth-orcid.svg?branch=master)](https://travis-ci.org/datacite/omniauth-orcid)
+[![Test Coverage](https://codeclimate.com/github/datacite/omniauth-orcid/badges/coverage.svg)](https://codeclimate.com/github/datacite/omniauth-orcid/coverage)
+[![Code Climate](https://codeclimate.com/github/datacite/omniauth-orcid/badges/gpa.svg)](https://codeclimate.com/github/datacite/omniauth-orcid)
 [![DOI](https://zenodo.org/badge/15088/datacite/omniauth-orcid.svg)](https://zenodo.org/badge/latestdoi/15088/datacite/omniauth-orcid)
 
 ORCID OAuth 2.0 Strategy for the [OmniAuth Ruby authentication framework](http://www.omniauth.org).

data/lib/omniauth/orcid/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Orcid
-    VERSION = "1.2"
+    VERSION = "1.2.1"
   end
 end

data/lib/omniauth/strategies/orcid.rb

@@ -20,7 +20,8 @@ module OmniAuth
                                   :given_names,
                                   :family_names,
                                   :email,
-                                  :orcid]
+                                  :orcid,
+                                  :scope]
 
       args [:client_id, :client_secret]
 
@@ -31,20 +32,23 @@ module OmniAuth
         @options.client_options.api_base_url  = api_base_url
         @options.client_options.authorize_url = authorize_url
         @options.client_options.token_url     = token_url
-        @options.client_options.scope         = scope
       end
 
       # available options at https://members.orcid.org/api/get-oauthauthorize
       def authorize_params
         super.tap do |params|
-          options[:authorize_options].each do |k|
-            params[k] = request.params[k.to_s] unless [nil, ''].include?(request.params[k.to_s])
+          %w[scope redirect_uri show_login lang given_names family_names email orcid].each do |v|
+            if request.params[v]
+              params[v.to_sym] = request.params[v]
+            end
           end
 
           # show login form and not registration form by default
           params[:show_login] = 'true' if params[:show_login].nil?
 
           session['omniauth.state'] = params[:state] if params['state']
+
+          params[:scope] ||= scope
         end
       end
 
@@ -63,10 +67,10 @@ module OmniAuth
 
       def site
         case namespace
-        when 'sandbox' then 'http://api.sandbox.orcid.org'
-        when 'production' then 'http://api.orcid.org'
-        when 'public_sandbox' then 'http://pub.sandbox.orcid.org'
-        when 'public' then 'http://pub.orcid.org'
+        when 'sandbox' then 'https://api.sandbox.orcid.org'
+        when 'production' then 'https://api.orcid.org'
+        when 'public_sandbox' then 'https://pub.sandbox.orcid.org'
+        when 'public' then 'https://pub.orcid.org'
         end
       end
 
@@ -87,12 +91,7 @@ module OmniAuth
       end
 
       def token_url
-        case namespace
-        when 'sandbox' then 'https://api.sandbox.orcid.org/oauth/token'
-        when 'production' then 'https://api.orcid.org/oauth/token'
-        when 'public_sandbox' then 'https://pub.sandbox.orcid.org/oauth/token'
-        when 'public' then 'https://pub.orcid.org/oauth/token'
-        end
+        site + '/oauth/token'
       end
 
       def scope

data/omniauth-orcid.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rack-test', '~> 0.6.3'
   s.add_development_dependency 'webmock', '~> 1.22', '>= 1.22.3'
+  s.add_development_dependency 'codeclimate-test-reporter'
 end

data/spec/omniauth/strategies/orcid_spec.rb

@@ -31,11 +31,11 @@ describe OmniAuth::Strategies::ORCID do
 
     describe "default" do
       it 'should have correct site' do
-        expect(subject.options.client_options.site).to eq('http://pub.orcid.org')
+        expect(subject.options.client_options.site).to eq('https://pub.orcid.org')
       end
 
       it 'should have correct scope' do
-        expect(subject.options.client_options.scope).to eq('/authenticate')
+        expect(subject.authorize_params['scope']).to eq('/authenticate')
       end
 
       it 'should have correct token url' do
@@ -57,11 +57,11 @@ describe OmniAuth::Strategies::ORCID do
       end
 
       it 'should have correct site' do
-        expect(subject.options.client_options.site).to eq("http://pub.sandbox.orcid.org")
+        expect(subject.options.client_options.site).to eq("https://pub.sandbox.orcid.org")
       end
 
       it 'should have correct scope' do
-        expect(subject.options.client_options.scope).to eq("/authenticate")
+        expect(subject.authorize_params['scope']).to eq("/authenticate")
       end
 
       it 'should have correct token url' do
@@ -83,11 +83,11 @@ describe OmniAuth::Strategies::ORCID do
       end
 
       it 'should have correct site' do
-        expect(subject.options.client_options.site).to eq('http://api.orcid.org')
+        expect(subject.options.client_options.site).to eq('https://api.orcid.org')
       end
 
       it 'should have correct scope' do
-        expect(subject.options.client_options.scope).to eq('/read-limited /activities/update /orcid-bio/update')
+        expect(subject.authorize_params['scope']).to eq('/read-limited /activities/update /orcid-bio/update')
       end
 
       it 'should have correct token url' do
@@ -101,11 +101,11 @@ describe OmniAuth::Strategies::ORCID do
       end
 
       it 'should have correct site' do
-        expect(subject.options.client_options.site).to eq("http://api.sandbox.orcid.org")
+        expect(subject.options.client_options.site).to eq("https://api.sandbox.orcid.org")
       end
 
       it 'should have correct scope' do
-        expect(subject.options.client_options.scope).to eq('/read-limited /activities/update /orcid-bio/update')
+        expect(subject.authorize_params['scope']).to eq('/read-limited /activities/update /orcid-bio/update')
       end
 
       it 'should have correct token url' do
@@ -162,6 +162,18 @@ describe OmniAuth::Strategies::ORCID do
         expect(subject.authorize_params["email"]).to eq("josiah@brown.edu")
       end
     end
+
+    describe "scope" do
+      it 'should default to nil' do
+        @options = {}
+        expect(subject.authorize_params['scope']).to eq("/authenticate")
+      end
+
+      it 'should set the scope parameter if present' do
+        @options = { scope: '/read-limited' }
+        expect(subject.authorize_params['scope']).to eq("/read-limited")
+      end
+    end
   end
 
   describe 'extra' do

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'bundler/setup'
 Bundler.setup
 
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'omniauth-orcid'
 require 'rspec'
 require 'rack/test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-orcid
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
 platform: ruby
 authors:
 - Gudmundur A. Thorisson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-03 00:00:00.000000000 Z
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -87,6 +87,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.22.3
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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: Enables third-party client apps to connect to the ORCID API and access/update
   protected profile data
 email: