Merge branch 'fix/17773/develop' into 'develop'

FIX #17773 TIME 0:05 always get mailevaConfig uri without trailing slash

See merge request maarch/MaarchCourrier!329

src/app/configuration/controllers/ConfigurationController.php

@@ -188,6 +188,11 @@ class ConfigurationController
             } elseif (!Validator::boolType()->validate($data['enabled'] ?? null)) {
                 return $response->withStatus(400)->withJson(['errors' => "Body enabled is not set or not a boolean"]);
             }
+            $data = [
+                'uri' => rtrim($data['uri'], '/'),
+                'authUri' => rtrim($data['authUri'], '/'),
+                'enabled' => $data['enabled'],
+            ];
         } elseif ($args['privilege'] == 'admin_organization_email_signatures') {
             if (!Validator::notEmpty()->arrayType()->validate($data)) {
                 return $response->withStatus(400)->withJson(['errors' => 'Body is empty or not an array']);

src/core/models/CoreConfigModel.php

@@ -231,8 +231,8 @@ class CoreConfigModel
             $configuration = json_decode($configuration['value'], true);
 
             $mailevaConfig['enabled']       = $configuration['enabled'];
-            $mailevaConfig['connectionUri'] = $configuration['authUri'];
-            $mailevaConfig['uri']           = $configuration['uri'];
+            $mailevaConfig['connectionUri'] = rtrim($configuration['authUri'], '/');
+            $mailevaConfig['uri']           = rtrim($configuration['uri'], '/');
 
             if (!empty($mailevaConfig['uri']) && $mailevaConfig['uri'] == 'https://api.maileva.com') {
                 $mailevaConfig['clientId'] = '69d315c2b3694accbce85f2871add37d';