omniauth-orcid 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 376112ae004c49e54e84390daeea37b92223cd6c
-  data.tar.gz: 68ec2c3fadfda9b1706c751bb75cd3b2092150cd
+  metadata.gz: cae9a23c2fe7fc6f767bb8aa638d37d1327a93fb
+  data.tar.gz: 77ee76452d7e695350a3ad3bf150363815dc125c
 SHA512:
-  metadata.gz: 1d89f7b21a36a9570e237433357464de73b82de59a509f2fb27f74b9fbd1656bb1ef0eef5ff3c1d35c4a6c82d8b29bc8605870a0acc24c1f73a66ed175606bbb
-  data.tar.gz: 53ff86abe5974d7dfcb6566c4c01e2120ba99bfc8f856ef976be7a0f403e1b975d126d6dc536542a031e0e2e72d8f5e4e0c37d46298800dff2e8c7908b0b3f34
+  metadata.gz: bb95dc9ba8c53b0a589dacc8e1a65d378ba4c456b2896af6a48d45836828a7cc09eaffacdfd943fc8f94572ca3e83fda315dc1d6289fa806495cc6f59db9b493
+  data.tar.gz: 33da7a618b8598201711ca89ca6b601ed4beab6954bbb5e9e3dc7e3e82acd16f12c6dbae56f6879d3fc9a08d4c2a0184c6044cdfddbce96122321be05a88c395

data/lib/omniauth/orcid/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Orcid
-    VERSION = "1.0.10"
+    VERSION = "1.0.11"
   end
 end

data/lib/omniauth/strategies/orcid.rb

@@ -7,15 +7,21 @@ module OmniAuth
     class ORCID < OmniAuth::Strategies::OAuth2
 
       DEFAULT_SCOPE = '/authenticate'
+      DEFAULT_NAMESPACE = '/authenticate'
       API_VERSION = '1.2'
 
       option :name, "orcid"
 
-      option :authorize_options, [:scope, :redirect_uri, :show_login, :lang]
+      option :member, false
+      option :sandbox, false
+
+      option :authorize_options, [:redirect_uri, :show_login]
 
       option :client_options, {
-        site: 'https://pub.orcid.org',
-        authorize_url: 'https://orcid.org/oauth/authorize'
+        site: site,
+        authorize_url: authorize_url,
+        token_url: token_url,
+        scope: scope
       }
 
       def authorize_params
@@ -31,6 +37,53 @@ module OmniAuth
         end
       end
 
+      # URLs for ORCID OAuth: http://members.orcid.org/api/tokens-through-3-legged-oauth-authorization
+      def namespace
+        if option[:member] && option[:sandbox]
+          'sandbox'
+        elsif option[:member]
+          'production'
+        elsif option[:sandbox]
+          'public_sandbox'
+        else
+          'public'
+        end
+      end
+
+      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'
+        end
+      end
+
+      def authorize_url
+        if option[:sandbox]
+          'https://sandbox.orcid.org/oauth/authorize'
+        else
+          'https://orcid.org/oauth/authorize'
+        end
+      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
+      end
+
+      def scope
+        if option[:member]
+          '/orcid-profile/read-limited /orcid-works/create'
+        else
+          '/authenticate'
+        end
+      end
+
       uid { access_token.params["orcid"] }
 
       info do
@@ -44,7 +97,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get("https://pub.orcid.org//v#{API_VERSION}/#{uid}/orcid-bio").parsed
+        @raw_info ||= access_token.get("#{site}/v#{API_VERSION}/#{uid}/orcid-bio").parsed
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-orcid
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Gudmundur A. Thorisson