Merge pull request #13524 from opf/fix/remove-attendee-organizer

Remove attendee and organizer values from calendar subscription
opf · Aug 21, 2023 · 4b0ea94 · 4b0ea94
2 parents 42bd191 + 50f1808
commit 4b0ea94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 32 deletions.
diff --git a/modules/calendar/app/services/calendar/create_ical_service.rb b/modules/calendar/app/services/calendar/create_ical_service.rb
@@ -60,7 +60,6 @@ def create_ical_string(work_packages, calendar_name)
     def add_values_to_event(event, work_package)
       %i[
         uid
-        organizer
         summary
         dtstamp
         dtstart
@@ -71,27 +70,13 @@ def add_values_to_event(event, work_package)
         event.send("#{value}=", send("#{value}_value", work_package))
       end
 
-      add_attendee_value(event, work_package)
+      event
     end
 
     def uid_value(work_package)
       "#{work_package.id}@#{host}"
     end
 
-    def attendee_value(work_package)
-      Icalendar::Values::CalAddress.new(
-        "mailto:#{work_package.assigned_to&.mail}",
-        cn: work_package.assigned_to&.name
-      )
-    end
-
-    def organizer_value(work_package)
-      Icalendar::Values::CalAddress.new(
-        "mailto:#{work_package.author&.mail}",
-        cn: work_package.author&.name
-      )
-    end
-
     def summary_value(work_package)
       work_package.name
     end
@@ -132,19 +117,13 @@ def host
       OpenProject::StaticRouting::UrlHelpers.host
     end
 
-    def add_attendee_value(event, work_package)
-      # event.attendee = [work_package.assigned_to&.name] # causing thunderbird error "id is null"
-      event.attendee = attendee_value(work_package) if work_package.assigned_to.present?
-
-      event
-    end
-
     def description_value(work_package)
       %i[
         project
         type
         status
         assigned_to
+        author
         priority
       ].map do |attribute|
         translated_attribute_name_and_value(work_package, attribute)

diff --git a/modules/calendar/spec/services/create_ical_service_spec.rb b/modules/calendar/spec/services/create_ical_service_spec.rb
@@ -95,41 +95,36 @@
       UID:#{work_package_with_due_date.id}@localhost:3000
       DTSTART;VALUE=DATE:#{work_package_with_due_date.due_date.strftime('%Y%m%d')}
       DTEND;VALUE=DATE:#{(work_package_with_due_date.due_date + 1.day).strftime('%Y%m%d')}
-      DESCRIPTION:Project: #{project.name}\nType: None\nStatus: #{work_package_with_due_date.status.name}\nAssignee: \nPriority: #{work_package_with_due_date.priority.name}\n\nDescription:\n#{work_package_with_due_date.description}
+      DESCRIPTION:Project: #{project.name}\nType: None\nStatus: #{work_package_with_due_date.status.name}\nAssignee: \nAuthor: #{work_package_with_due_date.author.name}\nPriority: #{work_package_with_due_date.priority.name}\n\nDescription:\n#{work_package_with_due_date.description}
       LOCATION:http://localhost:3000/work_packages/#{work_package_with_due_date.id}
-      ORGANIZER;CN=#{work_package_with_due_date.author.name}:mailto:#{work_package_with_due_date.author.mail}
       SUMMARY:#{work_package_with_due_date.name}
       END:VEVENT
       BEGIN:VEVENT
       DTSTAMP:#{work_package_with_start_date.updated_at.strftime('%Y%m%dT%H%M%SZ')}
       UID:#{work_package_with_start_date.id}@localhost:3000
       DTSTART;VALUE=DATE:#{work_package_with_start_date.start_date.strftime('%Y%m%d')}
       DTEND;VALUE=DATE:#{(work_package_with_start_date.start_date + 1.day).strftime('%Y%m%d')}
-      DESCRIPTION:Project: #{project.name}\nType: None\nStatus: #{work_package_with_start_date.status.name}\nAssignee: \nPriority: #{work_package_with_start_date.priority.name}\n\nDescription:\n#{work_package_with_start_date.description}
+      DESCRIPTION:Project: #{project.name}\nType: None\nStatus: #{work_package_with_start_date.status.name}\nAssignee: \nAuthor: #{work_package_with_start_date.author.name}\nPriority: #{work_package_with_start_date.priority.name}\n\nDescription:\n#{work_package_with_start_date.description}
       LOCATION:http://localhost:3000/work_packages/#{work_package_with_start_date.id}
-      ORGANIZER;CN=#{work_package_with_start_date.author.name}:mailto:#{work_package_with_start_date.author.mail}
       SUMMARY:#{work_package_with_start_date.name}
       END:VEVENT
       BEGIN:VEVENT
       DTSTAMP:#{work_package_with_start_and_due_date.updated_at.strftime('%Y%m%dT%H%M%SZ')}
       UID:#{work_package_with_start_and_due_date.id}@localhost:3000
       DTSTART;VALUE=DATE:#{work_package_with_start_and_due_date.start_date.strftime('%Y%m%d')}
       DTEND;VALUE=DATE:#{(work_package_with_start_and_due_date.due_date + 1.day).strftime('%Y%m%d')}
-      DESCRIPTION:Project: #{project.name}\nType: None\nStatus: #{work_package_with_start_and_due_date.status.name}\nAssignee: \nPriority: #{work_package_with_start_and_due_date.priority.name}\n\nDescription:\n#{work_package_with_start_and_due_date.description}
+      DESCRIPTION:Project: #{project.name}\nType: None\nStatus: #{work_package_with_start_and_due_date.status.name}\nAssignee: \nAuthor: #{work_package_with_start_and_due_date.author.name}\nPriority: #{work_package_with_start_and_due_date.priority.name}\n\nDescription:\n#{work_package_with_start_and_due_date.description}
       LOCATION:http://localhost:3000/work_packages/#{work_package_with_start_and_due_date.id}
-      ORGANIZER;CN=#{work_package_with_start_and_due_date.author.name}:mailto:#{work_package_with_start_and_due_date.author.mail}
       SUMMARY:#{work_package_with_start_and_due_date.name}
       END:VEVENT
       BEGIN:VEVENT
       DTSTAMP:#{work_package_with_due_date_and_assignee.updated_at.strftime('%Y%m%dT%H%M%SZ')}
       UID:#{work_package_with_due_date_and_assignee.id}@localhost:3000
       DTSTART;VALUE=DATE:#{work_package_with_due_date_and_assignee.due_date.strftime('%Y%m%d')}
       DTEND;VALUE=DATE:#{(work_package_with_due_date_and_assignee.due_date + 1.day).strftime('%Y%m%d')}
-      DESCRIPTION:Project: #{project.name}\nType: None\nStatus: #{work_package_with_due_date_and_assignee.status.name}\nAssignee: #{work_package_with_due_date_and_assignee.assigned_to.name}\nPriority: #{work_package_with_due_date_and_assignee.priority.name}\n\nDescription:\n#{work_package_with_due_date_and_assignee.description}
+      DESCRIPTION:Project: #{project.name}\nType: None\nStatus: #{work_package_with_due_date_and_assignee.status.name}\nAssignee: #{work_package_with_due_date_and_assignee.assigned_to.name}\nAuthor: #{work_package_with_due_date_and_assignee.author.name}\nPriority: #{work_package_with_due_date_and_assignee.priority.name}\n\nDescription:\n#{work_package_with_due_date_and_assignee.description}
       LOCATION:http://localhost:3000/work_packages/#{work_package_with_due_date_and_assignee.id}
-      ORGANIZER;CN=#{work_package_with_due_date_and_assignee.author.name}:mailto:#{work_package_with_due_date_and_assignee.author.mail}
       SUMMARY:#{work_package_with_due_date_and_assignee.name}
-      ATTENDEE;CN=#{work_package_with_due_date_and_assignee.assigned_to.name}:mailto:#{work_package_with_due_date_and_assignee.assigned_to.mail}
       END:VEVENT
       END:VCALENDAR
     EOICAL