Merge branch 'master' into newSessionHandling

Leantime · Jun 10, 2024 · e74d98d · e74d98d
2 parents f562ad3 + ddaae67
commit e74d98d
Show file tree

Hide file tree

Showing 49 changed files with 214 additions and 265 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/app/Core/Middleware/RequestRateLimiter.php b/app/Core/Middleware/RequestRateLimiter.php
@@ -4,8 +4,10 @@
 
 use Closure;
 use Illuminate\Cache\RateLimiter;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Facades\Cache;
 use Leantime\Core\ApiRequest;
+use Leantime\Core\Environment;
 use Leantime\Core\Eventhelpers;
 use Leantime\Core\Frontcontroller;
 use Leantime\Core\IncomingRequest;
@@ -41,11 +43,16 @@ public function __construct()
      * Handle the incoming request.
      *
      * @param IncomingRequest $request The incoming request object.
-     * @param Closure         $next    The next middleware closure.
+     * @param Closure $next The next middleware closure.
      * @return Response The response object.
+     * @throws BindingResolutionException
      */
     public function handle(IncomingRequest $request, Closure $next): Response
     {
+        //Configurable rate limits
+        $rateLimitGeneral = app()->make(Environment::class)->get('LEAN_RATELIMIT_GENERAL') ?? 1000;
+        $rateLimitApi = app()->make(Environment::class)->get('LEAN_RATELIMIT_API') ?? 10;
+        $rateLimitAuth = app()->make(Environment::class)->get('LEAN_RATELIMIT_AUTH') ?? 20;
 
         //Key
         $keyModifier = "-1";
@@ -56,19 +63,19 @@ public function handle(IncomingRequest $request, Closure $next): Response
         $key = $request->getClientIp()."-".$keyModifier;
 
         //General Limit per minute
-        $limit = 2000;
+        $limit = $rateLimitGeneral;
 
         //API Routes Limit
         if ($request instanceof ApiRequest) {
             $apiKey = "";
             $key = app()->make(Api::class)->getAPIKeyUser($apiKey);
-            $limit = 10;
+            $limit = $rateLimitApi;
         }
 
         $route = Frontcontroller::getCurrentRoute();
 
         if ($route == "auth.login") {
-            $limit = 50;
+            $limit = $rateLimitAuth;
             $key = $key . ".loginAttempts";
         }
 
@@ -88,13 +95,37 @@ public function handle(IncomingRequest $request, Closure $next): Response
                 "key" => $key,
             ],
         );
-
         if ($this->limiter->tooManyAttempts($key, $limit)) {
             error_log("too many requests per minute: " . $key);
-            return new Response(json_encode(['error' => 'Too many requests per minute.']), Response::HTTP_TOO_MANY_REQUESTS);
+            return new Response(
+                json_encode(['error' => 'Too many requests per minute.']),
+                Response::HTTP_TOO_MANY_REQUESTS,
+                $this->getHeaders($key, $limit),
+            );
         }
+
         $this->limiter->hit($key, 60);
 
         return $next($request);
     }
+
+
+    /**
+     * Get rate limiter headers for response.
+     *
+     * @param string $key
+     *
+     * @param string $limit
+     *
+     * @return array
+     */
+    private function getHeaders(string $key, string $limit): array
+    {
+        return [
+            'X-RateLimit-Remaining' => $this->limiter->retriesLeft($key, $limit),
+            'X-RateLimit-Retry-After' => $this->limiter->availableIn($key),
+            'X-RateLimit-Limit' => $this->limiter->attempts($key),
+            'Retry-After' => $this->limiter->availableIn($key),
+        ];
+    }
 }
