Made logic more readable

hyrax/app/models/user.rb

@@ -187,21 +187,23 @@ class User < ApplicationRecord
       email = User.find_or_create_user_email(user_hash)
     end
 
-    if user
-      if update_user
-        messages << "Updating user #{email}"
-      else
-        messages << "Warning: User #{email} already exists. Not updating user."
-        user = nil
-      end
-    elsif email.blank?
+    if user.present? and not update_user
+      messages << "Warning: User #{email} already exists. Not updating user."
+      return false, messages, user
+    end
+
+    if user.blank? and email.blank?
       messages << "Error: Not creating user. User has no email, saml_id or orcid."
-    else
+      return false, messages, nil
+    end
+
+    if user.blank?
       messages << "Creating user #{email}"
       user = User.new
+    else
+      messages << "Updating user #{email}"
     end
 
-    return false, messages, nil unless user.present?
 
     # email
     user.email = email