Merge pull request #246 from openHPI/consider_empty_name_and_mail_for_external_users

Consider empty name and mail for external users

app/mailers/user_mailer.rb

@@ -1,4 +1,10 @@
 class UserMailer < ActionMailer::Base
+
+  def mail(*args)
+    # used to prevent the delivery to pseudonymous users without a valid email address
+    super unless args.first[:to].blank?
+  end
+
   def activation_needed_email(user)
     @activation_url = activate_internal_user_url(user, token: user.activation_token)
     mail(subject: t('mailers.user_mailer.activation_needed.subject'), to: user.email)

app/models/external_user.rb

@@ -5,11 +5,10 @@ class ExternalUser < ApplicationRecord
   validates :external_id, presence: true
 
   def displayname
-    result = name
+    if name.blank?
-    if(result == nil || result == "")
+      "User " + id.to_s
-      result = "User " + id.to_s
+    else
+      name
     end
-    result
   end
-
 end

app/views/application/welcome.html.slim

@@ -3,6 +3,6 @@ h1 = t('.title', application_name: application_name)
 - if current_user.try(:external_user?)
   p = t('.text_signed_in_as_external_user', application_name: application_name)
 - elsif current_user.try(:internal_user?)
-  p = t('.text_signed_in_as_internal_user', user_name: current_user.name)
+  p = t('.text_signed_in_as_internal_user', user_name: current_user.displayname)
 - else
   p == t('.text_signed_out', application_name: application_name, sign_in_path: sign_in_path)

app/views/exercise_collections/show.html.slim

@@ -3,7 +3,7 @@ h1
   = render('shared/edit_button', object: @exercise_collection)
 
 = row(label: 'exercise_collections.name', value: @exercise_collection.name)
-= row(label: 'exercise_collections.user', value: link_to(@exercise_collection.user.name, @exercise_collection.user)) unless @exercise_collection.user.nil?
+= row(label: 'exercise_collections.user', value: link_to(@exercise_collection.user.displayname, @exercise_collection.user)) unless @exercise_collection.user.nil?
 = row(label: 'exercise_collections.use_anomaly_detection', value: @exercise_collection.use_anomaly_detection)
 = row(label: 'exercise_collections.updated_at', value: @exercise_collection.updated_at)
 
@@ -24,5 +24,5 @@ h4.mt-4 = t('activerecord.attributes.exercise_collections.exercises')
           td = exercise_collection_item.position
           td = link_to(exercise.title, exercise)
           td = link_to_if(exercise.execution_environment && policy(exercise.execution_environment).show?, exercise.execution_environment, exercise.execution_environment)
-          td = link_to_if(exercise.user && policy(exercise.user).show?, exercise.user.name, exercise.user)
+          td = link_to_if(exercise.user && policy(exercise.user).show?, exercise.user.displayname, exercise.user)
           td = link_to(t('shared.statistics'), statistics_exercise_path(exercise), 'data-turbolinks' => "false")

app/views/exercises/feedback.html.slim

@@ -13,7 +13,7 @@ h1 = link_to(@exercise, exercise_path(@exercise))
       li.card.mt-2
         .card-header role="tab" id="heading"
           div.clearfix.feedback-header
-            span.username = link_to(feedback.user.name, statistics_external_user_exercise_path(id: @exercise.id, external_user_id: feedback.user.id))
+            span.username = link_to(feedback.user.displayname, statistics_external_user_exercise_path(id: @exercise.id, external_user_id: feedback.user.id))
             - if feedback.anomaly_notification
               i class="fa fa-envelope-o" data-placement="top" data-toggle="tooltip" data-container="body" title=feedback.anomaly_notification.reason
             span.date = feedback.created_at

app/views/external_users/index.html.slim

@@ -10,7 +10,7 @@ h1 = ExternalUser.model_name.human(count: 2)
     tbody
       - @users.each do |user|
         tr
-          td = user.name
+          td = user.displayname
           td = link_to(user.consumer, user.consumer)
           td = link_to(t('shared.show'), user)
 

app/views/external_users/show.html.slim

@@ -1,4 +1,4 @@
-h1 = @user.name
+h1 = @user.displayname
 
 = row(label: 'external_user.name', value: @user.name)
 //= row(label: 'external_user.email', value: @user.email)

app/views/user_exercise_feedbacks/index.html.slim

@@ -19,7 +19,7 @@ h1 = UserExerciseFeedback.model_name.human(count: 2)
       - @uefs.each do |uef|
         tr
           td = uef.user.id
-          td = uef.user.name
+          td = uef.user.displayname
           td = link_to(uef.exercise.title, uef.exercise)
           td = link_to(t('shared.show'), uef)
           td = link_to(t('shared.destroy'), uef, data: {confirm: t('shared.confirm_destroy')}, method: :delete)

app/views/user_mailer/send_thank_you_note.slim

@@ -1 +1 @@
-== t('mailers.user_mailer.send_thank_you_note.body', receiver_displayname: @receiver_displayname, link_to_comment: link_to(@rfc_link, @rfc_link), author: @author, thank_you_note: @thank_you_note )
+== t('mailers.user_mailer.send_thank_you_note.body', receiver_displayname: @receiver_displayname, link_to_comment: link_to(@rfc_link, @rfc_link), author: @author.displayname, thank_you_note: @thank_you_note )

spec/features/authentication_spec.rb

@@ -38,8 +38,8 @@ describe 'Authentication' do
       visit(root_path)
     end
 
-    it "displays the user's name" do
+    it "displays the user's displayname" do
-      expect(page).to have_content(user.name)
+      expect(page).to have_content(user.displayname)
     end
 
     it 'displays a sign out link' do