Merge pull request #1932 from acquia/stage

Merge branch `stage` into `main`

Author: vishalkhode1

composer.lock

@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\Tests\acquia_cms_common\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the filter filter_html.
+ *
+ * @group acquia_cms
+ * @group acquia_cms_common
+ */
+class FilterFormatTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'acquia_cms_common',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $account = $this->drupalCreateUser(['administer filters']);
+    $this->drupalLogin($account);
+  }
+
+  /**
+   * Tests the filter filter_html.
+   *
+   * @param string $filter_format
+   *   The filter format name.
+   * @param bool $status
+   *   Status of the field.
+   *
+   * @dataProvider providerFilterFormat
+   */
+  public function testFilterBlackListHtmlTags(string $filter_format, bool $status) {
+    $assert_session = $this->assertSession();
+
+    // Visit the filter page.
+    $this->drupalGet('/admin/config/content/formats/manage/' . $filter_format);
+    $assert_session->statusCodeEquals(200);
+    $filter_element = $assert_session->elementExists('css', '#edit-filters-filter-html-status');
+    $this->assertSame($status, $filter_element->isChecked(), 'Expect checked, but found uncheck.');
+
+  }
+
+  /**
+   * Defines an array of modules & permissions to roles.
+   */
+  public static function providerFilterFormat(): array {
+    return [
+      [
+        'full_html',
+        TRUE,
+      ],
+      [
+        'filtered_html',
+        TRUE,
+      ],
+    ];
+  }
+
+}

modules/acquia_cms_common/tests/src/Functional/FilterFormatTest.php

@@ -4,14 +4,19 @@ type: module
 description: 'Provides functionality for Progressively Decoupled and Purely Headless sites using Node and Next JS.'
 core_version_requirement: ^10 || ^11
 dependencies:
-  - acquia_cms_common:acquia_cms_common
   - acquia_cms_tour:acquia_cms_tour
   - consumers:consumers
+  - drupal:block
+  - drupal:node
+  - drupal:rest
+  - drupal:taxonomy
+  - entity_clone:entity_clone
   - jsonapi_extras:jsonapi_extras
   - jsonapi_menu_items:jsonapi_menu_items
   - next:next_jsonapi
   - openapi_jsonapi:openapi_jsonapi
   - openapi_ui_redoc:openapi_ui_redoc
   - openapi_ui_swagger:openapi_ui_swagger
-  - drupal:rest
   - simple_oauth:simple_oauth
+test_dependencies:
+  - acquia_cms_toolbar:acquia_cms_toolbar

modules/acquia_cms_headless/acquia_cms_headless.info.yml

