From e28b4d89b2fcec28d8b7aabfe0e94d266d3e193f Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 6 Apr 2020 16:34:45 +0200
Subject: [PATCH] FEAT #13667 TIME 0:25 Refactoring auth
---
apps/maarch_entreprise/index.php | 2 +-
modules/export_seda/RequestSeda.php | 2 +-
rest/index.php | 8 +-
.../AcknowledgementReceiptTrait.php | 2 +-
.../controllers/ActionMethodController.php | 14 +-
.../ExternalSignatoryBookTrait.php | 2 +-
.../PreProcessActionController.php | 14 +-
src/app/action/controllers/ShippingTrait.php | 2 +-
.../controllers/AdministrationController.php | 4 +-
.../basket/controllers/BasketController.php | 8 +-
.../controllers/ContactGroupController.php | 2 +-
src/app/convert/scripts/ConvertPdfScript.php | 2 +-
src/app/convert/scripts/FullTextScript.php | 4 +-
src/app/email/scripts/sendEmail.php | 2 +-
.../entity/controllers/EntityController.php | 36 ++--
.../controllers/ListInstanceController.php | 2 +-
.../controllers/ListTemplateController.php | 6 +-
.../controllers/MaarchParapheurController.php | 6 +-
.../controllers/XParaphController.php | 10 +-
.../MessageExchangeReviewController.php | 4 +-
.../ReceiveMessageExchangeController.php | 18 +-
.../SendMessageExchangeController.php | 10 +-
.../folder/controllers/FolderController.php | 22 +--
src/app/group/controllers/GroupController.php | 8 +-
src/app/group/models/GroupModelAbstract.php | 2 +-
.../history/controllers/HistoryController.php | 4 +-
src/app/home/controllers/HomeController.php | 6 +-
.../NotificationScheduleModelAbstract.php | 2 +-
.../controllers/PriorityController.php | 2 +-
.../resource/controllers/ExportController.php | 2 +-
.../controllers/FolderPrintController.php | 2 +-
.../controllers/IndexingController.php | 2 +-
.../resource/controllers/ResController.php | 10 +-
.../controllers/ResourceControlController.php | 2 +-
.../controllers/ResourceListController.php | 8 +-
.../controllers/SummarySheetController.php | 6 +-
.../UserFollowedResourceController.php | 2 +-
.../search/controllers/SearchController.php | 10 +-
.../controllers/SignatureBookController.php | 14 +-
src/app/user/controllers/UserController.php | 52 +++---
.../controllers/AuthenticationController.php | 27 ++-
.../controllers/AutoCompleteController.php | 6 +-
src/core/controllers/CoreController.php | 18 +-
src/core/controllers/LogsController.php | 2 +-
.../AdministrationControllerTest.php | 8 +-
.../attachment/AttachmentControllerTest.php | 8 +-
.../app/doctype/DoctypeControllerTest.php | 12 +-
.../app/entity/ListInstanceControllerTest.php | 8 +-
.../app/folder/FolderControllerTest.php | 160 +++++++++---------
.../app/group/GroupControllerTest.php | 76 ++++-----
.../app/group/PrivilegeControllerTest.php | 72 ++++----
.../app/history/HistoryControllerTest.php | 2 +-
.../unitTests/app/home/HomeControllerTest.php | 24 +--
.../app/indexing/IndexingControllerTest.php | 32 ++--
.../unitTests/app/note/NoteControllerTest.php | 24 +--
.../app/priority/PriorityControllerTest.php | 40 ++---
.../app/resource/ExportControllerTest.php | 8 +-
.../resource/FolderPrintControllerTest.php | 4 +-
.../app/resource/LinkControllerTest.php | 16 +-
.../app/resource/ResControllerTest.php | 40 ++---
.../resource/ResourceListControllerTest.php | 24 +--
.../resource/SummarySheetControllerTest.php | 8 +-
.../UserFollowedResourceControllerTest.php | 76 ++++-----
.../app/search/SearchControllerTest.php | 8 +-
.../app/shipping/ShippingControllerTest.php | 56 +++---
.../app/template/TemplateControllerTest.php | 56 +++---
.../unitTests/app/user/UserControllerTest.php | 6 +-
.../core/AuthenticationControllerTest.php | 4 +-
.../core/AutocompleteControllerTest.php | 16 +-
69 files changed, 578 insertions(+), 579 deletions(-)
diff --git a/apps/maarch_entreprise/index.php b/apps/maarch_entreprise/index.php
index 1e197f85604..dd02461d2c1 100755
--- a/apps/maarch_entreprise/index.php
+++ b/apps/maarch_entreprise/index.php
@@ -94,7 +94,7 @@ if (isset($_SESSION['config']['corepath'])) {
}
if (!empty($_SESSION['user']['UserId'])) {
- $GLOBALS['userId'] = $_SESSION['user']['UserId'];
+ $GLOBALS['login'] = $_SESSION['user']['UserId'];
}
if (!isset($_SESSION['user']['UserId'])
diff --git a/modules/export_seda/RequestSeda.php b/modules/export_seda/RequestSeda.php
index 1b075d1925d..a62d7f012a8 100755
--- a/modules/export_seda/RequestSeda.php
+++ b/modules/export_seda/RequestSeda.php
@@ -482,7 +482,7 @@ class RequestSeda
if (!empty($_SESSION['user']['UserId'])) {
$userId = $_SESSION['user']['UserId'];
} else {
- $userId = $GLOBALS['userId'];
+ $userId = $GLOBALS['login'];
}
if (empty($messageObject->messageId)) {
diff --git a/rest/index.php b/rest/index.php
index 1dd7c6e9e7e..058fc0655b4 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -34,11 +34,11 @@ $app->add(function (\Slim\Http\Request $request, \Slim\Http\Response $response,
$currentRoute = empty($route) ? '' : $route->getPattern();
if (!in_array($currentMethod.$currentRoute, \SrcCore\controllers\AuthenticationController::ROUTES_WITHOUT_AUTHENTICATION)) {
$authorizationHeaders = $request->getHeader('Authorization');
- $login = \SrcCore\controllers\AuthenticationController::authentication($authorizationHeaders);
- if (!empty($login)) {
- \SrcCore\controllers\CoreController::setGlobals(['login' => $login]);
+ $userId = \SrcCore\controllers\AuthenticationController::authentication($authorizationHeaders);
+ if (!empty($userId)) {
+ \SrcCore\controllers\CoreController::setGlobals(['userId' => $userId]);
if (!empty($currentRoute)) {
- $r = \SrcCore\controllers\AuthenticationController::isRouteAvailable(['login' => $login, 'currentRoute' => $currentRoute]);
+ $r = \SrcCore\controllers\AuthenticationController::isRouteAvailable(['userId' => $userId, 'currentRoute' => $currentRoute]);
if (!$r['isRouteAvailable']) {
return $response->withStatus(405)->withJson(['errors' => $r['errors']]);
}
diff --git a/src/app/action/controllers/AcknowledgementReceiptTrait.php b/src/app/action/controllers/AcknowledgementReceiptTrait.php
index 27c9630f435..9284b80b53e 100644
--- a/src/app/action/controllers/AcknowledgementReceiptTrait.php
+++ b/src/app/action/controllers/AcknowledgementReceiptTrait.php
@@ -93,7 +93,7 @@ trait AcknowledgementReceiptTrait
$pathToDocument = $docserver['path_template'] . str_replace('#', DIRECTORY_SEPARATOR, $template[0]['template_path']) . $template[0]['template_file_name'];
}
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id', 'mail']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id', 'mail']]);
$ids = [];
$errors = [];
$emailsToSend = [];
diff --git a/src/app/action/controllers/ActionMethodController.php b/src/app/action/controllers/ActionMethodController.php
index 70995681753..afd593d9978 100644
--- a/src/app/action/controllers/ActionMethodController.php
+++ b/src/app/action/controllers/ActionMethodController.php
@@ -128,7 +128,7 @@ class ActionMethodController
'info' => $info
]);
- MessageExchangeReviewController::sendMessageExchangeReview(['res_id' => $resource, 'action_id' => $args['id'], 'userId' => $GLOBALS['userId']]);
+ MessageExchangeReviewController::sendMessageExchangeReview(['res_id' => $resource, 'action_id' => $args['id'], 'userId' => $GLOBALS['login']]);
}
}
@@ -291,7 +291,7 @@ class ActionMethodController
'item_id' => $userInfo['user_id'],
'item_type' => 'user_id',
'item_mode' => 'dest',
- 'added_by_user' => $GLOBALS['userId'],
+ 'added_by_user' => $GLOBALS['login'],
'viewed' => 0,
'difflist_type' => 'entity_id'
]);
@@ -436,7 +436,7 @@ class ActionMethodController
'resIdMaster' => $args['resId'],
'processingUser' => $args['data']['processingUser'],
'objectSent' => 'mail',
- 'userId' => $GLOBALS['userId'],
+ 'userId' => $GLOBALS['login'],
'note' => $args['note']['content'] ?? null
]);
if (!empty($sentInfo['error'])) {
@@ -676,7 +676,7 @@ class ActionMethodController
'item_id' => $instance['item_id'],
'item_type' => $instance['item_type'],
'item_mode' => $instance['item_mode'],
- 'added_by_user' => $GLOBALS['userId'],
+ 'added_by_user' => $GLOBALS['login'],
'difflist_type' => 'entity_id',
'process_date' => null,
'process_comment' => null,
@@ -715,7 +715,7 @@ class ActionMethodController
$currentStep = $currentStep[0];
$message = null;
- if ($currentStep['item_id'] != $GLOBALS['userId']) {
+ if ($currentStep['item_id'] != $GLOBALS['login']) {
$currentUser = UserModel::getById(['select' => ['firstname', 'lastname'], 'id' => $GLOBALS['id']]);
$stepUser = UserModel::get([
'select' => ['firstname', 'lastname'],
@@ -753,7 +753,7 @@ class ActionMethodController
$currentStep = ListInstanceModel::get([
'select' => ['listinstance_id', 'item_id'],
'where' => ['res_id = ?', 'difflist_type = ?', 'item_id = ?', 'item_mode in (?)'],
- 'data' => [$args['resId'], 'entity_id', $GLOBALS['userId'], ['avis', 'avis_copy', 'avis_info']],
+ 'data' => [$args['resId'], 'entity_id', $GLOBALS['login'], ['avis', 'avis_copy', 'avis_info']],
'limit' => 1
]);
@@ -869,7 +869,7 @@ class ActionMethodController
'item_id' => $instance['item_id'],
'item_type' => $instance['item_type'],
'item_mode' => $instance['item_mode'],
- 'added_by_user' => $GLOBALS['userId'],
+ 'added_by_user' => $GLOBALS['login'],
'difflist_type' => 'entity_id',
'process_date' => null,
'process_comment' => null,
diff --git a/src/app/action/controllers/ExternalSignatoryBookTrait.php b/src/app/action/controllers/ExternalSignatoryBookTrait.php
index 1257c95414d..ca1c9320ed3 100755
--- a/src/app/action/controllers/ExternalSignatoryBookTrait.php
+++ b/src/app/action/controllers/ExternalSignatoryBookTrait.php
@@ -87,7 +87,7 @@ trait ExternalSignatoryBookTrait
'config' => $config,
'resIdMaster' => $args['resId'],
'objectSent' => 'attachment',
- 'userId' => $GLOBALS['userId'],
+ 'userId' => $GLOBALS['login'],
'steps' => $args['data']['steps'],
'note' => $args['note']['content'] ?? null
]);
diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php
index ab1b8270734..0bcec8b6921 100755
--- a/src/app/action/controllers/PreProcessActionController.php
+++ b/src/app/action/controllers/PreProcessActionController.php
@@ -51,7 +51,7 @@ class PreProcessActionController
{
public static function getRedirectInformations(Request $request, Response $response, array $args)
{
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $args['groupId'], 'userId' => $args['userId'], 'basketId' => $args['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
@@ -178,7 +178,7 @@ class PreProcessActionController
$currentMode = 'auto';
}
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $args['groupId'], 'userId' => $args['userId'], 'basketId' => $args['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
@@ -380,7 +380,7 @@ class PreProcessActionController
public function checkExternalSignatoryBook(Request $request, Response $response, array $aArgs)
{
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $aArgs['groupId'], 'userId' => $aArgs['userId'], 'basketId' => $aArgs['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
@@ -511,7 +511,7 @@ class PreProcessActionController
}
}
} elseif ($signatureBookEnabled == 'xParaph') {
- $userInfos = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['external_id']]);
+ $userInfos = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['external_id']]);
$externalId = json_decode($userInfos['external_id'], true);
$additionalsInfos['accounts'] = [];
if (!empty($externalId['xParaph'])) {
@@ -572,7 +572,7 @@ class PreProcessActionController
public function checkExternalNoteBook(Request $request, Response $response, array $aArgs)
{
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $aArgs['groupId'], 'userId' => $aArgs['userId'], 'basketId' => $aArgs['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
@@ -846,7 +846,7 @@ class PreProcessActionController
public function checkInitiatorEntity(Request $request, Response $response, array $args)
{
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $args['groupId'], 'userId' => $args['userId'], 'basketId' => $args['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
@@ -885,7 +885,7 @@ class PreProcessActionController
public function checkAttachmentsAndNotes(Request $request, Response $response, array $args)
{
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $args['groupId'], 'userId' => $args['userId'], 'basketId' => $args['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
diff --git a/src/app/action/controllers/ShippingTrait.php b/src/app/action/controllers/ShippingTrait.php
index 2d2f47a5c8b..a4f693d2d54 100644
--- a/src/app/action/controllers/ShippingTrait.php
+++ b/src/app/action/controllers/ShippingTrait.php
@@ -39,7 +39,7 @@ trait ShippingTrait
ValidatorModel::intVal($args, ['resId']);
ValidatorModel::arrayType($args, ['data']);
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$resource = ResModel::getById(['select' => ['destination', 'integrations', 'subject as title', 'external_id', 'res_id', 'version'], 'resId' => $args['resId']]);
$integrations = json_decode($resource['integrations'], true);
diff --git a/src/app/administration/controllers/AdministrationController.php b/src/app/administration/controllers/AdministrationController.php
index b30fb82008d..c13df25b02f 100644
--- a/src/app/administration/controllers/AdministrationController.php
+++ b/src/app/administration/controllers/AdministrationController.php
@@ -29,14 +29,14 @@ class AdministrationController
$count = [];
if (PrivilegeController::hasPrivilege(['privilegeId' => 'admin_users', 'userId' => $GLOBALS['id']])) {
- if ($GLOBALS['userId'] == 'superadmin') {
+ if ($GLOBALS['login'] == 'superadmin') {
$users = UserModel::get([
'select' => [1],
'where' => ['status != ?'],
'data' => ['DEL']
]);
} else {
- $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['login']]);
$users = [];
if (!empty($entities)) {
$users = UserEntityModel::getWithUsers([
diff --git a/src/app/basket/controllers/BasketController.php b/src/app/basket/controllers/BasketController.php
index 2858aa1c6f7..6fb297459c1 100755
--- a/src/app/basket/controllers/BasketController.php
+++ b/src/app/basket/controllers/BasketController.php
@@ -75,7 +75,7 @@ class BasketController
return $response->withStatus(400)->withJson(['errors' => _ID. ' ' . _ALREADY_EXISTS]);
}
- if (!PreparedClauseController::isRequestValid(['clause' => $data['clause'], 'userId' => $GLOBALS['userId']])) {
+ if (!PreparedClauseController::isRequestValid(['clause' => $data['clause'], 'userId' => $GLOBALS['login']])) {
return $response->withStatus(400)->withJson(['errors' => _INVALID_CLAUSE]);
}
@@ -115,7 +115,7 @@ class BasketController
return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
}
- if (!PreparedClauseController::isRequestValid(['clause' => $data['clause'], 'userId' => $GLOBALS['userId']])) {
+ if (!PreparedClauseController::isRequestValid(['clause' => $data['clause'], 'userId' => $GLOBALS['login']])) {
return $response->withStatus(400)->withJson(['errors' => _INVALID_CLAUSE]);
}
@@ -339,7 +339,7 @@ class BasketController
}
}
- $data['groupActions'] = BasketController::checkGroupActions(['groupActions' => $data['groupActions'], 'userId' => $GLOBALS['userId']]);
+ $data['groupActions'] = BasketController::checkGroupActions(['groupActions' => $data['groupActions'], 'userId' => $GLOBALS['login']]);
if (!empty($data['groupActions']['errors'])) {
return $response->withStatus(400)->withJson(['errors' => $data['groupActions']['errors']]);
}
@@ -419,7 +419,7 @@ class BasketController
if (!Validator::arrayType()->notEmpty()->validate($data['groupActions'])) {
return $response->withStatus(400)->withJson(['errors' => 'Data groupActions is empty or not an array']);
}
- $data['groupActions'] = BasketController::checkGroupActions(['groupActions' => $data['groupActions'], 'userId' => $GLOBALS['userId']]);
+ $data['groupActions'] = BasketController::checkGroupActions(['groupActions' => $data['groupActions'], 'userId' => $GLOBALS['login']]);
if (!empty($data['groupActions']['errors'])) {
return $response->withStatus(400)->withJson(['errors' => $data['groupActions']['errors']]);
}
diff --git a/src/app/contact/controllers/ContactGroupController.php b/src/app/contact/controllers/ContactGroupController.php
index 7116dcbc96d..bacdf399687 100755
--- a/src/app/contact/controllers/ContactGroupController.php
+++ b/src/app/contact/controllers/ContactGroupController.php
@@ -74,7 +74,7 @@ class ContactGroupController
return $response->withStatus(400)->withJson(['errors' => _CONTACTS_GROUP_LABEL_ALREADY_EXISTS]);
}
- if ($GLOBALS['userId'] = 'superadmin') {
+ if ($GLOBALS['login'] = 'superadmin') {
$entityOwner = 'superadmin';
} else {
$primaryEntity = UserModel::getPrimaryEntityById(['id' => $GLOBALS['id'], 'select' => ['entities.entity_id']]);
diff --git a/src/app/convert/scripts/ConvertPdfScript.php b/src/app/convert/scripts/ConvertPdfScript.php
index 77e9c11771d..6434b2da1c4 100644
--- a/src/app/convert/scripts/ConvertPdfScript.php
+++ b/src/app/convert/scripts/ConvertPdfScript.php
@@ -154,7 +154,7 @@ class ConvertPdfScript
if (!empty($isConverted['errors'])) {
$currentUser = UserModel::getById(['id' => $args['userId'], 'select' => ['user_id']]);
- $GLOBALS['userId'] = $currentUser['user_id'];
+ $GLOBALS['login'] = $currentUser['user_id'];
LogsController::add([
'isTech' => true,
diff --git a/src/app/convert/scripts/FullTextScript.php b/src/app/convert/scripts/FullTextScript.php
index 97b11454110..b705baabe1a 100644
--- a/src/app/convert/scripts/FullTextScript.php
+++ b/src/app/convert/scripts/FullTextScript.php
@@ -86,7 +86,7 @@ class FullTextScript
new DatabasePDO(['customId' => $args['customId']]);
$currentUser = UserModel::getById(['id' => $args['userId'], 'select' => ['user_id']]);
- $GLOBALS['userId'] = $currentUser['user_id'];
+ $GLOBALS['login'] = $currentUser['user_id'];
$isIndexed = FullTextController::indexDocument(['resId' => $args['resId'], 'collId' => $args['collId']]);
@@ -123,7 +123,7 @@ class FullTextScript
$currentUser = UserModel::getByLogin(['login' => $args['userId'], 'select' => ['id']]);
- $GLOBALS['userId'] = $args['userId'];
+ $GLOBALS['login'] = $args['userId'];
$resIdsToReindex = FullTextController::getFailedIndexes(['collId' => $args['collId']]);
diff --git a/src/app/email/scripts/sendEmail.php b/src/app/email/scripts/sendEmail.php
index dd191522f27..aa8b6cddffb 100644
--- a/src/app/email/scripts/sendEmail.php
+++ b/src/app/email/scripts/sendEmail.php
@@ -39,7 +39,7 @@ class EmailScript
new DatabasePDO(['customId' => $args['customId']]);
$currentUser = UserModel::getById(['id' => $args['userId'], 'select' => ['user_id']]);
- $GLOBALS['userId'] = $currentUser['user_id'];
+ $GLOBALS['login'] = $currentUser['user_id'];
$_SERVER['MAARCH_ENCRYPT_KEY'] = $args['encryptKey'];
$isSent = EmailController::sendEmail(['emailId' => $args['emailId'], 'userId' => $args['userId']]);
diff --git a/src/app/entity/controllers/EntityController.php b/src/app/entity/controllers/EntityController.php
index 8992895732f..e92d5161cfb 100755
--- a/src/app/entity/controllers/EntityController.php
+++ b/src/app/entity/controllers/EntityController.php
@@ -37,7 +37,7 @@ class EntityController
{
public function get(Request $request, Response $response)
{
- return $response->withJson(['entities' => EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']])]);
+ return $response->withJson(['entities' => EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']])]);
}
public function getById(Request $request, Response $response, array $aArgs)
@@ -61,7 +61,7 @@ class EntityController
return $response->withStatus(400)->withJson(['errors' => 'Entity not found']);
}
- $aEntities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $aEntities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
foreach ($aEntities as $aEntity) {
if ($aEntity['entity_id'] == $aArgs['id'] && $aEntity['allowed'] == false) {
return $response->withStatus(403)->withJson(['errors' => 'Entity out of perimeter']);
@@ -182,8 +182,8 @@ class EntityController
'eventId' => 'entityCreation',
]);
- if (empty($data['parent_entity_id']) && $GLOBALS['userId'] != 'superadmin') {
- $user = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ if (empty($data['parent_entity_id']) && $GLOBALS['login'] != 'superadmin') {
+ $user = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$primaryEntity = UserModel::getPrimaryEntityById(['id' => $GLOBALS['id'], 'select' => [1]]);
$pEntity = 'N';
if (empty($primaryEntity)) {
@@ -193,15 +193,15 @@ class EntityController
UserEntityModel::addUserEntity(['id' => $user['id'], 'entityId' => $data['entity_id'], 'role' => '', 'primaryEntity' => $pEntity]);
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
- 'info' => _USER_ENTITY_CREATION . " : {$GLOBALS['userId']} {$data['entity_id']}",
+ 'info' => _USER_ENTITY_CREATION . " : {$GLOBALS['login']} {$data['entity_id']}",
'moduleId' => 'user',
'eventId' => 'userModification',
]);
}
- return $response->withJson(['entities' => EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']])]);
+ return $response->withJson(['entities' => EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']])]);
}
public function update(Request $request, Response $response, array $aArgs)
@@ -215,7 +215,7 @@ class EntityController
return $response->withStatus(400)->withJson(['errors' => 'Entity not found']);
}
- $aEntities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $aEntities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
foreach ($aEntities as $aEntity) {
if ($aEntity['entity_id'] == $aArgs['id'] && $aEntity['allowed'] == false) {
return $response->withStatus(403)->withJson(['errors' => 'Entity out of perimeter']);
@@ -256,8 +256,8 @@ class EntityController
'eventId' => 'entityModification',
]);
- if (empty($data['parent_entity_id']) && $GLOBALS['userId'] != 'superadmin') {
- $hasEntity = UserEntityModel::get(['select' => [1], 'where' => ['user_id = ?', 'entity_id = ?'], 'data' => [$GLOBALS['userId'], $aArgs['id']]]);
+ if (empty($data['parent_entity_id']) && $GLOBALS['login'] != 'superadmin') {
+ $hasEntity = UserEntityModel::get(['select' => [1], 'where' => ['user_id = ?', 'entity_id = ?'], 'data' => [$GLOBALS['login'], $aArgs['id']]]);
if (empty($hasEntity)) {
$primaryEntity = UserModel::getPrimaryEntityById(['id' => $GLOBALS['id'], 'select' => [1]]);
$pEntity = 'N';
@@ -268,16 +268,16 @@ class EntityController
UserEntityModel::addUserEntity(['id' => $GLOBALS['id'], 'entityId' => $aArgs['id'], 'role' => '', 'primaryEntity' => $pEntity]);
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
- 'info' => _USER_ENTITY_CREATION . " : {$GLOBALS['userId']} {$aArgs['id']}",
+ 'info' => _USER_ENTITY_CREATION . " : {$GLOBALS['login']} {$aArgs['id']}",
'moduleId' => 'user',
'eventId' => 'userModification',
]);
}
}
- return $response->withJson(['entities' => EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']])]);
+ return $response->withJson(['entities' => EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']])]);
}
public function delete(Request $request, Response $response, array $aArgs)
@@ -291,7 +291,7 @@ class EntityController
return $response->withStatus(400)->withJson(['errors' => 'Entity not found']);
}
- $aEntities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $aEntities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
foreach ($aEntities as $aEntity) {
if ($aEntity['entity_id'] == $aArgs['id'] && $aEntity['allowed'] == false) {
return $response->withStatus(403)->withJson(['errors' => 'Entity out of perimeter']);
@@ -346,7 +346,7 @@ class EntityController
'eventId' => 'entitySuppression',
]);
- $entities['entities'] = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities['entities'] = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
return $response->withJson($entities);
}
@@ -361,7 +361,7 @@ class EntityController
if (empty($dyingEntity) || empty($successorEntity)) {
return $response->withStatus(400)->withJson(['errors' => 'Entity does not exist']);
}
- $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
foreach ($entities as $entity) {
if (($entity['entity_id'] == $aArgs['id'] && $entity['allowed'] == false) || ($entity['entity_id'] == $aArgs['newEntityId'] && $entity['allowed'] == false)) {
return $response->withStatus(403)->withJson(['errors' => 'Entity out of perimeter']);
@@ -445,7 +445,7 @@ class EntityController
'eventId' => 'entitySuppression',
]);
- $entities['entities'] = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities['entities'] = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
return $response->withJson($entities);
}
@@ -460,7 +460,7 @@ class EntityController
return $response->withStatus(400)->withJson(['errors' => 'Entity not found']);
}
- $aEntities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $aEntities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
foreach ($aEntities as $aEntity) {
if ($aEntity['entity_id'] == $aArgs['id'] && $aEntity['allowed'] == false) {
return $response->withStatus(403)->withJson(['errors' => 'Entity out of perimeter']);
diff --git a/src/app/entity/controllers/ListInstanceController.php b/src/app/entity/controllers/ListInstanceController.php
index 62f18111466..499f0c9cf41 100755
--- a/src/app/entity/controllers/ListInstanceController.php
+++ b/src/app/entity/controllers/ListInstanceController.php
@@ -441,7 +441,7 @@ class ListInstanceController
'item_id' => $listInstance['item_id'],
'item_type' => $listInstance['item_type'],
'item_mode' => $listInstance['item_mode'],
- 'added_by_user' => $GLOBALS['userId'],
+ 'added_by_user' => $GLOBALS['login'],
'difflist_type' => $args['type'] == 'visaCircuit' ? 'VISA_CIRCUIT' : 'AVIS_CIRCUIT',
'process_date' => $listInstance['process_date'],
'process_comment' => $listInstance['process_comment'],
diff --git a/src/app/entity/controllers/ListTemplateController.php b/src/app/entity/controllers/ListTemplateController.php
index e41b8457ad9..9a7acc5fc78 100755
--- a/src/app/entity/controllers/ListTemplateController.php
+++ b/src/app/entity/controllers/ListTemplateController.php
@@ -137,7 +137,7 @@ class ListTemplateController
if (!empty($listTemplate)) {
return $response->withStatus(400)->withJson(['errors' => 'Entity is already linked to this type of template']);
}
- $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
foreach ($entities as $entity) {
if ($entity['serialId'] == $body['entityId'] && $entity['allowed'] == false) {
return $response->withStatus(403)->withJson(['errors' => 'Entity out of perimeter']);
@@ -203,7 +203,7 @@ class ListTemplateController
}
if (!empty($listTemplate['entity_id'])) {
- $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
foreach ($entities as $entity) {
if ($entity['serialId'] == $listTemplate['entity_id'] && $entity['allowed'] == false) {
return $response->withStatus(403)->withJson(['errors' => 'Entity out of perimeter']);
@@ -267,7 +267,7 @@ class ListTemplateController
}
if (!empty($listTemplate['entityId'])) {
- $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => $GLOBALS['login']]);
foreach ($entities as $entity) {
if ($entity['serialId'] == $listTemplate['entityId'] && $entity['allowed'] == false) {
return $response->withStatus(403)->withJson(['errors' => 'Entity out of perimeter']);
diff --git a/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php b/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php
index 55d716a19ae..63b45bbc714 100755
--- a/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php
+++ b/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php
@@ -697,7 +697,7 @@ class MaarchParapheurController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'ADD',
'eventId' => 'userCreation',
'info' => _USER_CREATED_IN_MAARCHPARAPHEUR . " {$userInfo['firstname']} {$userInfo['lastname']}"
@@ -777,7 +777,7 @@ class MaarchParapheurController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'ADD',
'eventId' => 'userCreation',
'info' => _USER_LINKED_TO_MAARCHPARAPHEUR . " {$userInfo['firstname']} {$userInfo['lastname']}"
@@ -803,7 +803,7 @@ class MaarchParapheurController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'ADD',
'eventId' => 'userCreation',
'info' => _USER_UNLINKED_TO_MAARCHPARAPHEUR . " {$userInfo['firstname']} {$userInfo['lastname']}"
diff --git a/src/app/external/externalSignatoryBook/controllers/XParaphController.php b/src/app/external/externalSignatoryBook/controllers/XParaphController.php
index 6bd90c9c810..782486b451c 100755
--- a/src/app/external/externalSignatoryBook/controllers/XParaphController.php
+++ b/src/app/external/externalSignatoryBook/controllers/XParaphController.php
@@ -238,7 +238,7 @@ class XParaphController
}
$tmpPath = CoreConfigModel::getTmpPath();
- $filename = $tmpPath . $GLOBALS['userId'] . '_' . rand() . '_xParaphSignature.';
+ $filename = $tmpPath . $GLOBALS['login'] . '_' . rand() . '_xParaphSignature.';
$pathFilename = $filename . $extension;
file_put_contents($pathFilename, $tbs->Source);
@@ -601,7 +601,7 @@ class XParaphController
}
}
- $user = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['external_id', 'id', 'firstname', 'lastname']]);
+ $user = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['external_id', 'id', 'firstname', 'lastname']]);
if (empty($user)) {
return $response->withStatus(400)->withJson(['errors' => 'User not found']);
}
@@ -617,7 +617,7 @@ class XParaphController
$accountFound = true;
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
'eventId' => 'userModification',
'info' => _USER_UPDATED . " {$user['firstname']} {$user['lastname']}. " . _XPARAPH_ACCOUNT_CREATED
@@ -643,7 +643,7 @@ class XParaphController
}
}
- $user = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['external_id', 'id', 'firstname', 'lastname']]);
+ $user = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['external_id', 'id', 'firstname', 'lastname']]);
if (empty($user)) {
return $response->withStatus(400)->withJson(['errors' => 'User not found']);
}
@@ -655,7 +655,7 @@ class XParaphController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
'eventId' => 'userModification',
'info' => _USER_UPDATED . " {$user['firstname']} {$user['lastname']}. " . _XPARAPH_ACCOUNT_DELETED
diff --git a/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php b/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php
index b64ef67ae8b..3e3f109a311 100755
--- a/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php
+++ b/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php
@@ -114,7 +114,7 @@ class MessageExchangeReviewController
public function saveMessageExchangeReview(Request $request, Response $response)
{
- if (empty($GLOBALS['userId'])) {
+ if (empty($GLOBALS['login'])) {
return $response->withStatus(401)->withJson(['errors' => 'User Not Connected']);
}
@@ -142,7 +142,7 @@ class MessageExchangeReviewController
MessageExchangeModel::updateOperationDateMessage(['operation_date' => $dataObject->Date, 'message_id' => $messageExchange['message_id']]);
}
- $messageExchangeSaved = SendMessageExchangeController::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $messageExchange['res_id_master'], 'type' => 'ArchiveModificationNotification', 'userId' => $GLOBALS['userId']]);
+ $messageExchangeSaved = SendMessageExchangeController::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $messageExchange['res_id_master'], 'type' => 'ArchiveModificationNotification', 'userId' => $GLOBALS['login']]);
return $response->withJson([
'messageId' => $messageExchangeSaved['messageId'],
diff --git a/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php b/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php
index 6216942307b..a2d602e8e8e 100755
--- a/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php
+++ b/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php
@@ -113,11 +113,11 @@ class ReceiveMessageExchangeController
]);
$basketRedirection = null;
- $userBaskets = BasketModel::getBasketsByLogin(['login' => $GLOBALS['userId']]);
+ $userBaskets = BasketModel::getBasketsByLogin(['login' => $GLOBALS['login']]);
if (!empty($userBaskets)) {
foreach ($userBaskets as $value) {
if ($value['basket_id'] == $aDefaultConfig['basketRedirection_afterUpload'][0]) {
- $userGroups = UserModel::getGroupsByLogin(['login' => $GLOBALS['userId']]);
+ $userGroups = UserModel::getGroupsByLogin(['login' => $GLOBALS['login']]);
$basketRedirection = 'index.php#/basketList/users/'.$GLOBALS['id'].'/groups/'.$userGroups[0]['id'].'/baskets/'.$value['id'];
$resource = ResModel::getById(['id' => $resLetterboxReturn]);
if (!empty($resource['alt_identifier'])) {
@@ -132,7 +132,7 @@ class ReceiveMessageExchangeController
$basketRedirection = 'index.php';
}
- self::sendReply(['dataObject' => $sDataObject, 'Comment' => self::$aComments, 'replyCode' => '000 : OK', 'res_id_master' => $resLetterboxReturn, 'userId' => $GLOBALS['userId']]);
+ self::sendReply(['dataObject' => $sDataObject, 'Comment' => self::$aComments, 'replyCode' => '000 : OK', 'res_id_master' => $resLetterboxReturn, 'userId' => $GLOBALS['login']]);
return $response->withJson([
"resId" => $resLetterboxReturn,
@@ -162,7 +162,7 @@ class ReceiveMessageExchangeController
$finfo = new \finfo(FILEINFO_MIME_TYPE);
$mimeType = $finfo->buffer($file);
$ext = $aArgs['extension'];
- $tmpName = 'tmp_file_' .$GLOBALS['userId']. '_ArchiveTransfer_' .rand(). '.' . $ext;
+ $tmpName = 'tmp_file_' .$GLOBALS['login']. '_ArchiveTransfer_' .rand(). '.' . $ext;
if (!in_array(strtolower($ext), ['zip', 'tar'])) {
return ["errors" => 'Only zip file is allowed'];
@@ -445,10 +445,10 @@ class ReceiveMessageExchangeController
$acknowledgementObject->ArchivalAgency = $acknowledgementObject->Receiver;
$acknowledgementObject->TransferringAgency = $acknowledgementObject->Sender;
- $acknowledgementObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier = $GLOBALS['userId'];
+ $acknowledgementObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier = $GLOBALS['login'];
$acknowledgementObject->MessageIdentifier->value = $dataObject->MessageIdentifier->value . '_AckSent';
- $messageExchangeSaved = SendMessageExchangeController::saveMessageExchange(['dataObject' => $acknowledgementObject, 'res_id_master' => 0, 'type' => 'Acknowledgement', 'file_path' => $filePath, 'userId' => $GLOBALS['userId']]);
+ $messageExchangeSaved = SendMessageExchangeController::saveMessageExchange(['dataObject' => $acknowledgementObject, 'res_id_master' => 0, 'type' => 'Acknowledgement', 'file_path' => $filePath, 'userId' => $GLOBALS['login']]);
$acknowledgementObject->DataObjectPackage = new \stdClass();
$acknowledgementObject->DataObjectPackage->DescriptiveMetadata = new \stdClass();
@@ -480,7 +480,7 @@ class ReceiveMessageExchangeController
$replyObject->MessageRequestIdentifier->value = $dataObject->MessageIdentifier->value;
$replyObject->TransferringAgency = $dataObject->ArchivalAgency;
- $replyObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier = $GLOBALS['userId'];
+ $replyObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier = $GLOBALS['login'];
$replyObject->ArchivalAgency = $dataObject->TransferringAgency;
$replyObject->MessageIdentifier->value = $dataObject->MessageIdentifier->value . '_Reply';
@@ -504,7 +504,7 @@ class ReceiveMessageExchangeController
public function saveMessageExchangeReturn(Request $request, Response $response)
{
- if (empty($GLOBALS['userId'])) {
+ if (empty($GLOBALS['login'])) {
return $response->withStatus(401)->withJson(['errors' => 'User Not Connected']);
}
@@ -532,7 +532,7 @@ class ReceiveMessageExchangeController
$messageExchange = MessageExchangeModel::getMessageByReference(['select' => ['message_id', 'res_id_master'], 'reference' => $dataObject->MessageRequestIdentifier->value]);
}
- $messageExchangeSaved = SendMessageExchangeController::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $messageExchange['res_id_master'], 'type' => $data['type'], 'userId' => $GLOBALS['userId']]);
+ $messageExchangeSaved = SendMessageExchangeController::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $messageExchange['res_id_master'], 'type' => $data['type'], 'userId' => $GLOBALS['login']]);
if (!empty($messageExchangeSaved['error'])) {
return $response->withStatus(400)->withJson(['errors' => $messageExchangeSaved['error']]);
}
diff --git a/src/app/external/messageExchange/controllers/SendMessageExchangeController.php b/src/app/external/messageExchange/controllers/SendMessageExchangeController.php
index 63db80a6291..a4dd49db3ca 100755
--- a/src/app/external/messageExchange/controllers/SendMessageExchangeController.php
+++ b/src/app/external/messageExchange/controllers/SendMessageExchangeController.php
@@ -254,7 +254,7 @@ class SendMessageExchangeController
$filePath = SendMessageController::generateMessageFile(['messageObject' => $dataObject, 'type' => 'ArchiveTransfer']);
/******** SAVE MESSAGE *********/
- $messageExchangeReturn = self::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $args['resId'], 'file_path' => $filePath, 'type' => 'ArchiveTransfer', 'userId' => $GLOBALS['userId']]);
+ $messageExchangeReturn = self::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $args['resId'], 'file_path' => $filePath, 'type' => 'ArchiveTransfer', 'userId' => $GLOBALS['login']]);
if (!empty($messageExchangeReturn['error'])) {
return $response->withStatus(400)->withJson(['errors' => $messageExchangeReturn['error']]);
} else {
@@ -269,7 +269,7 @@ class SendMessageExchangeController
'eventId' => 'resup',
'info' => _NUMERIC_PACKAGE_ADDED . _ON_DOC_NUM
. $args['resId'] . ' ('.$messageId.') : "' . TextFormatModel::cutString(['string' => $mainDocument[0]['Title'], 'max' => 254]),
- 'userId' => $GLOBALS['userId']
+ 'userId' => $GLOBALS['login']
]);
HistoryController::add([
@@ -278,7 +278,7 @@ class SendMessageExchangeController
'eventType' => 'ADD',
'eventId' => 'messageexchangeadd',
'info' => _NUMERIC_PACKAGE_ADDED . ' (' . $messageId . ')',
- 'userId' => $GLOBALS['userId']
+ 'userId' => $GLOBALS['login']
]);
/******** ENVOI *******/
@@ -378,7 +378,7 @@ class SendMessageExchangeController
$messageObject->Date = $date->format(\DateTime::ATOM);
$messageObject->MessageIdentifier = new \stdClass();
- $messageObject->MessageIdentifier->value = 'ArchiveTransfer_'.date("Ymd_His").'_'.$GLOBALS['userId'];
+ $messageObject->MessageIdentifier->value = 'ArchiveTransfer_'.date("Ymd_His").'_'.$GLOBALS['login'];
/********* BINARY DATA OBJECT PACKAGE *********/
$messageObject->DataObjectPackage = new \stdClass();
@@ -567,7 +567,7 @@ class SendMessageExchangeController
$entityRoot = EntityModel::getEntityRootById(['entityId' => $aArgs['TransferringAgency']['EntitiesInformations']['entity_id']]);
$TransferringAgencyObject->OrganizationDescriptiveMetadata->LegalClassification = $entityRoot['entity_label'];
$TransferringAgencyObject->OrganizationDescriptiveMetadata->Name = $aArgs['TransferringAgency']['EntitiesInformations']['entity_label'];
- $TransferringAgencyObject->OrganizationDescriptiveMetadata->UserIdentifier = $GLOBALS['userId'];
+ $TransferringAgencyObject->OrganizationDescriptiveMetadata->UserIdentifier = $GLOBALS['login'];
$traCommunicationObject = new \stdClass();
diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index f9f8a789678..936035b67ad 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -40,7 +40,7 @@ class FolderController
{
public function get(Request $request, Response $response)
{
- $folders = FolderController::getScopeFolders(['login' => $GLOBALS['userId']]);
+ $folders = FolderController::getScopeFolders(['login' => $GLOBALS['login']]);
$userEntities = EntityModel::getWithUserEntities(['select' => ['entities.id'], 'where' => ['user_id = ?'], 'data' => [$GLOBALS['id']]]);
@@ -71,7 +71,7 @@ class FolderController
])
);
- $folderScope = FolderController::getScopeFolders(['login' => $GLOBALS['userId'], 'folderId' => $folder['id'], 'edition' => true]);
+ $folderScope = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $folder['id'], 'edition' => true]);
$insert = [
'name' => $folder['label'],
@@ -113,7 +113,7 @@ class FolderController
return $response->withStatus(400)->withJson(['errors' => 'Route id is not an integer']);
}
- $folder = FolderController::getScopeFolders(['login' => $GLOBALS['userId'], 'folderId' => $args['id']]);
+ $folder = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $args['id']]);
if (empty($folder[0])) {
return $response->withStatus(400)->withJson(['errors' => 'Folder not found or out of your perimeter']);
}
@@ -172,7 +172,7 @@ class FolderController
$public = false;
$level = 0;
} else {
- $folder = FolderController::getScopeFolders(['login' => $GLOBALS['userId'], 'folderId' => $data['parent_id'], 'edition' => true]);
+ $folder = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $data['parent_id'], 'edition' => true]);
if (empty($folder[0])) {
return $response->withStatus(400)->withJson(['errors' => 'Parent Folder not found or out of your perimeter']);
}
@@ -254,7 +254,7 @@ class FolderController
return $response->withStatus(400)->withJson(['errors' => 'parent_id does not exist or Id is a parent of parent_id']);
}
- $folder = FolderController::getScopeFolders(['login' => $GLOBALS['userId'], 'folderId' => $args['id'], 'edition' => true]);
+ $folder = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $args['id'], 'edition' => true]);
if (empty($folder[0])) {
return $response->withStatus(400)->withJson(['errors' => 'Folder not found or out of your perimeter']);
}
@@ -264,7 +264,7 @@ class FolderController
$data['parent_id'] = null;
$level = 0;
} else {
- $folderParent = FolderController::getScopeFolders(['login' => $GLOBALS['userId'], 'folderId' => $data['parent_id'], 'edition' => true]);
+ $folderParent = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $data['parent_id'], 'edition' => true]);
if (empty($folderParent[0])) {
return $response->withStatus(400)->withJson(['errors' => 'Parent Folder not found or out of your perimeter']);
}
@@ -439,7 +439,7 @@ class FolderController
public function folderSharing($args = [])
{
- $folder = FolderController::getScopeFolders(['login' => $GLOBALS['userId'], 'folderId' => $args['folderId'], 'edition' => true]);
+ $folder = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $args['folderId'], 'edition' => true]);
if (empty($folder[0])) {
return false;
}
@@ -571,7 +571,7 @@ class FolderController
return $response->withStatus(400)->withJson(['errors' => 'Cannot delete because at least one folder is out of your perimeter']);
}
- $folder = FolderController::getScopeFolders(['login' => $GLOBALS['userId'], 'folderId' => $aArgs['id'], 'edition' => true]);
+ $folder = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $aArgs['id'], 'edition' => true]);
DatabaseModel::beginTransaction();
$deletion = FolderController::folderDeletion(['folderId' => $aArgs['id']]);
@@ -595,7 +595,7 @@ class FolderController
public static function folderDeletion(array $args = [])
{
- $folder = FolderController::getScopeFolders(['login' => $GLOBALS['userId'], 'folderId' => $args['folderId'], 'edition' => true]);
+ $folder = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $args['folderId'], 'edition' => true]);
if (empty($folder[0])) {
return false;
}
@@ -623,7 +623,7 @@ class FolderController
ValidatorModel::intVal($args, ['folderId']);
ValidatorModel::arrayType($args, ['entities']);
- $folder = FolderController::getScopeFolders(['login' => $GLOBALS['userId'], 'folderId' => $args['folderId'], 'edition' => true]);
+ $folder = FolderController::getScopeFolders(['login' => $GLOBALS['login'], 'folderId' => $args['folderId'], 'edition' => true]);
if (empty($folder[0])) {
return false;
}
@@ -898,7 +898,7 @@ class FolderController
continue;
} else {
if (!in_array($basket['id'], $inCheckedBaskets)) {
- $preparedClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $GLOBALS['userId']]);
+ $preparedClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $GLOBALS['login']]);
$resource = ResModel::getOnView(['select' => [1], 'where' => ['res_id = ?', "({$preparedClause})"], 'data' => [$args['resId']]]);
if (empty($resource)) {
$outCheckedBaskets[] = $basket['id'];
diff --git a/src/app/group/controllers/GroupController.php b/src/app/group/controllers/GroupController.php
index ab480c18d0e..051d0cad579 100755
--- a/src/app/group/controllers/GroupController.php
+++ b/src/app/group/controllers/GroupController.php
@@ -68,7 +68,7 @@ class GroupController
return $response->withStatus(400)->withJson(['errors' => _ID. ' ' . _ALREADY_EXISTS]);
}
- if (!PreparedClauseController::isRequestValid(['clause' => $data['security']['where_clause'], 'userId' => $GLOBALS['userId']])) {
+ if (!PreparedClauseController::isRequestValid(['clause' => $data['security']['where_clause'], 'userId' => $GLOBALS['login']])) {
return $response->withStatus(400)->withJson(['errors' => _INVALID_CLAUSE]);
}
@@ -100,7 +100,7 @@ class GroupController
return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
}
- if (!PreparedClauseController::isRequestValid(['clause' => $data['security']['where_clause'], 'userId' => $GLOBALS['userId']])) {
+ if (!PreparedClauseController::isRequestValid(['clause' => $data['security']['where_clause'], 'userId' => $GLOBALS['login']])) {
return $response->withStatus(400)->withJson(['errors' => _INVALID_CLAUSE]);
}
@@ -158,7 +158,7 @@ class GroupController
$group['privileges'] = PrivilegeModel::getPrivilegesByGroupId(['groupId' => $args['id']]);
- if ($GLOBALS['userId'] == 'superadmin') {
+ if ($GLOBALS['login'] == 'superadmin') {
$allowedUsers = UserModel::get([
'select' => ['id'],
'where' => ['user_id != ?', 'status != ?'],
@@ -166,7 +166,7 @@ class GroupController
]);
$allowedUsers = array_column($allowedUsers, 'id');
} else {
- $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['login']]);
$allowedUsers = [];
if (!empty($entities)) {
$allowedUsers = UserEntityModel::getWithUsers([
diff --git a/src/app/group/models/GroupModelAbstract.php b/src/app/group/models/GroupModelAbstract.php
index bf6e1877a59..d1b5499deb5 100755
--- a/src/app/group/models/GroupModelAbstract.php
+++ b/src/app/group/models/GroupModelAbstract.php
@@ -197,7 +197,7 @@ abstract class GroupModelAbstract
$allGroups = GroupModel::get(['select' => ['group_id', 'group_desc'], 'orderBy' => ['group_desc']]);
- if ($GLOBALS['userId'] == 'superadmin') {
+ if ($GLOBALS['login'] == 'superadmin') {
$assignableGroups = GroupModel::get(['select' => ['group_id'], 'orderBy' => ['group_desc']]);
} else {
$assignableGroups = PrivilegeController::getAssignableGroups(['userId' => $GLOBALS['id']]);
diff --git a/src/app/history/controllers/HistoryController.php b/src/app/history/controllers/HistoryController.php
index 44e5b5d12ef..f8f4dac79fb 100755
--- a/src/app/history/controllers/HistoryController.php
+++ b/src/app/history/controllers/HistoryController.php
@@ -150,7 +150,7 @@ class HistoryController
LogsController::add($aArgs);
if (empty($aArgs['userId'])) {
- $aArgs['userId'] = $GLOBALS['userId'];
+ $aArgs['userId'] = $GLOBALS['login'];
}
HistoryModel::create([
@@ -175,7 +175,7 @@ class HistoryController
public function getByUserId(Request $request, Response $response, array $aArgs)
{
$user = UserModel::getById(['id' => $aArgs['userSerialId'], 'select' => ['user_id']]);
- if ($user['user_id'] != $GLOBALS['userId'] && !PrivilegeController::hasPrivilege(['privilegeId' => 'view_history', 'userId' => $GLOBALS['id']])) {
+ if ($user['user_id'] != $GLOBALS['login'] && !PrivilegeController::hasPrivilege(['privilegeId' => 'view_history', 'userId' => $GLOBALS['id']])) {
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
}
diff --git a/src/app/home/controllers/HomeController.php b/src/app/home/controllers/HomeController.php
index 3c6be5ea765..cf5b73066a7 100755
--- a/src/app/home/controllers/HomeController.php
+++ b/src/app/home/controllers/HomeController.php
@@ -35,7 +35,7 @@ class HomeController
$user = UserModel::getById(['id' => $GLOBALS['id'], 'select' => ['preferences', 'external_id']]);
$redirectedBaskets = RedirectBasketModel::getRedirectedBasketsByUserId(['userId' => $GLOBALS['id']]);
- $groups = UserModel::getGroupsByLogin(['login' => $GLOBALS['userId']]);
+ $groups = UserModel::getGroupsByLogin(['login' => $GLOBALS['login']]);
$preferences = json_decode($user['preferences'], true);
if (!empty($preferences['homeGroups'])) {
@@ -146,7 +146,7 @@ class HomeController
'res_letterbox.filename'
],
'limit' => 5,
- 'userId' => $GLOBALS['userId']
+ 'userId' => $GLOBALS['login']
]);
if (!empty($lastResources)) {
@@ -168,7 +168,7 @@ class HomeController
public function getMaarchParapheurDocuments(Request $request, Response $response)
{
- $user = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['external_id']]);
+ $user = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['external_id']]);
$externalId = json_decode($user['external_id'], true);
if (empty($externalId['maarchParapheur'])) {
diff --git a/src/app/notification/models/NotificationScheduleModelAbstract.php b/src/app/notification/models/NotificationScheduleModelAbstract.php
index 1f1a74328a9..876211706db 100755
--- a/src/app/notification/models/NotificationScheduleModelAbstract.php
+++ b/src/app/notification/models/NotificationScheduleModelAbstract.php
@@ -49,7 +49,7 @@ abstract class NotificationScheduleModelAbstract
HistoryController::add([
'tableName' => 'notifications',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
'eventId' => 'notificationadd',
'info' => _NOTIFICATION_SCHEDULE_UPDATED,
diff --git a/src/app/priority/controllers/PriorityController.php b/src/app/priority/controllers/PriorityController.php
index c475736fbc8..a8cc82cd13b 100755
--- a/src/app/priority/controllers/PriorityController.php
+++ b/src/app/priority/controllers/PriorityController.php
@@ -160,7 +160,7 @@ class PriorityController
HistoryController::add([
'tableName' => 'priorities',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
'info' => _PRIORITY_SORT_MODIFICATION,
'moduleId' => 'priority',
diff --git a/src/app/resource/controllers/ExportController.php b/src/app/resource/controllers/ExportController.php
index 9460eae5fa5..02acca5a0f5 100755
--- a/src/app/resource/controllers/ExportController.php
+++ b/src/app/resource/controllers/ExportController.php
@@ -62,7 +62,7 @@ class ExportController
public function updateExport(Request $request, Response $response, array $aArgs)
{
set_time_limit(240);
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $aArgs['groupId'], 'userId' => $aArgs['userId'], 'basketId' => $aArgs['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
diff --git a/src/app/resource/controllers/FolderPrintController.php b/src/app/resource/controllers/FolderPrintController.php
index 45577f3a91a..ed9ffc39279 100755
--- a/src/app/resource/controllers/FolderPrintController.php
+++ b/src/app/resource/controllers/FolderPrintController.php
@@ -796,7 +796,7 @@ class FolderPrintController
SummarySheetController::createSummarySheet($pdf, [
'resource' => $resource,
'units' => $units,
- 'login' => $GLOBALS['userId'],
+ 'login' => $GLOBALS['login'],
'data' => $data,
'fieldsIdentifier' => $fieldsIdentifier
]);
diff --git a/src/app/resource/controllers/IndexingController.php b/src/app/resource/controllers/IndexingController.php
index ca798a94342..feba1514d99 100755
--- a/src/app/resource/controllers/IndexingController.php
+++ b/src/app/resource/controllers/IndexingController.php
@@ -179,7 +179,7 @@ class IndexingController
}
if (!empty($clauseToProcess)) {
- $preparedClause = PreparedClauseController::getPreparedClause(['clause' => $clauseToProcess, 'login' => $GLOBALS['userId']]);
+ $preparedClause = PreparedClauseController::getPreparedClause(['clause' => $clauseToProcess, 'login' => $GLOBALS['login']]);
$preparedEntities = EntityModel::get(['select' => ['id'], 'where' => ['enabled = ?', "entity_id in {$preparedClause}"], 'data' => ['Y']]);
$allowedEntities = array_column($preparedEntities, 'id');
}
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 3e3da43c0b4..79198a91655 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -692,7 +692,7 @@ class ResController extends ResourceControlController
$formattedData[$type] = $item['count'];
}
- $formattedData['notes'] = NoteModel::countByResId(['resId' => $args['resId'], 'userId' => $GLOBALS['id'], 'login' => $GLOBALS['userId']]);
+ $formattedData['notes'] = NoteModel::countByResId(['resId' => $args['resId'], 'userId' => $GLOBALS['id'], 'login' => $GLOBALS['login']]);
$emails = EmailModel::get(['select' => ['count(1)'], 'where' => ["document->>'id' = ?", "(status != 'DRAFT' or (status = 'DRAFT' and user_id = ?))"], 'data' => [$args['resId'], $GLOBALS['id']]]);
$acknowledgementReceipts = AcknowledgementReceiptModel::get([
@@ -1054,7 +1054,7 @@ class ResController extends ResourceControlController
'item_id' => $diffusion['id'],
'item_type' => $diffusion['type'] == 'user' ? 'user_id' : 'entity_id',
'item_mode' => $diffusion['mode'],
- 'added_by_user' => $GLOBALS['userId'],
+ 'added_by_user' => $GLOBALS['login'],
'difflist_type' => 'entity_id'
]);
}
@@ -1175,13 +1175,13 @@ class ResController extends ResourceControlController
$select[] = 'res_id';
}
- if (!PreparedClauseController::isRequestValid(['select' => $select, 'clause' => $data['clause'], 'orderBy' => $data['orderBy'], 'limit' => $data['limit'], 'userId' => $GLOBALS['userId']])) {
+ if (!PreparedClauseController::isRequestValid(['select' => $select, 'clause' => $data['clause'], 'orderBy' => $data['orderBy'], 'limit' => $data['limit'], 'userId' => $GLOBALS['login']])) {
return $response->withStatus(400)->withJson(['errors' => _INVALID_REQUEST]);
}
$where = [$data['clause']];
- if ($GLOBALS['userId'] != 'superadmin') {
- $groupsClause = GroupController::getGroupsClause(['userId' => $GLOBALS['userId']]);
+ if ($GLOBALS['login'] != 'superadmin') {
+ $groupsClause = GroupController::getGroupsClause(['userId' => $GLOBALS['login']]);
if (empty($groupsClause)) {
return $response->withStatus(400)->withJson(['errors' => 'User has no groups']);
}
diff --git a/src/app/resource/controllers/ResourceControlController.php b/src/app/resource/controllers/ResourceControlController.php
index 62126765241..fee22e77f3b 100644
--- a/src/app/resource/controllers/ResourceControlController.php
+++ b/src/app/resource/controllers/ResourceControlController.php
@@ -491,7 +491,7 @@ class ResourceControlController
}
if (!empty($clauseToProcess)) {
- $preparedClause = PreparedClauseController::getPreparedClause(['clause' => $clauseToProcess, 'login' => $GLOBALS['userId']]);
+ $preparedClause = PreparedClauseController::getPreparedClause(['clause' => $clauseToProcess, 'login' => $GLOBALS['login']]);
$preparedEntities = EntityModel::get(['select' => ['id'], 'where' => ['enabled = ?', "entity_id in {$preparedClause}"], 'data' => ['Y']]);
$preparedEntities = array_column($preparedEntities, 'id');
$allowedEntities = array_merge($allowedEntities, $preparedEntities);
diff --git a/src/app/resource/controllers/ResourceListController.php b/src/app/resource/controllers/ResourceListController.php
index bd1c1453e8f..bd3cbed290a 100644
--- a/src/app/resource/controllers/ResourceListController.php
+++ b/src/app/resource/controllers/ResourceListController.php
@@ -164,7 +164,7 @@ class ResourceListController
public function getFilters(Request $request, Response $response, array $aArgs)
{
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $aArgs['groupId'], 'userId' => $aArgs['userId'], 'basketId' => $aArgs['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
@@ -341,7 +341,7 @@ class ResourceListController
foreach ($actions as $key => $action) {
if (!empty($queryParams['resId'])) {
if (!empty($actionsClauses[$action['id']])) {
- $whereClause = PreparedClauseController::getPreparedClause(['clause' => $actionsClauses[$action['id']], 'login' => $GLOBALS['userId']]);
+ $whereClause = PreparedClauseController::getPreparedClause(['clause' => $actionsClauses[$action['id']], 'login' => $GLOBALS['login']]);
$ressource = ResModel::getOnView(['select' => [1], 'where' => ['res_id = ?', $whereClause], 'data' => [$queryParams['resId']]]);
if (empty($ressource)) {
unset($actions[$key]);
@@ -483,7 +483,7 @@ class ResourceListController
}
$body['resources'] = array_slice($body['resources'], 0, 500);
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $aArgs['groupId'], 'userId' => $aArgs['userId'], 'basketId' => $aArgs['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
return $response->withStatus($errors['code'])->withJson(['errors' => $errors['errors']]);
@@ -553,7 +553,7 @@ class ResourceListController
}
$body['resources'] = array_slice($body['resources'], 0, 500);
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $aArgs['groupId'], 'userId' => $aArgs['userId'], 'basketId' => $aArgs['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
return $response->withStatus($errors['code'])->withJson(['errors' => $errors['errors']]);
diff --git a/src/app/resource/controllers/SummarySheetController.php b/src/app/resource/controllers/SummarySheetController.php
index 2cb196f95ea..e69c09d9fa2 100755
--- a/src/app/resource/controllers/SummarySheetController.php
+++ b/src/app/resource/controllers/SummarySheetController.php
@@ -42,7 +42,7 @@ class SummarySheetController
public function createList(Request $request, Response $response, array $aArgs)
{
set_time_limit(240);
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$errors = ResourceListController::listControl(['groupId' => $aArgs['groupId'], 'userId' => $aArgs['userId'], 'basketId' => $aArgs['basketId'], 'currentUserId' => $currentUser['id']]);
if (!empty($errors['errors'])) {
@@ -155,7 +155,7 @@ class SummarySheetController
foreach ($resources as $resource) {
SummarySheetController::createSummarySheet($pdf, [
'resource' => $resource, 'units' => $units,
- 'login' => $GLOBALS['userId'],
+ 'login' => $GLOBALS['login'],
'data' => $data,
'fieldsIdentifier' => $fieldsIdentifier
]);
@@ -290,7 +290,7 @@ class SummarySheetController
SummarySheetController::createSummarySheet($pdf, [
'resource' => $resource,
'units' => $units,
- 'login' => $GLOBALS['userId'],
+ 'login' => $GLOBALS['login'],
'data' => $data,
'fieldsIdentifier' => $fieldsIdentifier
]);
diff --git a/src/app/resource/controllers/UserFollowedResourceController.php b/src/app/resource/controllers/UserFollowedResourceController.php
index 4beb38e6e6a..3c7fe494ae0 100644
--- a/src/app/resource/controllers/UserFollowedResourceController.php
+++ b/src/app/resource/controllers/UserFollowedResourceController.php
@@ -190,7 +190,7 @@ class UserFollowedResourceController
continue;
} else {
if (!in_array($basket['id'], $inCheckedBaskets)) {
- $preparedClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $GLOBALS['userId']]);
+ $preparedClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $GLOBALS['login']]);
$resource = ResModel::getOnView(['select' => [1], 'where' => ['res_id = ?', "({$preparedClause})"], 'data' => [$args['resId']]]);
if (empty($resource)) {
$outCheckedBaskets[] = $basket['id'];
diff --git a/src/app/search/controllers/SearchController.php b/src/app/search/controllers/SearchController.php
index 9ad95db88f7..c6122a5a872 100644
--- a/src/app/search/controllers/SearchController.php
+++ b/src/app/search/controllers/SearchController.php
@@ -38,7 +38,7 @@ class SearchController
{
$queryParams = $request->getQueryParams();
- if ($GLOBALS['userId'] == 'superadmin') {
+ if ($GLOBALS['login'] == 'superadmin') {
$whereClause = '1=1';
$dataClause = [];
} else {
@@ -52,11 +52,11 @@ class SearchController
$whereClause = "(res_id in (select res_id from users_followed_resources where user_id = ?)) OR ({$foldersClause})";
$dataClause = [$GLOBALS['id'], $entities, $GLOBALS['id']];
- $groups = UserModel::getGroupsByLogin(['login' => $GLOBALS['userId'], 'select' => ['where_clause']]);
+ $groups = UserModel::getGroupsByLogin(['login' => $GLOBALS['login'], 'select' => ['where_clause']]);
$groupsClause = '';
foreach ($groups as $key => $group) {
if (!empty($group['where_clause'])) {
- $groupClause = PreparedClauseController::getPreparedClause(['clause' => $group['where_clause'], 'login' => $GLOBALS['userId']]);
+ $groupClause = PreparedClauseController::getPreparedClause(['clause' => $group['where_clause'], 'login' => $GLOBALS['login']]);
if ($key > 0) {
$groupsClause .= ' or ';
}
@@ -67,11 +67,11 @@ class SearchController
$whereClause .= " OR ({$groupsClause})";
}
- $baskets = BasketModel::getBasketsByLogin(['login' => $GLOBALS['userId']]);
+ $baskets = BasketModel::getBasketsByLogin(['login' => $GLOBALS['login']]);
$basketsClause = '';
foreach ($baskets as $basket) {
if (!empty($basket['basket_clause'])) {
- $basketClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $GLOBALS['userId']]);
+ $basketClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $GLOBALS['login']]);
if (!empty($basketsClause)) {
$basketsClause .= ' or ';
}
diff --git a/src/app/signatureBook/controllers/SignatureBookController.php b/src/app/signatureBook/controllers/SignatureBookController.php
index efe0474c7f3..aa14b809df1 100755
--- a/src/app/signatureBook/controllers/SignatureBookController.php
+++ b/src/app/signatureBook/controllers/SignatureBookController.php
@@ -67,7 +67,7 @@ class SignatureBookController
'data' => [$aArgs['resId'], ['visa', 'sign']]
]);
- $currentUser = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$owner = UserModel::getById(['id' => $aArgs['userId'], 'select' => ['user_id']]);
$whereClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $owner['user_id']]);
$resources = ResModel::getOnView([
@@ -79,14 +79,14 @@ class SignatureBookController
$datas['attachments'] = SignatureBookController::getAttachmentsForSignatureBook(['resId' => $resId, 'userId' => $GLOBALS['id']]);
$datas['documents'] = $documents;
$datas['resList'] = $resources;
- $datas['nbNotes'] = NoteModel::countByResId(['resId' => $resId, 'userId' => $GLOBALS['id'], 'login' => $GLOBALS['userId']]);
+ $datas['nbNotes'] = NoteModel::countByResId(['resId' => $resId, 'userId' => $GLOBALS['id'], 'login' => $GLOBALS['login']]);
$datas['nbLinks'] = 0;
$datas['signatures'] = UserSignatureModel::getByUserSerialId(['userSerialid' => $currentUser['id']]);
$datas['consigne'] = UserModel::getCurrentConsigneById(['resId' => $resId]);
$datas['hasWorkflow'] = ((int)$listInstances[0]['count'] > 0);
$datas['listinstance'] = ListInstanceModel::getCurrentStepByResId(['resId' => $resId]);
$datas['canSign'] = PrivilegeController::hasPrivilege(['privilegeId' => 'sign_document', 'userId' => $GLOBALS['id']]);
- $datas['isCurrentWorkflowUser'] = $datas['listinstance']['item_id'] == $GLOBALS['userId'];
+ $datas['isCurrentWorkflowUser'] = $datas['listinstance']['item_id'] == $GLOBALS['login'];
return $response->withJson($datas);
}
@@ -484,7 +484,7 @@ class SignatureBookController
ListInstanceModel::update([
'set' => ['signatory' => 'true'],
'where' => ['res_id = ?', 'item_id = ?', 'difflist_type = ?'],
- 'data' => [$args['resId'], $GLOBALS['userId'], 'VISA_CIRCUIT']
+ 'data' => [$args['resId'], $GLOBALS['login'], 'VISA_CIRCUIT']
]);
@@ -518,7 +518,7 @@ class SignatureBookController
ListInstanceModel::update([
'set' => ['signatory' => 'false'],
'where' => ['res_id = ?', 'item_id = ?', 'difflist_type = ?'],
- 'data' => [$args['resId'], $GLOBALS['userId'], 'VISA_CIRCUIT']
+ 'data' => [$args['resId'], $GLOBALS['login'], 'VISA_CIRCUIT']
]);
}
@@ -627,7 +627,7 @@ class SignatureBookController
ListInstanceModel::update([
'set' => ['signatory' => 'true'],
'where' => ['res_id = ?', 'item_id = ?', 'difflist_type = ?'],
- 'data' => [$attachment['res_id_master'], $GLOBALS['userId'], 'VISA_CIRCUIT']
+ 'data' => [$attachment['res_id_master'], $GLOBALS['login'], 'VISA_CIRCUIT']
]);
HistoryController::add([
@@ -669,7 +669,7 @@ class SignatureBookController
ListInstanceModel::update([
'set' => ['signatory' => 'false'],
'where' => ['res_id = ?', 'item_id = ?', 'difflist_type = ?'],
- 'data' => [$attachment['res_id_master'], $GLOBALS['userId'], 'VISA_CIRCUIT']
+ 'data' => [$attachment['res_id_master'], $GLOBALS['login'], 'VISA_CIRCUIT']
]);
}
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index c461b0c1724..ba0b1e8038d 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -65,14 +65,14 @@ class UserController
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
}
- if ($GLOBALS['userId'] == 'superadmin') {
+ if ($GLOBALS['login'] == 'superadmin') {
$users = UserModel::get([
'select' => ['id', 'user_id', 'firstname', 'lastname', 'status', 'mail', 'loginmode'],
'where' => ['user_id != ?', 'status != ?'],
'data' => ['superadmin', 'DEL']
]);
} else {
- $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['login']]);
$users = [];
if (!empty($entities)) {
$users = UserEntityModel::getWithUsers([
@@ -128,7 +128,7 @@ class UserController
$user['groups'] = UserModel::getGroupsByLogin(['login' => $user['user_id']]);
$user['allGroups'] = GroupModel::getAvailableGroupsByUserId(['userId' => $user['id']]);
$user['entities'] = UserModel::getEntitiesById(['id' => $aArgs['id'], 'select' => ['entities.id', 'users_entities.entity_id', 'entities.entity_label', 'users_entities.user_role', 'users_entities.primary_entity'], 'orderBy' => ['users_entities.primary_entity DESC']]);
- $user['allEntities'] = EntityModel::getAvailableEntitiesForAdministratorByUserId(['userId' => $user['user_id'], 'administratorUserId' => $GLOBALS['userId']]);
+ $user['allEntities'] = EntityModel::getAvailableEntitiesForAdministratorByUserId(['userId' => $user['user_id'], 'administratorUserId' => $GLOBALS['login']]);
$user['baskets'] = BasketModel::getBasketsByLogin(['login' => $user['user_id']]);
$user['assignedBaskets'] = RedirectBasketModel::getAssignedBasketsByUserId(['userId' => $user['id']]);
$user['redirectedBaskets'] = RedirectBasketModel::getRedirectedBasketsByUserId(['userId' => $user['id']]);
@@ -226,7 +226,7 @@ class UserController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'ADD',
'eventId' => 'userCreation',
'info' => _USER_CREATED . " {$data['userId']}"
@@ -293,7 +293,7 @@ class UserController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
'eventId' => 'userModification',
'info' => _USER_UPDATED . " {$data['firstname']} {$data['lastname']}"
@@ -333,7 +333,7 @@ class UserController
'where' => ['item_id = ?', 'type = ?', 'item_mode = ?', 'item_type = ?', 'entity_id is not null'],
'data' => [$aArgs['id'], 'diffusionList', 'dest', 'user']
]);
- $allEntities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $allEntities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['login']]);
if (!empty($allEntities)) {
$allEntities = EntityModel::get(['select' => ['id'], 'where' => ['entity_id in (?)'], 'data' => [$allEntities]]);
$allEntities = array_column($allEntities, 'id');
@@ -421,7 +421,7 @@ class UserController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'DEL',
'eventId' => 'userSuppression',
'info' => _USER_SUSPENDED . " {$user['firstname']} {$user['lastname']}"
@@ -487,7 +487,7 @@ class UserController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'DEL',
'eventId' => 'userSuppression',
'info' => _USER_DELETED . " {$user['firstname']} {$user['lastname']}"
@@ -565,7 +565,7 @@ class UserController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
'eventId' => 'userModification',
'info' => _USER_UPDATED . " {$body['firstname']} {$body['lastname']}"
@@ -601,7 +601,7 @@ class UserController
HistoryController::add([
'tableName' => 'users',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
'eventId' => 'userModification',
'info' => _USER_PREFERENCE_UPDATED . " {$user['firstname']} {$user['lastname']}"
@@ -627,7 +627,7 @@ class UserController
}
$user = UserModel::getById(['id' => $aArgs['id'], 'select' => ['user_id', 'loginmode']]);
- if ($user['loginmode'] != 'restMode' && $user['user_id'] != $GLOBALS['userId']) {
+ if ($user['loginmode'] != 'restMode' && $user['user_id'] != $GLOBALS['login']) {
return $response->withStatus(403)->withJson(['errors' => 'Not allowed']);
}
@@ -707,7 +707,7 @@ class UserController
]);
HistoryController::add([
'tableName' => 'redirected_baskets',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
'eventId' => 'basketRedirection',
'info' => _BASKET_REDIRECTION . " {$value['basket_id']} {$value['actual_user_id']}"
@@ -726,7 +726,7 @@ class UserController
]);
HistoryController::add([
'tableName' => 'redirected_baskets',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'UP',
'eventId' => 'basketRedirection',
'info' => _BASKET_REDIRECTION . " {$value['basket_id']} {$aArgs['id']} => {$value['actual_user_id']}"
@@ -740,7 +740,7 @@ class UserController
$userBaskets = BasketModel::getBasketsByLogin(['login' => $user['user_id']]);
- if ($GLOBALS['userId'] == $user['user_id']) {
+ if ($GLOBALS['login'] == $user['user_id']) {
foreach ($userBaskets as $key => $basket) {
if (!$basket['allowed']) {
unset($userBaskets[$key]);
@@ -789,7 +789,7 @@ class UserController
HistoryController::add([
'tableName' => 'redirected_baskets',
- 'recordId' => $GLOBALS['userId'],
+ 'recordId' => $GLOBALS['login'],
'eventType' => 'DEL',
'eventId' => 'basketRedirection',
'info' => _BASKET_REDIRECTION_SUPPRESSION . " {$user['user_id']} : " . $redirectedBasket[0]['basket_id']
@@ -800,7 +800,7 @@ class UserController
$userBaskets = BasketModel::getBasketsByLogin(['login' => $user['user_id']]);
- if ($GLOBALS['userId'] == $user['user_id']) {
+ if ($GLOBALS['login'] == $user['user_id']) {
foreach ($userBaskets as $key => $basket) {
if (!$basket['allowed']) {
unset($userBaskets[$key]);
@@ -1245,7 +1245,7 @@ class UserController
return $response->withJson([
'entities' => UserModel::getEntitiesById(['id' => $aArgs['id'], 'select' => ['entities.id', 'users_entities.entity_id', 'entities.entity_label', 'users_entities.user_role', 'users_entities.primary_entity'], 'orderBy' => ['users_entities.primary_entity DESC']]),
- 'allEntities' => EntityModel::getAvailableEntitiesForAdministratorByUserId(['userId' => $user['user_id'], 'administratorUserId' => $GLOBALS['userId']])
+ 'allEntities' => EntityModel::getAvailableEntitiesForAdministratorByUserId(['userId' => $user['user_id'], 'administratorUserId' => $GLOBALS['login']])
]);
}
@@ -1392,7 +1392,7 @@ class UserController
return $response->withJson([
'entities' => UserModel::getEntitiesById(['id' => $aArgs['id'], 'select' => ['entities.id', 'users_entities.entity_id', 'entities.entity_label', 'users_entities.user_role', 'users_entities.primary_entity'], 'orderBy' => ['users_entities.primary_entity DESC']]),
- 'allEntities' => EntityModel::getAvailableEntitiesForAdministratorByUserId(['userId' => $user['user_id'], 'administratorUserId' => $GLOBALS['userId']])
+ 'allEntities' => EntityModel::getAvailableEntitiesForAdministratorByUserId(['userId' => $user['user_id'], 'administratorUserId' => $GLOBALS['login']])
]);
}
@@ -1539,7 +1539,7 @@ class UserController
{
$data = $request->getParams();
- $user = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $user = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
if (isset($data['color']) && $data['color'] == '') {
UserBasketPreferenceModel::update([
@@ -1556,7 +1556,7 @@ class UserController
}
return $response->withJson([
- 'userBaskets' => BasketModel::getRegroupedBasketsByUserId(['userId' => $GLOBALS['userId']])
+ 'userBaskets' => BasketModel::getRegroupedBasketsByUserId(['userId' => $GLOBALS['login']])
]);
}
@@ -1590,13 +1590,13 @@ class UserController
return ['status' => 400, 'error' => 'User not found'];
}
- if (empty($args['himself']) || $GLOBALS['userId'] != $user['user_id']) {
+ if (empty($args['himself']) || $GLOBALS['login'] != $user['user_id']) {
if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_users', 'userId' => $GLOBALS['id']])) {
return ['status' => 403, 'error' => 'Service forbidden'];
}
- if ($GLOBALS['userId'] != 'superadmin') {
+ if ($GLOBALS['login'] != 'superadmin') {
$users = [];
- $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['login']]);
if (!empty($entities)) {
$users = UserEntityModel::getWithUsers([
'select' => ['users.id'],
@@ -1616,7 +1616,7 @@ class UserController
return ['status' => 403, 'error' => 'UserId out of perimeter'];
}
}
- } elseif ($args['delete'] && $GLOBALS['userId'] == $user['user_id']) {
+ } elseif ($args['delete'] && $GLOBALS['login'] == $user['user_id']) {
return ['status' => 403, 'error' => 'Can not delete yourself'];
}
@@ -1648,7 +1648,7 @@ class UserController
}
$GLOBALS['id'] = $user['id'];
- $GLOBALS['userId'] = $body['login'];
+ $GLOBALS['login'] = $body['login'];
$resetToken = AuthenticationController::getResetJWT(['id' => $user['id'], 'expirationTime' => 3600]); // 1 hour
UserModel::update(['set' => ['reset_token' => $resetToken], 'where' => ['id = ?'], 'data' => [$user['id']]]);
@@ -1721,7 +1721,7 @@ class UserController
UserModel::resetPassword(['password' => $body['password'], 'id' => $user['id']]);
$GLOBALS['id'] = $user['id'];
- $GLOBALS['userId'] = $user['user_id'];
+ $GLOBALS['login'] = $user['user_id'];
HistoryController::add([
'tableName' => 'users',
diff --git a/src/core/controllers/AuthenticationController.php b/src/core/controllers/AuthenticationController.php
index 7ef2ec71895..1fb3d8c52d8 100755
--- a/src/core/controllers/AuthenticationController.php
+++ b/src/core/controllers/AuthenticationController.php
@@ -53,13 +53,13 @@ class AuthenticationController
if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
if (AuthenticationModel::authentication(['login' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']])) {
$loginMethod = CoreConfigModel::getLoggingMethod();
+ $user = UserModel::getByLogin(['select' => ['id', 'loginmode'], 'userId' => $_SERVER['PHP_AUTH_USER']]);
if ($loginMethod['id'] != 'standard') {
- $user = UserModel::getByLogin(['select' => ['loginmode'], 'userId' => $_SERVER['PHP_AUTH_USER']]);
if ($user['loginmode'] == 'restMode') {
- $userId = $_SERVER['PHP_AUTH_USER'];
+ $userId = $user['id'];
}
} else {
- $userId = $_SERVER['PHP_AUTH_USER'];
+ $userId = $user['id'];
}
}
} else {
@@ -78,9 +78,7 @@ class AuthenticationController
}
$jwt['user'] = (array)$jwt['user'];
if (!empty($jwt) && !empty($jwt['user']['id'])) {
- $id = $jwt['user']['id'];
- $user = UserModel::getById(['select' => ['user_id'], 'id' => $id]);
- $userId = $user['user_id'];
+ $userId = $jwt['user']['id'];
}
}
}
@@ -89,7 +87,7 @@ class AuthenticationController
if (!empty($userId)) {
UserModel::update([
'set' => ['reset_token' => null],
- 'where' => ['user_id = ?'],
+ 'where' => ['id = ?'],
'data' => [$userId]
]);
}
@@ -97,19 +95,20 @@ class AuthenticationController
return $userId;
}
- public static function isRouteAvailable(array $aArgs)
+ public static function isRouteAvailable(array $args)
{
- ValidatorModel::notEmpty($aArgs, ['login', 'currentRoute']);
- ValidatorModel::stringType($aArgs, ['login', 'currentRoute']);
+ ValidatorModel::notEmpty($args, ['userId', 'currentRoute']);
+ ValidatorModel::intVal($args, ['userId']);
+ ValidatorModel::stringType($args, ['currentRoute']);
- if ($aArgs['currentRoute'] != '/initialize') {
- $user = UserModel::getByLogin(['select' => ['status'], 'login' => $aArgs['login']]);
+ if ($args['currentRoute'] != '/initialize') {
+ $user = UserModel::getById(['select' => ['status'], 'id' => $args['userId']]);
- if ($user['status'] == 'ABS' && !in_array($aArgs['currentRoute'], ['/users/{id}/status', '/currentUser/profile', '/header', '/passwordRules', '/users/{id}/password'])) {
+ if ($user['status'] == 'ABS' && !in_array($args['currentRoute'], ['/users/{id}/status', '/currentUser/profile', '/header', '/passwordRules', '/users/{id}/password'])) {
return ['isRouteAvailable' => false, 'errors' => 'User is ABS and must be activated'];
}
- if (!in_array($aArgs['currentRoute'], ['/passwordRules', '/users/{id}/password'])) {
+ if (!in_array($args['currentRoute'], ['/passwordRules', '/users/{id}/password'])) {
$loggingMethod = CoreConfigModel::getLoggingMethod();
if (!in_array($loggingMethod['id'], ['sso', 'cas', 'ldap', 'keycloak', 'shibboleth'])) {
diff --git a/src/core/controllers/AutoCompleteController.php b/src/core/controllers/AutoCompleteController.php
index 0e79ac47d88..2da1d765c13 100755
--- a/src/core/controllers/AutoCompleteController.php
+++ b/src/core/controllers/AutoCompleteController.php
@@ -346,8 +346,8 @@ class AutoCompleteController
$excludedUsers = ['superadmin'];
- if ($GLOBALS['userId'] != 'superadmin') {
- $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['userId']]);
+ if ($GLOBALS['login'] != 'superadmin') {
+ $entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['login']]);
$fields = ['users.firstname', 'users.lastname'];
$fields = AutoCompleteController::getUnsensitiveFieldsForRequest(['fields' => $fields]);
@@ -861,7 +861,7 @@ class AutoCompleteController
return $response->withStatus(400)->withJson(['errors' => 'Query params search is empty']);
}
- $scopedFolders = FolderController::getScopeFolders(['login' => $GLOBALS['userId']]);
+ $scopedFolders = FolderController::getScopeFolders(['login' => $GLOBALS['login']]);
if (empty($scopedFolders)) {
return $response->withJson([]);
}
diff --git a/src/core/controllers/CoreController.php b/src/core/controllers/CoreController.php
index d1413307738..fbd7474e63a 100755
--- a/src/core/controllers/CoreController.php
+++ b/src/core/controllers/CoreController.php
@@ -30,8 +30,8 @@ class CoreController
$aInit['applicationName'] = CoreConfigModel::getApplicationName();
$aInit['applicationVersion'] = CoreConfigModel::getApplicationVersion();
$aInit['lang'] = CoreConfigModel::getLanguage();
- if (!empty($GLOBALS['userId'])) {
- $aInit['user'] = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id', 'user_id', 'firstname', 'lastname']]);
+ if (!empty($GLOBALS['login'])) {
+ $aInit['user'] = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id', 'user_id', 'firstname', 'lastname']]);
}
$aInit['customLanguage'] = CoreConfigModel::getCustomLanguage(['lang' => $aInit['lang']]);
@@ -81,8 +81,8 @@ class CoreController
public function getHeader(Request $request, Response $response)
{
- $user = UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id', 'user_id', 'firstname', 'lastname']]);
- $user['groups'] = UserModel::getGroupsByLogin(['login' => $GLOBALS['userId']]);
+ $user = UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id', 'user_id', 'firstname', 'lastname']]);
+ $user['groups'] = UserModel::getGroupsByLogin(['login' => $GLOBALS['login']]);
$user['entities'] = UserModel::getEntitiesById(['id' => $GLOBALS['id'], 'select' => ['entities.id', 'users_entities.entity_id', 'entities.entity_label', 'users_entities.user_role', 'users_entities.primary_entity']]);
return $response->withJson(['user' => $user]);
@@ -90,12 +90,12 @@ class CoreController
public static function setGlobals(array $args)
{
- ValidatorModel::notEmpty($args, ['login']);
- ValidatorModel::stringType($args, ['login']);
+ ValidatorModel::notEmpty($args, ['userId']);
+ ValidatorModel::intVal($args, ['userId']);
- $user = UserModel::getByLogin(['login' => $args['login'], 'select' => ['id']]);
- $GLOBALS['userId'] = $args['login'];
- $GLOBALS['id'] = $user['id'];
+ $user = UserModel::getById(['id' => $args['userId'], 'select' => ['user_id']]);
+ $GLOBALS['login'] = $user['user_id'];
+ $GLOBALS['id'] = $args['userId'];
}
public function externalConnectionsEnabled(Request $request, Response $response)
diff --git a/src/core/controllers/LogsController.php b/src/core/controllers/LogsController.php
index 93e214331a3..6b9aadc1d62 100755
--- a/src/core/controllers/LogsController.php
+++ b/src/core/controllers/LogsController.php
@@ -137,7 +137,7 @@ class LogsController
'WHERE' => $aArgs['tableName'],
'ID' => $aArgs['recordId'],
'HOW' => $aArgs['eventType'],
- 'USER' => $GLOBALS['userId'],
+ 'USER' => $GLOBALS['login'],
'WHAT' => $aArgs['eventId'],
'ID_MODULE' => $aArgs['moduleId'],
'REMOTE_IP' => $_SERVER['REMOTE_ADDR'],
diff --git a/test/unitTests/app/administration/AdministrationControllerTest.php b/test/unitTests/app/administration/AdministrationControllerTest.php
index e841104bd7d..6e65303cb89 100755
--- a/test/unitTests/app/administration/AdministrationControllerTest.php
+++ b/test/unitTests/app/administration/AdministrationControllerTest.php
@@ -15,8 +15,8 @@ class AdministrationControllerTest extends TestCase
{
public function testGetDetails()
{
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
@@ -31,8 +31,8 @@ class AdministrationControllerTest extends TestCase
$this->assertIsInt($responseBody->count->groups);
$this->assertIsInt($responseBody->count->entities);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/attachment/AttachmentControllerTest.php b/test/unitTests/app/attachment/AttachmentControllerTest.php
index 2628ec7d080..83d70a432b3 100755
--- a/test/unitTests/app/attachment/AttachmentControllerTest.php
+++ b/test/unitTests/app/attachment/AttachmentControllerTest.php
@@ -148,16 +148,16 @@ class AttachmentControllerTest extends TestCase
}
// ERROR
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $attachmentController->getByResId($request, new \Slim\Http\Response(), ['resId' => 123940595]);
$response = json_decode((string)$response->getBody(), true);
$this->assertSame('Document out of perimeter', $response['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
diff --git a/test/unitTests/app/doctype/DoctypeControllerTest.php b/test/unitTests/app/doctype/DoctypeControllerTest.php
index d75bb8bdc70..e18fd88d759 100755
--- a/test/unitTests/app/doctype/DoctypeControllerTest.php
+++ b/test/unitTests/app/doctype/DoctypeControllerTest.php
@@ -556,8 +556,8 @@ class DoctypeControllerTest extends TestCase
$resController = new \Resource\controllers\ResController();
// CREATE RESOURCE
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'POST']);
@@ -590,8 +590,8 @@ class DoctypeControllerTest extends TestCase
$resId = $responseBody->resId;
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
@@ -641,8 +641,8 @@ class DoctypeControllerTest extends TestCase
$this->assertSame('wrong format for new_type_id', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
diff --git a/test/unitTests/app/entity/ListInstanceControllerTest.php b/test/unitTests/app/entity/ListInstanceControllerTest.php
index bfcef2bbfe2..7d75cc0f560 100644
--- a/test/unitTests/app/entity/ListInstanceControllerTest.php
+++ b/test/unitTests/app/entity/ListInstanceControllerTest.php
@@ -15,8 +15,8 @@ class ListInstanceControllerTest extends TestCase
public function testUpdateCircuits()
{
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$resController = new \Resource\controllers\ResController();
@@ -48,8 +48,8 @@ class ListInstanceControllerTest extends TestCase
self::$resourceId = $responseBody['resId'];
$this->assertIsInt(self::$resourceId);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$listInstanceController = new \Entity\controllers\ListInstanceController();
diff --git a/test/unitTests/app/folder/FolderControllerTest.php b/test/unitTests/app/folder/FolderControllerTest.php
index 7a9ce4bbc5a..07239742e4a 100755
--- a/test/unitTests/app/folder/FolderControllerTest.php
+++ b/test/unitTests/app/folder/FolderControllerTest.php
@@ -23,8 +23,8 @@ class FolderControllerTest extends TestCase
public function testCreate()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -97,15 +97,15 @@ class FolderControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Parent Folder not found or out of your perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testUpdate()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -185,15 +185,15 @@ class FolderControllerTest extends TestCase
$this->assertSame('Folder not found or out of your perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testSharing()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -227,8 +227,8 @@ class FolderControllerTest extends TestCase
$this->assertSame('Body sharing/entities does not exists', $responseBody->errors);
// Success
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// Test bblier cannot get folder
@@ -239,8 +239,8 @@ class FolderControllerTest extends TestCase
// share folder with entity 13, which bblier is part of
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -261,8 +261,8 @@ class FolderControllerTest extends TestCase
$this->assertSame(204, $response->getStatusCode());
// check that bblier can now get folder
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $folderController->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -277,8 +277,8 @@ class FolderControllerTest extends TestCase
// Set different sharing for sub-folder
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -303,8 +303,8 @@ class FolderControllerTest extends TestCase
$this->assertSame(204, $response->getStatusCode());
// test that bblier can get sub-folder, but that he cannot edit/delete it
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $folderController->getById($request, new \Slim\Http\Response(), ['id' => self::$idSub]);
@@ -379,8 +379,8 @@ class FolderControllerTest extends TestCase
$this->assertSame('Cannot share/unshare folder because at least one folder is out of your perimeter', $responseBody['errors']);
// test sub-folder creation, with keeping sharing rules from parent
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -417,15 +417,15 @@ class FolderControllerTest extends TestCase
$response = $folderController->sharing($fullRequest, new \Slim\Http\Response(), ['id' => self::$idSubSub]);
$this->assertSame(204, $response->getStatusCode());
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testUpdateMoveToFolder()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -447,8 +447,8 @@ class FolderControllerTest extends TestCase
$this->assertSame(400, $response->getStatusCode());
$this->assertSame('parent_id does not exist or Id is a parent of parent_id', $responseBody['errors']);
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -475,8 +475,8 @@ class FolderControllerTest extends TestCase
$this->assertSame('Cannot move folder because at least one folder is out of your perimeter', $responseBody['errors']);
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -502,15 +502,15 @@ class FolderControllerTest extends TestCase
$this->assertSame(200, $response->getStatusCode(), true);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetById()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -537,15 +537,15 @@ class FolderControllerTest extends TestCase
$this->assertSame('Folder not found or out of your perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGet()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -572,8 +572,8 @@ class FolderControllerTest extends TestCase
$this->assertIsInt($value->countResources);
}
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $folderController->get($request, new \Slim\Http\Response());
@@ -584,8 +584,8 @@ class FolderControllerTest extends TestCase
public function testUnpinFolder()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -625,15 +625,15 @@ class FolderControllerTest extends TestCase
$this->assertSame(400, $response->getStatusCode());
$this->assertSame('Route id not found or is not an integer', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testPinFolder()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -673,15 +673,15 @@ class FolderControllerTest extends TestCase
$this->assertSame(400, $response->getStatusCode());
$this->assertSame('Route id not found or is not an integer', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetPinned()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -708,8 +708,8 @@ class FolderControllerTest extends TestCase
$this->assertIsInt($value->countResources);
}
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -717,8 +717,8 @@ class FolderControllerTest extends TestCase
{
// Create resources to add to folder
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$resController = new \Resource\controllers\ResController();
@@ -799,8 +799,8 @@ class FolderControllerTest extends TestCase
$this->assertIsInt(self::$idFirstResource);
// Actual test
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -858,15 +858,15 @@ class FolderControllerTest extends TestCase
$this->assertSame('Resources out of perimeter', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetResourceById()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -922,15 +922,15 @@ class FolderControllerTest extends TestCase
$this->assertIsArray($responseBody['resources'][0]['display']);
$this->assertEmpty($responseBody['resources'][0]['display']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetBaskets()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -977,15 +977,15 @@ class FolderControllerTest extends TestCase
$this->assertSame(4, $responseBody['groupsBaskets'][1]['basketId']);
$this->assertSame('Courriers à traiter', $responseBody['groupsBaskets'][1]['basketName']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetFilters()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -1064,15 +1064,15 @@ class FolderControllerTest extends TestCase
$this->assertIsArray($responseBody['folders']);
$this->assertEmpty($responseBody['folders']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testRemoveResourcesById()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -1120,15 +1120,15 @@ class FolderControllerTest extends TestCase
$this->assertIsInt($responseBody['countResources']);
$this->assertSame(1, $responseBody['countResources']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testDelete()
{
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$folderController = new \Folder\controllers\FolderController();
@@ -1149,8 +1149,8 @@ class FolderControllerTest extends TestCase
$this->assertSame('Query id is empty or not an integer', $responseBody->errors);
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// DELETE
@@ -1184,8 +1184,8 @@ class FolderControllerTest extends TestCase
$this->assertIsArray($res);
$this->assertEmpty($res);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/group/GroupControllerTest.php b/test/unitTests/app/group/GroupControllerTest.php
index df7569c0bfd..94867f30c51 100755
--- a/test/unitTests/app/group/GroupControllerTest.php
+++ b/test/unitTests/app/group/GroupControllerTest.php
@@ -100,8 +100,8 @@ class GroupControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody(), true);
$this->assertSame(_INVALID_CLAUSE, $responseBody['errors']);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->create($fullRequest, new \Slim\Http\Response());
@@ -110,8 +110,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -198,8 +198,8 @@ class GroupControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody(), true);
$this->assertSame(_INVALID_CLAUSE, $responseBody['errors']);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -208,8 +208,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -235,8 +235,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Group not found', $responseBody->errors);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -245,8 +245,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -270,8 +270,8 @@ class GroupControllerTest extends TestCase
}
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->get($request, new \Slim\Http\Response());
@@ -280,8 +280,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -306,8 +306,8 @@ class GroupControllerTest extends TestCase
$this->assertSame(true, $responseBody['group']['canAdminUsers']);
$this->assertSame(true, $responseBody['group']['canAdminBaskets']);
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->getDetailledById($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -328,8 +328,8 @@ class GroupControllerTest extends TestCase
$this->assertEmpty($responseBody['group']['privileges']);
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->getDetailledById($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -338,8 +338,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -370,8 +370,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Group not found', $responseBody['errors']);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->getIndexingInformationsById($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -380,8 +380,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -442,8 +442,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Body entities contains invalid entities', $responseBody['errors']);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->updateIndexingInformations($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -452,8 +452,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -487,8 +487,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Group not found', $responseBody['errors']);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->reassignUsers($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -497,8 +497,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -533,8 +533,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Group not found', $responseBody['errors']);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $groupController->delete($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -543,8 +543,8 @@ class GroupControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/group/PrivilegeControllerTest.php b/test/unitTests/app/group/PrivilegeControllerTest.php
index a9675cefe8c..e4ba8525ff7 100644
--- a/test/unitTests/app/group/PrivilegeControllerTest.php
+++ b/test/unitTests/app/group/PrivilegeControllerTest.php
@@ -106,8 +106,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsString($responseBody->errors);
$this->assertSame('Route privilegeId is empty or not an integer', $responseBody->errors);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController->addPrivilege($request, new \Slim\Http\Response(), $args);
@@ -116,8 +116,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -191,8 +191,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsString($responseBody->errors);
$this->assertSame('Route privilegeId is empty or not an integer', $responseBody->errors);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController->updateParameters($request, new \Slim\Http\Response(), $args);
@@ -201,8 +201,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -295,8 +295,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertSame(1, count($response));
$this->assertSame('ALL_PRIVILEGES', $response[0]);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController::getPrivilegesByUser(['userId' => $GLOBALS['id']]);
@@ -304,8 +304,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsArray($response);
$this->assertNotContains('ALL_PRIVILEGES', $response);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -318,8 +318,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsArray($response);
$this->assertEmpty($response);
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController::getAssignableGroups(['userId' => $GLOBALS['id']]);
@@ -327,8 +327,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsArray($response);
$this->assertNotEmpty($response);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -341,8 +341,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsBool($response);
$this->assertSame(true, $response);
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController::canAssignGroup(['userId' => $GLOBALS['id'], 'groupId' => self::$id]);
@@ -350,15 +350,15 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsBool($response);
$this->assertSame(false, $response);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testIsResourceInProcess()
{
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$resController = new \Resource\controllers\ResController();
@@ -404,8 +404,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsBool($response);
$this->assertSame(false, $response);
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController::isResourceInProcess(['userId' => $GLOBALS['id'], 'resId' => self::$resId]);
@@ -413,8 +413,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsBool($response);
$this->assertSame(true, $response);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController::isResourceInProcess(['userId' => $GLOBALS['id'], 'resId' => self::$resId]);
@@ -425,8 +425,8 @@ class PrivilegeControllerTest extends TestCase
public function testCanUpdateResource()
{
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$privilegeController = new \Group\controllers\PrivilegeController();
@@ -436,8 +436,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsBool($response);
$this->assertSame(false, $response);
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController::canUpdateResource(['userId' => $GLOBALS['id'], 'resId' => self::$resId]);
@@ -445,8 +445,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsBool($response);
$this->assertSame(false, $response);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController::canUpdateResource(['userId' => $GLOBALS['id'], 'resId' => self::$resId]);
@@ -522,8 +522,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertIsString($responseBody->errors);
$this->assertSame('Route privilegeId is empty or not an integer', $responseBody->errors);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $privilegeController->removePrivilege($request, new \Slim\Http\Response(), $args);
@@ -532,8 +532,8 @@ class PrivilegeControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
diff --git a/test/unitTests/app/history/HistoryControllerTest.php b/test/unitTests/app/history/HistoryControllerTest.php
index 0ec95b613b0..4f24b52b446 100755
--- a/test/unitTests/app/history/HistoryControllerTest.php
+++ b/test/unitTests/app/history/HistoryControllerTest.php
@@ -18,7 +18,7 @@ class HistoryControllerTest extends TestCase
$request = \Slim\Http\Request::createFromEnvironment($environment);
$history = new \History\controllers\HistoryController();
- $currentUser = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $currentUser = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$response = $history->getByUserId($request, new \Slim\Http\Response(), ['userSerialId' => $currentUser['id']]);
$responseBody = json_decode((string)$response->getBody());
diff --git a/test/unitTests/app/home/HomeControllerTest.php b/test/unitTests/app/home/HomeControllerTest.php
index 96c74eacf8e..0da8db029ae 100755
--- a/test/unitTests/app/home/HomeControllerTest.php
+++ b/test/unitTests/app/home/HomeControllerTest.php
@@ -19,8 +19,8 @@ class HomeControllerTest extends TestCase
public function testGet()
{
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$homeController = new \Home\controllers\HomeController();
@@ -35,15 +35,15 @@ class HomeControllerTest extends TestCase
$this->assertNotNull($responseBody->assignedBaskets);
$this->assertNotEmpty($responseBody->homeMessage);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetLastRessources()
{
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$homeController = new \Home\controllers\HomeController();
@@ -56,15 +56,15 @@ class HomeControllerTest extends TestCase
$this->assertIsArray($responseBody->lastResources);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetMaarchParapheurDocuments()
{
- $GLOBALS['userId'] = 'jjane';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'jjane';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$homeController = new \Home\controllers\HomeController();
@@ -84,8 +84,8 @@ class HomeControllerTest extends TestCase
$this->assertIsBool($document->owner);
}
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// ERROR
diff --git a/test/unitTests/app/indexing/IndexingControllerTest.php b/test/unitTests/app/indexing/IndexingControllerTest.php
index 8a46e55745b..c787ca242ed 100755
--- a/test/unitTests/app/indexing/IndexingControllerTest.php
+++ b/test/unitTests/app/indexing/IndexingControllerTest.php
@@ -14,8 +14,8 @@ class IndexingControllerTest extends TestCase
{
public function testGetIndexingActions()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$indexingController = new \Resource\controllers\IndexingController();
@@ -42,15 +42,15 @@ class IndexingControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('This user is not in this group', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetIndexingEntities()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$indexingController = new \Resource\controllers\IndexingController();
@@ -77,15 +77,15 @@ class IndexingControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('This user is not in this group', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetProcessLimitDate()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$indexingController = new \Resource\controllers\IndexingController();
@@ -137,8 +137,8 @@ class IndexingControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Delay is not a numeric value', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -167,8 +167,8 @@ class IndexingControllerTest extends TestCase
public function testGetPriorityWithProcessLimitDate()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$indexingController = new \Resource\controllers\IndexingController();
@@ -196,8 +196,8 @@ class IndexingControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Query params processLimitDate is empty', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/note/NoteControllerTest.php b/test/unitTests/app/note/NoteControllerTest.php
index 35626e76791..deb15a61ee4 100755
--- a/test/unitTests/app/note/NoteControllerTest.php
+++ b/test/unitTests/app/note/NoteControllerTest.php
@@ -126,8 +126,8 @@ class NoteControllerTest extends TestCase
public function testGetById()
{
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$noteController = new \Note\controllers\NoteController();
@@ -153,15 +153,15 @@ class NoteControllerTest extends TestCase
$this->assertSame('Note out of perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetByResId()
{
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$noteController = new \Note\controllers\NoteController();
@@ -195,15 +195,15 @@ class NoteControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Document out of perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetTemplates()
{
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$noteController = new \Note\controllers\NoteController();
@@ -251,8 +251,8 @@ class NoteControllerTest extends TestCase
$this->assertSame('Document out of perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
diff --git a/test/unitTests/app/priority/PriorityControllerTest.php b/test/unitTests/app/priority/PriorityControllerTest.php
index afa7b669aba..c4a9fa96340 100755
--- a/test/unitTests/app/priority/PriorityControllerTest.php
+++ b/test/unitTests/app/priority/PriorityControllerTest.php
@@ -71,8 +71,8 @@ class PriorityControllerTest extends TestCase
$this->assertSame(_PRIORITY_DELAY_ALREADY_SET, $responseBody['errors']);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -85,8 +85,8 @@ class PriorityControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -159,8 +159,8 @@ class PriorityControllerTest extends TestCase
$this->assertSame(_PRIORITY_DELAY_ALREADY_SET, $responseBody['errors']);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -173,8 +173,8 @@ class PriorityControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -199,8 +199,8 @@ class PriorityControllerTest extends TestCase
$this->assertSame('Priority not found', $responseBody->errors);
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -213,8 +213,8 @@ class PriorityControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -239,8 +239,8 @@ class PriorityControllerTest extends TestCase
self::$priorities = $responseBody['priorities'];
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -253,8 +253,8 @@ class PriorityControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -284,8 +284,8 @@ class PriorityControllerTest extends TestCase
}
// fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$body = [
@@ -298,8 +298,8 @@ class PriorityControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/resource/ExportControllerTest.php b/test/unitTests/app/resource/ExportControllerTest.php
index 62130c4a1e7..c1d3009130a 100755
--- a/test/unitTests/app/resource/ExportControllerTest.php
+++ b/test/unitTests/app/resource/ExportControllerTest.php
@@ -29,8 +29,8 @@ class ExportControllerTest extends TestCase
public function testUpdateExport()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
@@ -231,8 +231,8 @@ class ExportControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Data format is empty or not a string between [\'pdf\', \'csv\']', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/resource/FolderPrintControllerTest.php b/test/unitTests/app/resource/FolderPrintControllerTest.php
index 6bead509c25..a3222290b00 100755
--- a/test/unitTests/app/resource/FolderPrintControllerTest.php
+++ b/test/unitTests/app/resource/FolderPrintControllerTest.php
@@ -16,8 +16,8 @@ class FolderPrintControllerTest extends TestCase
public function testGenerateFile()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// CREATE NOTE
diff --git a/test/unitTests/app/resource/LinkControllerTest.php b/test/unitTests/app/resource/LinkControllerTest.php
index 3440f0b13a3..1d52394143b 100755
--- a/test/unitTests/app/resource/LinkControllerTest.php
+++ b/test/unitTests/app/resource/LinkControllerTest.php
@@ -16,8 +16,8 @@ class LinkControllerTest extends TestCase
public function testLinkResources()
{
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$resController = new \Resource\controllers\ResController();
@@ -56,8 +56,8 @@ class LinkControllerTest extends TestCase
self::$secondResourceId = $responseBody->resId;
$this->assertIsInt(self::$secondResourceId);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
@@ -80,8 +80,8 @@ class LinkControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody(), true);
$this->assertSame('Body linkedResources contains resource', $responseBody['errors']);
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$args['linkedResources'] = [9999999];
@@ -91,8 +91,8 @@ class LinkControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody(), true);
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$args['linkedResources'] = [];
diff --git a/test/unitTests/app/resource/ResControllerTest.php b/test/unitTests/app/resource/ResControllerTest.php
index 65696cc7d2f..a35b0c1e11e 100755
--- a/test/unitTests/app/resource/ResControllerTest.php
+++ b/test/unitTests/app/resource/ResControllerTest.php
@@ -15,8 +15,8 @@ class ResControllerTest extends TestCase
public function testCreate()
{
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$resController = new \Resource\controllers\ResController();
@@ -98,8 +98,8 @@ class ResControllerTest extends TestCase
$this->assertSame('Body modelId is empty or not an integer', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -147,16 +147,16 @@ class ResControllerTest extends TestCase
}
// ERROR
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $resController->getById($request, new \Slim\Http\Response(), ['resId' => 123748]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Document out of perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// LIGHT
@@ -347,8 +347,8 @@ class ResControllerTest extends TestCase
$this->assertSame(true, $responseBody->isAllowed);
// NOT ALLOWED
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $resController->isAllowedForCurrentUser($request, new \Slim\Http\Response(), ['resId' => 123456]);
@@ -356,8 +356,8 @@ class ResControllerTest extends TestCase
$this->assertSame(false, $responseBody->isAllowed);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -378,8 +378,8 @@ class ResControllerTest extends TestCase
$this->assertSame(204, $response->getStatusCode());
// ERROR
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$aArgs = [
@@ -392,8 +392,8 @@ class ResControllerTest extends TestCase
$this->assertSame('Document out of perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -622,8 +622,8 @@ class ResControllerTest extends TestCase
public function testCreateMultipleDocument()
{
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$resController = new \Resource\controllers\ResController();
@@ -687,8 +687,8 @@ class ResControllerTest extends TestCase
}
}
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/resource/ResourceListControllerTest.php b/test/unitTests/app/resource/ResourceListControllerTest.php
index cb71fcc1eda..0eac70819cc 100644
--- a/test/unitTests/app/resource/ResourceListControllerTest.php
+++ b/test/unitTests/app/resource/ResourceListControllerTest.php
@@ -13,8 +13,8 @@ class ResourceListControllerTest extends TestCase
{
public function testGet()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
@@ -106,15 +106,15 @@ class ResourceListControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Basket out of perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetFilters()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
@@ -181,15 +181,15 @@ class ResourceListControllerTest extends TestCase
$this->assertIsArray($responseBody->statuses);
$this->assertIsArray($responseBody->entitiesChildren);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetActions()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
@@ -205,8 +205,8 @@ class ResourceListControllerTest extends TestCase
$this->assertIsArray($responseBody->actions);
$this->assertNotNull($responseBody->actions);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/resource/SummarySheetControllerTest.php b/test/unitTests/app/resource/SummarySheetControllerTest.php
index 4d9f5be762f..c2778633be5 100644
--- a/test/unitTests/app/resource/SummarySheetControllerTest.php
+++ b/test/unitTests/app/resource/SummarySheetControllerTest.php
@@ -13,8 +13,8 @@ class SummarySheetControllerTest extends TestCase
{
public function testCreateList()
{
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
@@ -56,8 +56,8 @@ class SummarySheetControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Resources is not set or empty', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/resource/UserFollowedResourceControllerTest.php b/test/unitTests/app/resource/UserFollowedResourceControllerTest.php
index 25612754081..3932079857c 100644
--- a/test/unitTests/app/resource/UserFollowedResourceControllerTest.php
+++ b/test/unitTests/app/resource/UserFollowedResourceControllerTest.php
@@ -18,8 +18,8 @@ class UserFollowedResourceControllerTest extends TestCase
public function testCreate()
{
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$resController = new \Resource\controllers\ResController();
@@ -112,15 +112,15 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertNotNull($res['destination']);
$this->assertNotNull($res['initiator']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testUnFollow()
{
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$usersFollowedResourcesController = new \Resource\controllers\UserFollowedResourceController();
@@ -142,8 +142,8 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertSame(3, $responseBody['unFollowed']);
- $GLOBALS['userId'] = 'ccharles';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'ccharles';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $usersFollowedResourcesController->unFollow($fullRequest, new \Slim\Http\Response());
@@ -152,15 +152,15 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertSame(403, $response->getStatusCode());
$this->assertSame('Document out of perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testFollow()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$usersFollowedResourcesController = new \Resource\controllers\UserFollowedResourceController();
@@ -177,8 +177,8 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertSame(204, $response->getStatusCode());
- $GLOBALS['userId'] = 'ccharles';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'ccharles';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $usersFollowedResourcesController->follow($fullRequest, new \Slim\Http\Response());
@@ -187,15 +187,15 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertSame(403, $response->getStatusCode());
$this->assertSame('Document out of perimeter', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetList()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$userFollowedResourceController = new \Resource\controllers\UserFollowedResourceController();
@@ -217,8 +217,8 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertIsInt($responseBody->resources[0]->resId);
$this->assertSame('Breaking News : Superman is alive - PHP unit FOLLOW / UNFOLLOW', $responseBody->resources[0]->subject);
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// GET
@@ -231,15 +231,15 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertIsInt($responseBody->countResources);
$this->assertSame(0, $responseBody->countResources);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetFilters()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$userFollowedResourceController = new \Resource\controllers\UserFollowedResourceController();
@@ -281,8 +281,8 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertIsArray($responseBody['folders']);
$this->assertEmpty($responseBody['folders']);
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// GET
@@ -311,15 +311,15 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertIsArray($responseBody['folders']);
$this->assertEmpty($responseBody['folders']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetBaskets()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$userFollowedResourceController = new \Resource\controllers\UserFollowedResourceController();
@@ -356,8 +356,8 @@ class UserFollowedResourceControllerTest extends TestCase
$this->assertSame(4, $responseBody['groupsBaskets'][1]['basketId']);
$this->assertSame('Courriers à traiter', $responseBody['groupsBaskets'][1]['basketName']);
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// GET
@@ -370,15 +370,15 @@ class UserFollowedResourceControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody(), true);
$this->assertSame('Resource out of perimeter', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testDelete()
{
- $GLOBALS['userId'] = 'aackermann';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'aackermann';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// DELETE
@@ -400,8 +400,8 @@ class UserFollowedResourceControllerTest extends TestCase
'resId' => self::$idThird
]);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// READ
diff --git a/test/unitTests/app/search/SearchControllerTest.php b/test/unitTests/app/search/SearchControllerTest.php
index 94e44907b67..b1fea929d0c 100755
--- a/test/unitTests/app/search/SearchControllerTest.php
+++ b/test/unitTests/app/search/SearchControllerTest.php
@@ -13,8 +13,8 @@ class SearchControllerTest extends TestCase
{
public function testGet()
{
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$searchController = new \Search\controllers\SearchController();
@@ -73,8 +73,8 @@ class SearchControllerTest extends TestCase
$this->assertIsInt($resource);
}
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
// GET WITH SUPERADMIN
diff --git a/test/unitTests/app/shipping/ShippingControllerTest.php b/test/unitTests/app/shipping/ShippingControllerTest.php
index 1a31f416d24..3c15d5d57e6 100755
--- a/test/unitTests/app/shipping/ShippingControllerTest.php
+++ b/test/unitTests/app/shipping/ShippingControllerTest.php
@@ -83,8 +83,8 @@ class ShippingTemplateControllerTest extends TestCase
$this->assertSame('label is empty or too long', $responseBody->errors[1]);
$this->assertSame('entities must be an array', $responseBody->errors[2]);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $shipping->create($request, new \Slim\Http\Response());
@@ -92,8 +92,8 @@ class ShippingTemplateControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Service forbidden', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -131,8 +131,8 @@ class ShippingTemplateControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('id is not an integer', $responseBody->errors);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $shipping->getById($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -140,8 +140,8 @@ class ShippingTemplateControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Service forbidden', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -161,8 +161,8 @@ class ShippingTemplateControllerTest extends TestCase
}
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $shipping->get($request, new \Slim\Http\Response());
@@ -170,8 +170,8 @@ class ShippingTemplateControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Service forbidden', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -262,8 +262,8 @@ class ShippingTemplateControllerTest extends TestCase
$this->assertSame('success', $responseBody->success);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $shipping->update($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -271,8 +271,8 @@ class ShippingTemplateControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Service forbidden', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -296,8 +296,8 @@ class ShippingTemplateControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Shipping does not exist', $responseBody->errors);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $shipping->delete($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -305,8 +305,8 @@ class ShippingTemplateControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Service forbidden', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -327,8 +327,8 @@ class ShippingTemplateControllerTest extends TestCase
}
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $shipping->initShipping($request, new \Slim\Http\Response());
@@ -336,15 +336,15 @@ class ShippingTemplateControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Service forbidden', $responseBody->errors);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
public function testGetByResId()
{
- $GLOBALS['userId'] = 'cchaplin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'cchaplin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$resController = new \Resource\controllers\ResController();
@@ -431,8 +431,8 @@ class ShippingTemplateControllerTest extends TestCase
$this->assertIsArray($res);
$this->assertEmpty($res);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/template/TemplateControllerTest.php b/test/unitTests/app/template/TemplateControllerTest.php
index 59ea88dfbdd..4145ae00710 100755
--- a/test/unitTests/app/template/TemplateControllerTest.php
+++ b/test/unitTests/app/template/TemplateControllerTest.php
@@ -260,8 +260,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame("Uploaded file is missing", $responseBody['errors']);
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $templates->create($fullRequest, new \Slim\Http\Response());
@@ -270,8 +270,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -318,8 +318,8 @@ class TemplateControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Template does not exist', $responseBody->errors);
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $templates->getDetailledById($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -328,8 +328,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -486,8 +486,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame(_WRONG_FILE_TYPE, $responseBody['errors']);
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $templates->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$id2]);
@@ -496,8 +496,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -557,8 +557,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame('Forbidden duplication', $responseBody->errors);
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $templates->duplicate($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -567,8 +567,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -603,8 +603,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame(true, $idDuplicatedFound);
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $templates->get($request, new \Slim\Http\Response());
@@ -613,8 +613,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -688,8 +688,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame('Template does not exist', $responseBody->errors);
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $templates->delete($request, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -698,8 +698,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -730,8 +730,8 @@ class TemplateControllerTest extends TestCase
$this->assertNotNull($responseBody->entities[0]->entity_label);
// Fail
- $GLOBALS['userId'] = 'bbain';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bbain';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$response = $templates->initTemplates($request, new \Slim\Http\Response());
@@ -740,8 +740,8 @@ class TemplateControllerTest extends TestCase
$this->assertSame('Service forbidden', $responseBody['errors']);
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
}
diff --git a/test/unitTests/app/user/UserControllerTest.php b/test/unitTests/app/user/UserControllerTest.php
index ff1470315fa..56c72026f8e 100755
--- a/test/unitTests/app/user/UserControllerTest.php
+++ b/test/unitTests/app/user/UserControllerTest.php
@@ -667,7 +667,7 @@ class UserControllerTest extends TestCase
{
$userController = new \User\controllers\UserController();
- $user = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $user = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
// UPDATE PASSWORD
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'PUT']);
@@ -684,7 +684,7 @@ class UserControllerTest extends TestCase
$this->assertSame('success', $responseBody->success);
- $checkPassword = \SrcCore\models\AuthenticationModel::authentication(['login' => $GLOBALS['userId'], 'password' => 'hcraam']);
+ $checkPassword = \SrcCore\models\AuthenticationModel::authentication(['login' => $GLOBALS['login'], 'password' => 'hcraam']);
$this->assertSame(true, $checkPassword);
@@ -703,7 +703,7 @@ class UserControllerTest extends TestCase
$this->assertSame('success', $responseBody->success);
- $checkPassword = \SrcCore\models\AuthenticationModel::authentication(['login' => $GLOBALS['userId'], 'password' => 'superadmin']);
+ $checkPassword = \SrcCore\models\AuthenticationModel::authentication(['login' => $GLOBALS['login'], 'password' => 'superadmin']);
$this->assertSame(true, $checkPassword);
}
diff --git a/test/unitTests/core/AuthenticationControllerTest.php b/test/unitTests/core/AuthenticationControllerTest.php
index 1eec0d393fd..4ffc4095159 100755
--- a/test/unitTests/core/AuthenticationControllerTest.php
+++ b/test/unitTests/core/AuthenticationControllerTest.php
@@ -20,7 +20,7 @@ class AuthenticationControllerTest extends TestCase
$response = \SrcCore\controllers\AuthenticationController::authentication();
$this->assertNotEmpty($response);
- $this->assertSame('superadmin', $response);
+ $this->assertSame(23, $response);
}
public function testAuthenticate()
@@ -73,7 +73,7 @@ class AuthenticationControllerTest extends TestCase
public function testIsRouteAvailable()
{
- $response = \SrcCore\controllers\AuthenticationController::isRouteAvailable(['login' => 'superadmin', 'currentRoute' => '/actions']);
+ $response = \SrcCore\controllers\AuthenticationController::isRouteAvailable(['userId' => 23, 'currentRoute' => '/actions']);
$this->assertSame(true, $response['isRouteAvailable']);
}
diff --git a/test/unitTests/core/AutocompleteControllerTest.php b/test/unitTests/core/AutocompleteControllerTest.php
index e9621d7c311..8deca90815a 100755
--- a/test/unitTests/core/AutocompleteControllerTest.php
+++ b/test/unitTests/core/AutocompleteControllerTest.php
@@ -165,8 +165,8 @@ class AutocompleteControllerTest extends TestCase
}
// TEST WITH BBLIER
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$aArgs = [
@@ -188,8 +188,8 @@ class AutocompleteControllerTest extends TestCase
$this->assertNotEmpty($value->idToDisplay);
}
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
@@ -387,8 +387,8 @@ class AutocompleteControllerTest extends TestCase
public function testGetFolders()
{
- $GLOBALS['userId'] = 'bblier';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'bblier';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
$autocompleteController = new \SrcCore\controllers\AutoCompleteController();
@@ -415,8 +415,8 @@ class AutocompleteControllerTest extends TestCase
$this->assertEmpty($value->otherInfo);
}
- $GLOBALS['userId'] = 'superadmin';
- $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]);
+ $GLOBALS['login'] = 'superadmin';
+ $userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
}
--
GitLab