Skip to content
Snippets Groups Projects
Verified Commit 3e901a18 authored by Damien's avatar Damien
Browse files

FEAT #12072 TIME 0:20 Check from emails when sending

parent 6a41cb33
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/email/controllers/EmailController.php
+ 81
− 58
View file @ 3e901a18
...@@ -336,67 +336,13 @@ class EmailController ...@@ -336,67 +336,13 @@ class EmailController
return $response->withJson(['emails' => $emails]); return $response->withJson(['emails' => $emails]);
} }
public static function getAvailableEmails(Request $request, Response $response) public function getAvailableEmails(Request $request, Response $response)
{ {
$emails = []; $availableEmails = EmailController::getAvailableEmailsByUserId(['userId' => $GLOBALS['id']]);
$currentUser = UserModel::getById(['select' => ['firstname', 'lastname', 'mail'], 'id' => $GLOBALS['id']]); return $response->withJson(['emails' => $availableEmails]);
$emails[] = [
'entityId' => null,
'label' => $currentUser['firstname'] . ' ' . $currentUser['lastname'],
'email' => $currentUser['mail']
];
if (PrivilegeController::hasPrivilege(['privilegeId' => 'use_mail_services', 'userId' => $GLOBALS['id']])) {
$entities = EntityModel::getWithUserEntities([
'select' => ['entities.entity_label', 'entities.email', 'entities.entity_id', 'entities.id'],
'where' => ['users_entities.user_id = ?'],
'data' => [$GLOBALS['userId']]
]);
foreach ($entities as $entity) {
if (!empty($entity['email'])) {
$emails[] = [
'entityId' => $entity['id'],
'label' => $entity['entity_label'],
'email' => $entity['email']
];
}
}
$emailsEntities = CoreConfigModel::getXmlLoaded(['path' => 'modules/sendmail/xml/externalMailsEntities.xml']);
if (!empty($emailsEntities)) {
$userEntities = array_column($entities, 'entity_id');
foreach ($emailsEntities->externalEntityMail as $entityMail) {
$entityId = (string)$entityMail->targetEntityId;
if (empty($entityId)) {
$emails[] = [
'entityId' => null,
'label' => (string)$entityMail->defaultName,
'email' => (string)$entityMail->EntityMail
];
} elseif (in_array($entityId, $userEntities)) {
$entity = EntityModel::getByEntityId([
'select' => ['entity_label', 'id'],
'entityId' => $entityId
]);
if (!empty($entity)) {
$emails[] = [
'entityId' => $entity['id'],
'label' => $entity['entity_label'],
'email' => (string)$entityMail->EntityMail
];
}
}
}
}
}
return $response->withJson(['emails' => $emails]);
} }
public static function getInitializationByResId(Request $request, Response $response, array $args) public static function getInitializationByResId(Request $request, Response $response, array $args)
{ {
if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) { if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
...@@ -716,6 +662,68 @@ class EmailController ...@@ -716,6 +662,68 @@ class EmailController
return ['success' => 'success']; return ['success' => 'success'];
} }
private static function getAvailableEmailsByUserId(array $args)
{
$currentUser = UserModel::getById(['select' => ['firstname', 'lastname', 'mail', 'user_id'], 'id' => $args['userId']]);
$availableEmails = [
[
'entityId' => null,
'label' => $currentUser['firstname'] . ' ' . $currentUser['lastname'],
'email' => $currentUser['mail']
]
];
if (PrivilegeController::hasPrivilege(['privilegeId' => 'use_mail_services', 'userId' => $args['userId']])) {
$entities = EntityModel::getWithUserEntities([
'select' => ['entities.entity_label', 'entities.email', 'entities.entity_id', 'entities.id'],
'where' => ['users_entities.user_id = ?'],
'data' => [$currentUser['user_id']]
]);
foreach ($entities as $entity) {
if (!empty($entity['email'])) {
$availableEmails[] = [
'entityId' => $entity['id'],
'label' => $entity['entity_label'],
'email' => $entity['email']
];
}
}
$emailsEntities = CoreConfigModel::getXmlLoaded(['path' => 'modules/sendmail/xml/externalMailsEntities.xml']);
if (!empty($emailsEntities)) {
$userEntities = array_column($entities, 'entity_id');
foreach ($emailsEntities->externalEntityMail as $entityMail) {
$entityId = (string)$entityMail->targetEntityId;
if (empty($entityId)) {
$availableEmails[] = [
'entityId' => null,
'label' => (string)$entityMail->defaultName,
'email' => trim((string)$entityMail->EntityMail)
];
} elseif (in_array($entityId, $userEntities)) {
$entity = EntityModel::getByEntityId([
'select' => ['entity_label', 'id'],
'entityId' => $entityId
]);
if (!empty($entity)) {
$availableEmails[] = [
'entityId' => $entity['id'],
'label' => $entity['entity_label'],
'email' => trim((string)$entityMail->EntityMail)
];
}
}
}
}
}
return $availableEmails;
}
private static function controlCreateEmail(array $args) private static function controlCreateEmail(array $args)
{ {
ValidatorModel::notEmpty($args, ['userId']); ValidatorModel::notEmpty($args, ['userId']);
...@@ -732,6 +740,21 @@ class EmailController ...@@ -732,6 +740,21 @@ class EmailController
return ['errors' => 'Data isHtml is not a boolean or empty', 'code' => 400]; return ['errors' => 'Data isHtml is not a boolean or empty', 'code' => 400];
} }
if (!empty($args['data']['sender']['email'])) {
$availableEmails = EmailController::getAvailableEmailsByUserId(['userId' => $args['userId']]);
$emails = array_column($availableEmails, 'email');
if (!in_array($args['data']['sender']['email'], $emails)) {
return ['errors' => 'Data sender email is not allowed', 'code' => 400];
}
if (!empty($args['data']['sender']['entityId'])) {
$entities = array_column($availableEmails, 'entityId');
if (!in_array($args['data']['sender']['entityId'], $entities)) {
return ['errors' => 'Data sender entityId is not allowed', 'code' => 400];
}
}
}
$user = UserModel::getById(['id' => $args['userId'], 'select' => ['user_id']]); $user = UserModel::getById(['id' => $args['userId'], 'select' => ['user_id']]);
if (!empty($args['data']['document'] && !empty($args['data']['document']['id']))) { if (!empty($args['data']['document'] && !empty($args['data']['document']['id']))) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment