Merge pull request #183 from datacite/fetch-token-when-authenticating-from-orcid

Fetch token and redirect to Commons when authenticating from ORCID Search & Link

Author: bklaing2

app/controllers/users/omniauth_callbacks_controller.rb

@@ -107,13 +107,11 @@ def globus
 
     def orcid
       auth = request.env["omniauth.auth"]
+      omni_params = request.env["omniauth.params"]
       omniauth = flash[:omniauth] || {}
 
       if current_user.present?
         @user = current_user
-        @user.update(orcid_expires_at: User.timestamp(auth.credentials),
-                    orcid_token: auth.credentials.token)
-        flash[:notice] = "ORCID token successfully refreshed."
       else
         @user = User.from_omniauth(auth, provider: "globus")
       end
@@ -129,6 +127,13 @@ def orcid
       if @user.persisted?
         sign_in @user
 
+        # Refresh ORCID token if the flag isn't explicitly false
+        if omni_params["fetch_token"] != "false"
+          @user.update(orcid_expires_at: User.timestamp(auth.credentials),
+                       orcid_token: auth.credentials.token)
+          flash[:notice] = "ORCID token successfully refreshed."
+        end
+
         cookies[:_datacite] = encode_cookie(@user.jwt)
 
         if stored_location_for(:user) == ENV["BLOG_URL"] + "/admin/"
@@ -145,7 +150,13 @@ def orcid
 
           netlify_response(token: token, content: content)
         else
-          redirect_to stored_location_for(:user) || setting_path("me")
+
+          # Redirect to Commons if the flag isn't explicitly false. Otherwise redirect to profile settings
+          if omni_params["redirect_to_commons"] != "false"
+            redirect_to "#{ENV['COMMONS_URL']}/orcid.org/#{current_user.orcid}"
+          else
+            redirect_to stored_location_for(:user) || setting_path("me")
+          end
         end
       else
         flash[:alert] = @user.errors.map { |k, v| "#{k}: #{v}" }.join("<br />").html_safe || "Error signing in with #{provider}"

app/views/settings/_show.html.erb

@@ -82,7 +82,7 @@
                 <%= link_to "<img id=\"orcid-logo\" src=\"#{ENV["CDN_URL"]}/images/orcid.png\" alt=\"ORCID icon\"/>&nbsp;Delete ORCID Token".html_safe, setting_path("me", user: { orcid_token: nil, orcid_expires_at: Time.zone.now }), { method: :put, remote: true, class: 'btn btn-social btn-orcid btn-fill' } %>
               <% else %>
                 <p>Get ORCID token to allow DataCite to update your ORCID record.</p>
-                <%= link_to "<img id=\"orcid-logo\" src=\"#{ENV["CDN_URL"]}/images/orcid.png\" alt=\"ORCID icon\"/>&nbsp;Get ORCID Token".html_safe, user_orcid_omniauth_authorize_path, method: :post, :id => "sign-in-orcid", class: 'btn btn-social btn-orcid btn-fill' %>
+                <%= link_to "<img id=\"orcid-logo\" src=\"#{ENV["CDN_URL"]}/images/orcid.png\" alt=\"ORCID icon\"/>&nbsp;Get ORCID Token".html_safe, user_orcid_omniauth_authorize_path(redirect_to_commons: false), method: :post, :id => "sign-in-orcid", class: 'btn btn-social btn-orcid btn-fill' %>
               <% end %>
             </dd>
           </dl>

app/views/users/sessions/new.html.erb

@@ -12,7 +12,7 @@
             <% else %>
               <div class="register-card-globus">
                 <h3 class="title">Sign In</h3>
-                <%= link_to "<img id=\"orcid-logo\" src=\"#{ENV["CDN_URL"]}/images/orcid.png\" alt=\"ORCID icon\"/>&nbsp;Sign in with ORCID".html_safe, user_orcid_omniauth_authorize_path, method: :post, :id => "sign-in-orcid", class: 'btn btn-block btn-social btn-orcid btn-fill' %>
+                <%= link_to "<img id=\"orcid-logo\" src=\"#{ENV["CDN_URL"]}/images/orcid.png\" alt=\"ORCID icon\"/>&nbsp;Sign in with ORCID".html_safe, user_orcid_omniauth_authorize_path(fetch_token: false, redirect_to_commons: false), method: :post, :id => "sign-in-orcid", class: 'btn btn-block btn-social btn-orcid btn-fill' %>
               </div>
             <% end %>
           </div>