@@ -19,6 +19,19 @@ function acquia_cms_headless_install($is_syncing) {
 
     // Programmatically create a new "headless" user.
     $headless_user->createHeadlessUser();
+    // Add roles to headless user.
+    $roles = \Drupal::entityTypeManager()->getStorage('user_role')->loadMultiple([
+      'content_administrator',
+      'content_author',
+      'content_editor',
+    ]);
+    if ($roles) {
+      $user = user_load_by_name('headless');
+      foreach ($roles as $role) {
+        $user->addRole($role->id());
+      }
+      $user->save();
+    }
 
     // Adds the necessary permissions to roles.
     add_next_site_permissions();

modules/acquia_cms_headless/acquia_cms_headless.install

@@ -8,9 +8,9 @@
 use Drupal\user\RoleInterface;
 
 /**
- * Implements hook_content_model_role_presave_alter().
+ * Implements hook_entity_insert().
  */
-function acquia_cms_headless_content_model_role_presave_alter(RoleInterface &$role) {
+function acquia_cms_headless_user_role_insert(RoleInterface $role) {
   $role_id = $role->id();
   switch ($role->id()) {
     case 'content_administrator':

modules/acquia_cms_headless/acquia_cms_headless.module

@@ -4,8 +4,8 @@
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
     "require": {
-        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1",
-        "drupal/acquia_cms_tour": "^2.1.8",
+        "drupal/acquia_cms_tour": "2.x-dev",
+        "drupal/entity_clone": "^2.0",
         "drupal/jsonapi_extras": "^3.26",
         "drupal/jsonapi_menu_items": "^1.2",
         "drupal/next": "^2.0",
@@ -15,7 +15,8 @@
         "drupal/restui": "^1.21"
     },
     "require-dev": {
-        "drupal/acquia_claro": "^1.3"
+        "drupal/acquia_claro": "^1.3",
+        "drupal/acquia_cms_toolbar": "1.x-dev"
     },
     "conflict": {
         "drupal/consumers": "<1.16",

modules/acquia_cms_headless/composer.json

@@ -18,5 +18,3 @@ permissions:
   - 'bypass node access'
   - 'issue subrequests'
   - 'view all revisions'
-  - 'view any unpublished content'
-  - 'view latest version'

modules/acquia_cms_headless/config/install/user.role.headless.yml

@@ -0,0 +1,8 @@
+langcode: en
+status: true
+dependencies: {  }
+id: administrator
+label: Administrator
+weight: -10
+is_admin: true
+permissions: {  }

modules/acquia_cms_headless/config/optional/user.role.administrator.yml

@@ -4,5 +4,6 @@ type: module
 core_version_requirement: ^10 || ^11
 description: 'Implements Pure Headless mode, disabling the Drupal Front-End and updating the admin experience.'
 dependencies:
-  - drupal:acquia_cms_headless
+  - acquia_cms_headless:acquia_cms_headless
+  - drupal:content_moderation
   - drupal:path_alias

modules/acquia_cms_headless/modules/acquia_cms_headless_ui/acquia_cms_headless_ui.info.yml

@@ -19,6 +19,11 @@ function acquia_cms_headless_ui_install($is_syncing) {
     // Update configurations for the Headless UI.
     $headlessUi->updateHeadlessUiConfig(TRUE);
 
+    $role = \Drupal::entityTypeManager()->getStorage('user_role')->load('headless');
+    $role->grantPermission('view any unpublished content');
+    $role->grantPermission('view latest version');
+    $role->save();
+
     // Clear caches to make sure updates are reflected.
     drupal_flush_all_caches();
   }

modules/acquia_cms_headless/modules/acquia_cms_headless_ui/acquia_cms_headless_ui.install

@@ -3,6 +3,7 @@ services:
     class: 'Drupal\acquia_cms_headless_ui\EventSubscriber\ConfigSubscriber'
     arguments:
       - '@plugin.manager.menu.local_task'
+      - '@config.factory'
     tags:
       - { name: event_subscriber }
 

modules/acquia_cms_headless/modules/acquia_cms_headless_ui/acquia_cms_headless_ui.services.yml

@@ -4,6 +4,7 @@
 
 use Drupal\Core\Config\ConfigCrudEvent;
 use Drupal\Core\Config\ConfigEvents;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Menu\LocalTaskManager;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -24,14 +25,24 @@ final class ConfigSubscriber implements EventSubscriberInterface {
    */
   private $localTaskManager;
 
+  /**
+   * The config factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
   /**
    * ConfigSubscriber constructor.
    *
    * @param \Drupal\Core\Menu\LocalTaskManager $local_task_manager
    *   The local task plugin manager.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory.
    */
-  public function __construct(LocalTaskManager $local_task_manager) {
+  public function __construct(LocalTaskManager $local_task_manager, ConfigFactoryInterface $config_factory) {
     $this->localTaskManager = $local_task_manager;
+    $this->configFactory = $config_factory;
   }
 
   /**
@@ -49,7 +60,7 @@ public function onSave(ConfigCrudEvent $event) {
     // Prevent system front page to get overridden
     // if pure headless mode is on.
     if ($name === 'system.site') {
-      _acquia_cms_common_update_page_configurations('system.site', [
+      $this->updatePageConfigurations('system.site', [
         'page.front' => '/frontpage',
       ]);
     }
@@ -64,4 +75,31 @@ public static function getSubscribedEvents(): array {
     ];
   }
 
+  /**
+   * Helper function to update configuration for specified key.
+   *
+   * This is being used for updating page CT configurations.
+   *
+   * @param string $config_name
+   *   The configuration name which needs to be updated.
+   * @param array $configurations
+   *   An array of drupal configurations.
+   */
+  public function updatePageConfigurations(string $config_name, array $configurations) {
+    $config = $this->configFactory->getEditable($config_name);
+    $need_save = FALSE;
+    if ($config) {
+      foreach ($configurations as $key => $value) {
+        if ($config->get($key) != $value) {
+          $config->set($key, $value);
+          $need_save = TRUE;
+        }
+      }
+      // Only save if there's changes in value.
+      if ($need_save) {
+        $config->save();
+      }
+    }
+  }
+
 }

modules/acquia_cms_headless/modules/acquia_cms_headless_ui/src/EventSubscriber/ConfigSubscriber.php

@@ -3,7 +3,7 @@
 namespace Drupal\acquia_cms_headless\Service;
 
 use Acquia\DrupalEnvironmentDetector\AcquiaDrupalEnvironmentDetector;
-use Drupal\acquia_cms_common\Traits\PasswordGeneratorTrait;
+use Drupal\acquia_cms_headless\Traits\PasswordGeneratorTrait;
 use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Component\Utility\Crypt;

modules/acquia_cms_headless/src/Service/StarterkitNextjsService.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Drupal\acquia_cms_headless\Traits;
+
+/**
+ * Provides helpers to generate random password.
+ */
+trait PasswordGeneratorTrait {
+
+  /**
+   * Generates the password based upon certain required conditions.
+   *
+   * @param int $length
+   *   Parameter that accepts the length of the password.
+   *
+   * @return string
+   *   Returns the shuffled string password.
+   */
+  public static function generateRandomPassword(int $length = 12): string {
+    // Define the character libraries.
+    $sets = [];
+    $sets[] = 'ABCDEFGHJKLMNPQRSTUVWXYZ';
+    $sets[] = 'abcdefghjkmnpqrstuvwxyz';
+    $sets[] = '0123456789';
+    $sets[] = '~!@#$%^&*(){}[],./?';
+    $password = '';
+
+    // Enforce the minimum length  of the password to be 12.
+    if ($length < 12) {
+      $length = 12;
+    }
+
+    // Append a character from each set - gets first 4 characters.
+    foreach ($sets as $set) {
+      $password .= $set[array_rand(str_split($set))];
+    }
+
+    // Use all characters to fill up to $length.
+    while (strlen($password) < $length) {
+      // Get a random set.
+      $randomSet = $sets[array_rand($sets)];
+      // Add a random char from the random set.
+      $password .= $randomSet[array_rand(str_split($randomSet))];
+    }
+
+    // Shuffle the password string before returning.
+    return str_shuffle($password);
+  }
+
+}

modules/acquia_cms_headless/src/Traits/PasswordGeneratorTrait.php

@@ -29,21 +29,6 @@ class HeadlessDrushCommandsTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
-  /**
-   * Disable strict config schema checks in this test.
-   *
-   * Scheduler has a config schema errors, and until it's fixed,
-   * this test cannot pass unless we disable strict config schema checking
-   * altogether. Since strict config schema isn't critically important in
-   * testing this functionality, it's okay to disable it for now, but it should
-   * be re-enabled (i.e., this property should be removed) as soon as possible.
-   *
-   * @var bool
-   */
-  // @codingStandardsIgnoreStart
-  protected $strictConfigSchema = FALSE;
-  // @codingStandardsIgnoreEnd
-
   /**
    * {@inheritdoc}
    */

modules/acquia_cms_headless/tests/src/Functional/HeadlessDrushCommandsTest.php

@@ -22,23 +22,9 @@ class HeadlessFrontpageTest extends BrowserTestBase {
    */
   protected static $modules = [
     'acquia_cms_headless_ui',
+    'views',
   ];
 
-  /**
-   * Disable strict config schema checks in this test.
-   *
-   * Scheduler has a config schema errors, and until it's fixed,
-   * this test cannot pass unless we disable strict config schema checking
-   * altogether. Since strict config schema isn't critically important in
-   * testing this functionality, it's okay to disable it for now, but it should
-   * be re-enabled (i.e., this property should be removed) as soon as possible.
-   *
-   * @var bool
-   */
-  // @codingStandardsIgnoreStart
-  protected $strictConfigSchema = FALSE;
-  // @codingStandardsIgnoreEnd
-
   /**
    * Assert that frontpage for non logged-in user is login page.
    */