diff --git a/app/Domain/Notifications/Services/Messengers.php b/app/Domain/Notifications/Services/Messengers.php
@@ -203,23 +203,28 @@ private function zulipWebhook(NotificationModel $notification): bool
      */
     public function discordWebhook(NotificationModel $notification): bool
     {
-        $converter = false;
+        $ticketService = app()->make(Tickets::class);
 
         for ($i = 1; 3 >= $i; $i++) {
             $discordWebhookURL = $this->settingsRepo->getSetting("projectsettings.{$notification->projectId}.discordWebhookURL{$i}");
             if ($discordWebhookURL !== '' && $discordWebhookURL !== false) {
-                if (!$converter) {
-                    $converter = new HtmlConverter();
-                }
-                $timestamp = date('c', strtotime('now'));
                 $fields = [
-                    // Additional data to be sent; e.g.:
-                    //[
-                    //  'name' => $subject,
-                    //  'value' => $message,
-                    //  'inline' => FALSE
-                    //],
+                    [
+                        'name' => $this->language->__("label.project"),
+                        'value' => $this->projectName,
+                        'inline' => true
+                    ],
                 ];
+
+                $statusLabelsArray = $ticketService->getStatusLabels($notification->projectId);
+                if (!empty($notification->entity->status) && !empty($statusLabelsArray[$notification->entity->status])) {
+                    $fields[] = [
+                        'name' => $this->language->__("label.todo_status"),
+                        'value' => $statusLabelsArray[$notification->entity->status]['name'],
+                        'inline' => true
+                    ];
+                }
+
                 $url_link = (
                     empty($notification->url['url'])
                     ? ''
@@ -232,24 +237,13 @@ public function discordWebhook(NotificationModel $notification): bool
                     'tts' => false,
                     'embeds' => [
                         [
-                            'title' => $notification->subject,
-                            'type' => 'rich',
-                            'description' => html_entity_decode($converter->convert($notification->message)),
-                            'url' => $url_link,
-                            'timestamp' => $timestamp,
                             'color' => hexdec('1b75bb'),
-                            'footer' => [
-                                'text' => 'Leantime',
-                                'icon_url' => $url_link,
-                            ],
-                            'author' => [
-                                'name' =>  $this->projectName,
-                                'url' => $url_link,
-                            ],
+                            'title' => $notification->message,
+                            'url' => $url_link,
+                            'timestamp' => date('c', strtotime('now')),
                             'fields' => $fields,
-                        ],
+                        ]
                     ],
-
                 ], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
 
                 try {
@@ -282,23 +276,27 @@ public function prepareMessage(NotificationModel $notification): array
             $headline = $notification->entity->headline;
             $status = $notification->entity->status;
         }
+
+        $fields = [
+            'title' => $this->language->__("headlines.project_with_name") . ' ' . $this->projectName,
+            'short' => false,
+        ];
+
         $statusLabelsArray = $ticketService->getStatusLabels($notification->projectId);
-        $message = array(
+        if (!empty($statusLabelsArray[$status])) {
+            $fields['value'] = $this->language->__("label.todo_status") . ': '. $statusLabelsArray[$status]['name'];
+        }
+
+        $message = [
             [
                 'color'    => '#1b75bb',
                 'fallback' => $notification->message,
                 'pretext'  => $notification->message,
                 'title' => $headline,
                 'title_link' => $notification->url['url'],
-                'fields'   => array(
-                    [
-                        'title' => $this->language->__("headlines.project_with_name") . ' ' . $this->projectName,
-                        'value' => $this->language->__("label.todo_status") . ': ' . empty($statusLabelsArray[$status]) ? '' : $statusLabelsArray[$status]['name'],
-                        'short' => false,
-                    ],
-                ),
+                'fields' => $fields,
             ],
-        );
+        ];
 
         return $message;
     }

diff --git a/app/Domain/Tickets/Repositories/Tickets.php b/app/Domain/Tickets/Repositories/Tickets.php
@@ -635,6 +635,7 @@ public function simpleTicketQuery(?int $userId, ?int $projectId): array|false
                     IF(zp_tickets.type <> "", zp_tickets.type, "task") AS type,
                     zp_tickets.status,
                     zp_tickets.tags,
+                    zp_tickets.userId,
                     zp_tickets.editorId,
                     zp_tickets.dependingTicketId,
                     zp_tickets.milestoneid,

diff --git a/app/Domain/Tickets/Services/Tickets.php b/app/Domain/Tickets/Services/Tickets.php
@@ -780,6 +780,48 @@ public function getOpenUserTicketsByProject($userId, $projectId): array
             return $tickets;
         }
 
