Merge pull request #480 from dotkernel/issue-479

updated account delete

Author: arhimede

config/autoload/authentication.global.php

@@ -14,9 +14,9 @@
                 'identity_property'   => 'identity',
                 'credential_property' => 'password',
                 'messages'            => [
-                    'success'            => 'Authenticated successfully.',
-                    'not_found'          => 'Identity not found.',
-                    'invalid_credential' => 'Invalid credentials.',
+                    'success'            => Message::AUTHENTICATED_SUCCESSFULLY,
+                    'not_found'          => Message::ACCOUNT_NOT_FOUND,
+                    'invalid_credential' => Message::INVALID_CREDENTIALS,
                 ],
                 'options'             => [
                     'status'    => [
@@ -25,7 +25,7 @@
                     ],
                     'isDeleted' => [
                         'value'   => false,
-                        'message' => Message::IS_DELETED,
+                        'message' => Message::ACCOUNT_NOT_FOUND,
                     ],
                 ],
             ],

config/autoload/local.php.dist

@@ -26,25 +26,25 @@ $databases = [
 ];
 
 return [
-    'application' => [
+    'application'         => [
         'name' => 'DotKernel',
         'url'  => $baseUrl,
     ],
-    'databases'   => $databases,
-    'doctrine'    => [
+    'databases'           => $databases,
+    'doctrine'            => [
         'connection' => [
             'orm_default' => [
                 'params' => $databases['default'],
             ],
         ],
     ],
-    'uploads'     => [
+    'uploads'             => [
         'user' => [
             'url'  => $baseUrl . '/uploads/user',
             'path' => realpath(__DIR__ . '/../../public/uploads/user'),
         ],
     ],
-    'contact'     => [
+    'contact'             => [
         'notification_receivers' => [],
         'message_receivers'      => [
             'to' => [
@@ -55,16 +55,17 @@ return [
             ],
         ],
     ],
-    'recaptcha'   => [
+    'recaptcha'           => [
         'scoreThreshold' => 0.5,
         'siteKey'        => '',
         'secretKey'      => '',
         'verifyUrl'      => 'https://www.google.com/recaptcha/api/siteverify',
     ],
-    'rememberMe'  => [
+    'rememberMe'          => [
         'cookie' => [
             'name'     => 'rememberMe',
             'lifetime' => 3600 * 24 * 30,
         ],
     ],
+    'userAnonymizeAppend' => '',
 ];

src/App/src/Common/Message.php

@@ -9,6 +9,8 @@ class Message
     public const DUPLICATE_EMAIL               = 'An account with this email address already exists.';
     public const RESTRICTION_ROLES             = 'User accounts must have at least one role.';
     public const INVALID_ACTIVATION_CODE       = 'Invalid activation code.';
+    public const AUTHENTICATED_SUCCESSFULLY    = 'Authenticated successfully.';
+    public const INVALID_CREDENTIALS           = 'Invalid credentials.';
     public const MAIL_SENT_RESET_PASSWORD      = 'If the provided email identifies an account in our system, '
     . 'you will receive an email with further instructions on resetting your account\'s password.';
     public const MISSING_PARAMETER             = 'Missing parameter: \'%s\'';
@@ -23,5 +25,6 @@ class Message
     public const PASSWORD_RESET_SUCCESSFULLY   = 'Password Successfully reset.';
     public const USER_NOT_ACTIVATED            = 'User account must be activated first.';
     public const DELETE_ACCOUNT                = 'You must check delete option.';
-    public const IS_DELETED                    = 'User is deleted.';
+    public const ACCOUNT_IS_DELETED            = 'Your account is deleted.';
+    public const ACCOUNT_NOT_FOUND             = 'Account not found.';
 }

src/Page/templates/page/home.html.twig

@@ -5,6 +5,7 @@
 {% block page_title %}{% endblock %}
 
 {% block content %}
+    {{ messagesPartial('partial::alerts', {}, null, 'page-home') }}
     <div class="page-intro home-intro">
         <div class="container">
             <p class="welcome">DotKernel is a collection of</p>

src/User/src/Controller/AccountController.php

@@ -438,7 +438,7 @@ public function deleteAccountAction(): ResponseInterface
                 // logout and enter new password to login
                 $this->authenticationService->clearIdentity();
 
-                $this->messenger->addSuccess('Your account is deleted.', 'page-home');
+                $this->messenger->addSuccess(Message::ACCOUNT_IS_DELETED, 'page-home');
                 return new RedirectResponse($this->router->generateUri('page'));
             } else {
                 $this->messenger->addData('shouldRebind', true);

src/User/src/Service/UserService.php

@@ -25,6 +25,7 @@
 use Mezzio\Template\TemplateRendererInterface;
 use Ramsey\Uuid\Uuid;
 
+use function date;
 use function file_exists;
 use function is_readable;
 use function mkdir;
@@ -134,6 +135,18 @@ public function updateUser(User $user, array $data = []): User
 
         if (isset($data['isDeleted'])) {
             $user->setIsDeleted((bool) $data['isDeleted']);
+
+            if ((bool) $data['isDeleted'] === true) {
+                // make user anonymous
+                $user->setIdentity(
+                    sprintf('anonymous%s@%s', date('dmYHis'), $this->config['userAnonymizeAppend'])
+                );
+                $userDetails = $user->getDetail();
+                $userDetails->setFirstName('anonymous' . date('dmYHis'));
+                $userDetails->setLastName('anonymous' . date('dmYHis'));
+
+                $user->setDetail($userDetails);
+            }
         }
 
         if (isset($data['hash'])) {