2 files changed, 10 insertions, 4 deletions
diff --git a/app/services/concerns/users/participable_service.rb b/app/services/concerns/users/participable_service.rb
index c1c93aa604e..281b2508090 100644
--- a/app/services/concerns/users/participable_service.rb
+++ b/app/services/concerns/users/participable_service.rb
@@ -32,6 +32,8 @@ module Users
     end
 
     def groups
+      return [] unless current_user
+
       current_user.authorized_groups.with_route.sort_by(&:path)
     end
 
diff --git a/app/services/concerns/work_items/widgetable_service.rb b/app/services/concerns/work_items/widgetable_service.rb
index beb614c7b76..24ade9336b2 100644
--- a/app/services/concerns/work_items/widgetable_service.rb
+++ b/app/services/concerns/work_items/widgetable_service.rb
@@ -2,18 +2,22 @@
 
 module WorkItems
   module WidgetableService
-    def execute_widgets(work_item:, callback:, widget_params: {})
+    def execute_widgets(work_item:, callback:, widget_params: {}, service_params: {})
       work_item.widgets.each do |widget|
-        widget_service(widget).try(callback, params: widget_params[widget.class.api_symbol])
+        widget_service(widget, service_params).try(callback, params: widget_params[widget.class.api_symbol])
       end
     end
 
     # rubocop:disable Gitlab/ModuleWithInstanceVariables
-    def widget_service(widget)
+    def widget_service(widget, service_params)
       @widget_services ||= {}
       return @widget_services[widget] if @widget_services.has_key?(widget)
 
-      @widget_services[widget] = widget_service_class(widget)&.new(widget: widget, current_user: current_user)
+      @widget_services[widget] = widget_service_class(widget)&.new(
+        widget: widget,
+        current_user: current_user,
+        service_params: service_params
+      )
     end
     # rubocop:enable Gitlab/ModuleWithInstanceVariables