Handle missing ORCID from metadata

Author: fbacall

app/controllers/orcid_controller.rb

@@ -17,10 +17,14 @@ def callback
     orcid = token.access_token&.raw_attributes['orcid']
     respond_to do |format|
       profile = current_user.profile
-      if profile.authenticate_orcid(orcid)
-        flash[:notice] = t('orcid.authentication_success')
+      if orcid.present?
+        if profile.authenticate_orcid(orcid)
+          flash[:notice] = t('orcid.authentication_success')
+        else
+          flash[:error] = profile.errors.full_messages.join(', ')
+        end
       else
-        flash[:error] = profile.errors.full_messages.join(', ')
+        flash[:error] = t('orcid.authentication_failure')
       end
       format.html { redirect_to current_user }
     end

config/locales/en.yml

@@ -1084,4 +1084,5 @@ en:
   orcid:
     error: 'An error occurred whilst trying to authenticate your ORCID.'
     authenticate: 'Authenticate your ORCID'
-    authentication_success: 'You have successfully authenticated your ORCID.'
+    authentication_success: 'You have successfully authenticated your ORCID.'
+    authentication_failure: 'Failed to authenticate your ORCID.'

test/controllers/orcid_controller_test.rb

@@ -81,7 +81,7 @@ class OrcidControllerTest < ActionController::TestCase
     end
 
     assert_response :unprocessable_entity
-    assert_select '#error-message', text: /ORCID/
+    assert_select '#error-message', text: /error occurred.+ORCID/
     profile = user.profile.reload
     assert profile.orcid.blank?
     refute profile.orcid_authenticated?
@@ -92,12 +92,28 @@ class OrcidControllerTest < ActionController::TestCase
     user = users(:regular_user)
     sign_in user
 
-    VCR.use_cassette('orcid/error_500') do
+    VCR.use_cassette('orcid/get_token_orcid_missing') do
       get :callback, params: { code: '123xyz' }
     end
 
     assert_response :unprocessable_entity
-    assert_select '#error-message', text: /ORCID/
+    assert_select '#error-message', text: /error occurred.+ORCID/
+    profile = user.profile.reload
+    assert profile.orcid.blank?
+    refute profile.orcid_authenticated?
+  end
+
+  test 'handle missing orcid during callback' do
+    mock_images
+    user = users(:regular_user)
+    sign_in user
+
+    VCR.use_cassette('orcid/get_token_orcid_missing') do
+      get :callback, params: { code: '123xyz' }
+    end
+
+    assert_redirected_to user
+    assert_includes flash[:error], 'Failed to authenticat'
     profile = user.profile.reload
     assert profile.orcid.blank?
     refute profile.orcid_authenticated?