Merge pull request #2560 from DMPRoadmap/bug/nil_useridentifier

fix a bug where UserIdentifiers were saved with nil user_id
DMPRoadmap · Jun 11, 2020 · 483569f · 483569f
2 parents 6e37b7d + 6da3a74
commit 483569f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
@@ -35,11 +35,6 @@ def new
         flash[:notice] = _("Please make a choice below. After linking your details to a %{application_name} account, you will be able to sign in directly with your institutional credentials.") % {
           application_name: Rails.configuration.branding[:application][:name]
         }
-        # rubocop:enable Metrics/LineLength
-        scheme = IdentifierScheme.find_by(name: oauth["provider"].downcase)
-        UserIdentifier.create(identifier_scheme: scheme,
-                              identifier: oauth["uid"],
-                              user: @user)
       end
     end
   end

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -19,21 +19,21 @@ def create
           identifier: session["devise.shibboleth_data"]["uid"],
           user: existing_user
         }
-        if UserIdentifier.create(args)
-          # rubocop:disable Metrics/LineLength
-          success = _("Your account has been successfully linked to your institutional credentials. You will now be able to sign in with them.")
-          # rubocop:enable Metrics/LineLength
-        end
+        @ui = UserIdentifier.new(args)
       end
       unless existing_user.get_locale.nil?
         session[:locale] = existing_user.get_locale
       end
       # Method defined at controllers/application_controller.rb
       set_gettext_locale
     end
-    super
-    if success
-      flash[:notice] = success
+
+    super do
+      if !@ui.nil? && @ui.save
+        # rubocop:disable Metrics/LineLength
+        flash[:notice] = _("Your account has been successfully linked to your institutional credentials. You will now be able to sign in with them.")
+        # rubocop:enable Metrics/LineLength
+      end
     end
   end