Skip to content
Snippets Groups Projects
Commit c5b17777 authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

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
parents 81869255 a73ec9ba
No related branches found
No related tags found
No related merge requests found
......@@ -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']);
......
......@@ -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';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment