omniauth-orcid 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 014bcb635ac59370ed0b52f945e480a1c75bd988
-  data.tar.gz: fe2189f5a092ab669a538ede6333bbefde5cfa3c
+  metadata.gz: 3433775b793b7860d91b4f8e809575e1610b64ae
+  data.tar.gz: e8c54ca4b1ebadb64710036159bb1dccaf1a6d00
 SHA512:
-  metadata.gz: b5dcfd8cb87c495a48bcf8f06e53b3d1a31b8e27647bfcce75366771170be3c64f7da535d6888736c6d3629b29be73641d7963b5dd5aac764ed2de8777fc94c2
-  data.tar.gz: d3009264a0febb2fe630c109059657d38fa1d99070364c62acb936e39be77751447d985119afe356dbf63db04cfb7a8ed361899b59fc013a9269b62e9d80f99c
+  metadata.gz: 7a34431d0520bb7b8a7e51b26034a2eb3fc775f951ce83047c91819a075a33a7ab725f5370d0141a17d5da1f5e1f37f49e60bfefb71de2ef245352ab951be839
+  data.tar.gz: 5c0f534a4f938b699fe1164159770e53d340396d86e50342f6873d202784bb4d5179df4e4cc5f264097b2d0391101ed309b15db4ad6440212d9654bfe977eeb0

data/.gitignore

@@ -0,0 +1,20 @@
+*.gem
+*.rbc
+.bundle
+.config
+config.yml
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+Gemfile.lock
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/

data/README.md

@@ -46,7 +46,7 @@ There are three ways to register a client application and obtain client app cred
 
 * for non-members (the default): Register your client application in the `Developer Tools` section of your ORCID profile. Use `https://pub.orcid.org` as `site URL`
 * for members (production): Register your client application [here](http://orcid.org/content/register-client-application). Use https://api.orcid.org as `site URL`
-* for development (sandbox): Register your client application [here](https://orcid.org/content/register-client-application-sandbox). Use https://sandbox.orcid.org as `site URL`
+* for development (sandbox): Register your client application [here](https://orcid.org/content/register-client-application-sandbox). Use https://api.sandbox.orcid.org as `site URL`
 
 OmniAuth takes care of the OAuth external-authentication handshake or "dance". All that the gem does is grab the identifier and tokens at the end of the dance and stick it into the OmniAuth hash which is subsequently accessible to your app via `request.env['omniauth.auth']` (see [AuthHashSchema](https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema)). The hash looks something like this:
 
@@ -163,14 +163,14 @@ use OmniAuth::Builder do
       scope: '/orcid-profile/read-limited'
     },
   client_options: {
-    site: ENV['ORCID_URL'],
+    site: ENV['API_ORCID_URL'],
     authorize_url: "#{ENV['ORCID_URL']}/oauth/authorize",
-    token_url: "#{ENV['ORCID_URL']}/oauth/token",
+    token_url: "#{ENV['API_ORCID_URL']}/oauth/token",
   }
 end
 
 ```
-Where `ENV['ORCID_CLIENT_ID']` and `ENV['ORCID_CLIENT_SECRET']` are provided by ORCID when registering the application, and `ENV['ORCID_URL']` depends on the API you are using (see above).
+Where `ENV['ORCID_CLIENT_ID']` and `ENV['ORCID_CLIENT_SECRET']` are provided by ORCID when registering the application, and `ENV['API_ORCID_URL']` depends on the API you are using (see above).
 
 
 ## More information

data/lib/omniauth/orcid/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Orcid
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/omniauth/strategies/orcid.rb

@@ -6,33 +6,33 @@ module OmniAuth
   module Strategies
     class ORCID < OmniAuth::Strategies::OAuth2
 
-      DEFAULT_SCOPE = '/authenticate'
+      option :name, "orcid"
 
       option :client_options, {
-        :site => 'http://api.orcid.org',
-        :authorize_url => 'http://orcid.org/oauth/authorize',
-        :token_url => 'https://pub.orcid.org/oauth/token',
-        :scope => '/authenticate',
-        :response_type => 'code',
-        :mode => :header
+        site: 'https://pub.orcid.org',
+        authorize_url: 'https://orcid.org/oauth/authorize',
+        scope: '/authenticate'
       }
 
-      # Pull out unique ID for the user in the external system
-      uid { access_token.params["orcid"] }
+      def request_phase
+        options[:show_login] ||= "false"
+        super
+      end
+
+      uid { raw_info["orcid"] }
 
       info do
-        { name: access_token.params["name"],
-          email: access_token.params["email"] }
+        { name: raw_info["name"] }
       end
 
-      # Customize the parameters passed to the OAuth provider in the authorization phase
-      def authorize_params
+      extra do
+        {
+          'raw_info' => raw_info
+        }
+      end
 
-        # Trick shamelessly borrowed from the omniauth-facebook gem!
-        super.tap do |params|
-          %w[scope].each { |v| params[v.to_sym] = request.params[v] if request.params[v] }
-          params[:scope] ||= DEFAULT_SCOPE # ensure that we're always request *some* default scope
-        end
+      def raw_info
+        @raw_info ||= access_token.params
       end
     end
   end

data/omniauth-orcid.gemspec

@@ -5,20 +5,20 @@ Gem::Specification.new do |s|
   s.authors       = ["Gudmundur A. Thorisson", "Martin Fenner"]
   s.email         = ["gthorisson@gmail.com", "martin.fenner@datacite.org"]
   s.name          = "omniauth-orcid"
-  s.homepage      = %q{https://github.com/datacite/omniauth-orcid}
-  s.summary       = %q{ORCID OAuth 2.0 Strategy for OmniAuth 1.0}
+  s.homepage      = "https://github.com/datacite/omniauth-orcid"
+  s.summary       = "ORCID OAuth 2.0 Strategy for OmniAuth 1.0"
   s.date          = Date.today
-  s.description   = %q{Enables third-party client apps to connect to the ORCID API and access/update protected profile data }
-  s.files         = Dir["{lib}/**/*.rb", "bin/*", "LICENSE.txt", "*.md", "Rakefile", "Gemfile", "demo.rb", "omniauth-orcid.gemspec"]
+  s.description   = "Enables third-party client apps to connect to the ORCID API and access/update protected profile data"
   s.require_paths = ["lib"]
   s.version       = OmniAuth::Orcid::VERSION
   s.extra_rdoc_files = ["README.md"]
   s.license       = 'MIT'
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
 
   # Declary dependencies here, rather than in the Gemfile
-  s.add_dependency 'omniauth', '~> 1.0'
   s.add_dependency 'omniauth-oauth2', '~> 1.1'
-
+  s.add_development_dependency 'bundler', '~> 1.0'
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-orcid
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Gudmundur A. Thorisson
@@ -9,38 +9,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth2
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
+        version: '1.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-description: 'Enables third-party client apps to connect to the ORCID API and access/update
-  protected profile data '
+        version: '1.0'
+description: Enables third-party client apps to connect to the ORCID API and access/update
+  protected profile data
 email:
 - gthorisson@gmail.com
 - martin.fenner@datacite.org
@@ -49,6 +49,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: ORCID OAuth 2.0 Strategy for OmniAuth 1.0