+        /**
+         * @param $userId
+         * @param $projectId
+         * @return array
+         */
+        public function getOpenUserTicketsByPriority($userId, $projectId): array
+        {
+
+            $searchCriteria = $this->prepareTicketSearchArray(array("users" => $userId, "status" => "", "sprint" => ""));
+            $allTickets = $this->ticketRepository->getAllBySearchCriteria($searchCriteria, "priority");
+
+            $statusLabels = $this->getAllStatusLabelsByUserId($userId);
+
+            $tickets = array();
+
+            foreach ($allTickets as $row) {
+                //Only include todos that are not done
+                if (
+                    isset($statusLabels[$row['projectId']]) &&
+                    isset($statusLabels[$row['projectId']][$row['status']]) &&
+                    $statusLabels[$row['projectId']][$row['status']]['statusType'] != "DONE"
+                ) {
+                    $label = $this->ticketRepository->priority[$row['priority']];
+                    if (isset($tickets[$row['priority']])) {
+                        $tickets[$row['priority']]['tickets'][] = $row;
+                    } else {
+                        // If the priority is not set, the label for priority not defined is used.
+                        if (empty($this->ticketRepository->priority[$row['priority']])) {
+                            $label =$this->language->__("label.priority_not_defined");
+                        }
+                        $tickets[$row['priority']] = array(
+                            "labelName" =>$label,
+                            "tickets" => array($row),
+                            "groupValue" => $row['time'],
+                        );
+                    }
+                }
+            }
+
+            return $tickets;
+        }
+
 
         /**
          * @param $userId
@@ -1085,7 +1127,7 @@ public function quickAddTicket($params): array|bool
 
             $values = array(
                 'headline' => $params['headline'],
-                'type' => 'Task',
+                'type' => 'task',
                 'description' => $params['description'] ?? '',
                 'projectId' => $params['projectId'] ?? session("currentProject"),
                 'editorId' => session("userdata.id"),
@@ -1193,7 +1235,7 @@ public function addTicket($values)
             $values = array(
                 'id' => '',
                 'headline' => $values['headline'] ?? "",
-                'type' => $values['type'] ?? "Task",
+                'type' => $values['type'] ?? "task",
                 'description' => $values['description'] ?? "",
                 'projectId' => $values['projectId'] ?? session("currentProject") ,
                 'editorId' => $values['editorId'] ?? "",
@@ -1941,6 +1983,8 @@ public function getToDoWidgetAssignments($params)
                 $tickets = $this->getOpenUserTicketsThisWeekAndLater(session("userdata.id"), $projectFilter);
             } elseif ($groupBy == "project") {
                 $tickets = $this->getOpenUserTicketsByProject(session("userdata.id"), $projectFilter);
+            } elseif ($groupBy == "priority") {
+                $tickets = $this->getOpenUserTicketsByPriority(session("userdata.id"), $projectFilter);
             } elseif ($groupBy == "sprint") {
                 $tickets = $this->getOpenUserTicketsBySprint(session("userdata.id"), $projectFilter);
             }

diff --git a/app/Domain/Widgets/Templates/partials/myToDos.blade.php b/app/Domain/Widgets/Templates/partials/myToDos.blade.php
@@ -54,6 +54,22 @@ class="btn btn-primary"
                                     <label for="groupByProject">{!! __("label.project") !!}</label>
                                 </span>
                             </li>
+                            <li>
+                                <span class="radio">
+                                    <input type="radio"
+                                           name="groupBy"
+                                           @if($groupBy == "priority") checked='checked' @endif
+                                           value="priority" id="groupByPriority"
+                                           hx-get="{{BASE_URL}}/widgets/myToDos/get"
+                                           hx-trigger="click"
+                                           hx-target="#yourToDoContainer"
+                                           hx-swap="outerHTML"
+                                           hx-indicator="#todos .htmx-indicator"
+                                           hx-vals='{"projectFilter": {{ $projectFilter }}, "groupBy": "priority" }'
+                                    />
+                                    <label for="groupByPriority">{!! __("label.priority") !!}</label>
+                                </span>
+                            </li>
 
                         </ul>
                     </div>

diff --git a/app/Language/ar-SA.ini b/app/Language/ar-SA.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/cs-CZ.ini b/app/Language/cs-CZ.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/da-DK.ini b/app/Language/da-DK.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Prioritet"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/de-DE-inf.ini b/app/Language/de-DE-inf.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="Liste"
 groupByLabel.sprint="Liste"
 groupByLabel.project="Projekt"
 groupByLabel.time="Fälligkeitsdatum"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Daten"
 

diff --git a/app/Language/de-DE.ini b/app/Language/de-DE.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="Liste"
 groupByLabel.sprint="Liste"
 groupByLabel.project="Projekt"
 groupByLabel.time="Fälligkeitsdatum"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Daten"
 

diff --git a/app/Language/el-GR.ini b/app/Language/el-GR.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/en-GB.ini b/app/Language/en-GB.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/en-PT.ini b/app/Language/en-PT.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/en-UD.ini b/app/Language/en-UD.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/es-419.ini b/app/Language/es-419.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/es-ES.ini b/app/Language/es-ES.ini
@@ -2393,6 +2393,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"