From 1b0253bf189ac64d7620f4e2e0cb4385e65d3ffd Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Thu, 4 Aug 2022 12:08:42 +0900
Subject: [PATCH] Issue #3166561 by Matroskeen, ravi.shankar, andregp,
mohit_aghera, golddragon007, ranjith_kumar_k_u: Comment being deleted instead
of reassigned to Anonymous user
---
core/modules/comment/comment.module | 11 ++-
.../tests/src/Functional/UserCancelTest.php | 78 +++++++++++++++++++
2 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index caf6a7a89e2c..583eac8d73d5 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -460,8 +460,15 @@ function comment_user_cancel($edit, UserInterface $account, $method) {
/** @var \Drupal\comment\CommentInterface[] $comments */
$comments = \Drupal::entityTypeManager()->getStorage('comment')->loadByProperties(['uid' => $account->id()]);
foreach ($comments as $comment) {
- $comment->setOwnerId(0);
- $comment->setAuthorName(\Drupal::config('user.settings')->get('anonymous'));
+ $langcodes = array_keys($comment->getTranslationLanguages());
+ // For efficiency manually save the original comment before applying any
+ // changes.
+ $comment->original = clone $comment;
+ foreach ($langcodes as $langcode) {
+ $comment_translated = $comment->getTranslation($langcode);
+ $comment_translated->setOwnerId(0);
+ $comment_translated->setAuthorName(\Drupal::config('user.settings')->get('anonymous'));
+ }
$comment->save();
}
break;
diff --git a/core/modules/user/tests/src/Functional/UserCancelTest.php b/core/modules/user/tests/src/Functional/UserCancelTest.php
index 3a4b19826dec..57b703e40d58 100644
--- a/core/modules/user/tests/src/Functional/UserCancelTest.php
+++ b/core/modules/user/tests/src/Functional/UserCancelTest.php
@@ -5,6 +5,7 @@
use Drupal\comment\CommentInterface;
use Drupal\comment\Entity\Comment;
use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
use Drupal\Tests\BrowserTestBase;
@@ -655,4 +656,81 @@ public function testUserDeleteWithContentAndNodeAccess() {
$this->assertEmpty($load2);
}
+ /**
+ * Delete account and anonymize all content and it's translations.
+ */
+ public function testUserAnonymizeTranslations() {
+ $this->config('user.settings')->set('cancel_method', 'user_cancel_reassign')->save();
+ // Create comment field on page.
+ $this->addDefaultCommentField('node', 'page');
+ $user_storage = $this->container->get('entity_type.manager')->getStorage('user');
+
+ \Drupal::service('module_installer')->install([
+ 'language',
+ 'locale',
+ ]);
+ \Drupal::service('router.builder')->rebuildIfNeeded();
+ ConfigurableLanguage::createFromLangcode('ur')->save();
+ // Rebuild the container to update the default language container variable.
+ $this->rebuildContainer();
+
+ $account = $this->drupalCreateUser(['cancel account']);
+ $this->drupalLogin($account);
+ $user_storage->resetCache([$account->id()]);
+ $account = $user_storage->load($account->id());
+
+ $node = $this->drupalCreateNode(['uid' => $account->id()]);
+
+ // Add a comment to the page.
+ $comment_subject = $this->randomMachineName(8);
+ $comment_body = $this->randomMachineName(8);
+ $comment = Comment::create([
+ 'subject' => $comment_subject,
+ 'comment_body' => $comment_body,
+ 'entity_id' => $node->id(),
+ 'entity_type' => 'node',
+ 'field_name' => 'comment',
+ 'status' => CommentInterface::PUBLISHED,
+ 'uid' => $account->id(),
+ ]);
+ $comment->save();
+ $comment->addTranslation('ur', [
+ 'subject' => 'ur ' . $comment->label(),
+ 'status' => CommentInterface::PUBLISHED,
+ ])->save();
+
+ // Attempt to cancel account.
+ $this->drupalGet('user/' . $account->id() . '/cancel');
+ $this->assertSession()->pageTextContains('Are you sure you want to cancel your account?');
+ $this->assertSession()->pageTextContains('Your account will be removed and all account information deleted. All of your content will be assigned to the ' . $this->config('user.settings')->get('anonymous') . ' user.');
+
+ // Confirm account cancellation.
+ $timestamp = time();
+ $this->submitForm([], 'Confirm');
+ $this->assertSession()->pageTextContains('A confirmation request to cancel your account has been sent to your email address.');
+
+ // Confirm account cancellation request.
+ $this->drupalGet('user/' . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
+ $user_storage->resetCache([$account->id()]);
+ $this->assertNull($user_storage->load($account->id()), 'User is not found in the database.');
+
+ // Confirm that user's content has been attributed to anonymous user.
+ $anonymous_user = User::getAnonymousUser();
+
+ $storage = \Drupal::entityTypeManager()->getStorage('comment');
+ $storage->resetCache([$comment->id()]);
+ $test_comment = $storage->load($comment->id());
+ $this->assertEquals(0, $test_comment->getOwnerId());
+ $this->assertTrue($test_comment->isPublished(), 'Comment of the user has been attributed to anonymous user.');
+ $this->assertEquals($anonymous_user->getDisplayName(), $test_comment->getAuthorName());
+
+ $comment_translation = $test_comment->getTranslation('ur');
+ $this->assertEquals(0, $comment_translation->getOwnerId());
+ $this->assertTrue($comment_translation->isPublished(), 'Comment translation of the user has been attributed to anonymous user.');
+ $this->assertEquals($anonymous_user->getDisplayName(), $comment_translation->getAuthorName());
+
+ // Confirm that the confirmation message made it through to the end user.
+ $this->assertSession()->responseContains(t('%name has been deleted.', ['%name' => $account->getAccountName()]));
+ }
+
}
--
GitLab