Merge branch 'userprotect' into 'main'

apply userprotect install patch

See merge request !21

composer.json

@@ -293,6 +293,9 @@
                 "Remove Google Plus": "patches/rm-googleplus.patch",
                 "Fix Empty Link": "patches/accessibility-fix-empty-link.patch"
             },
+            "drupal/userprotect": {
+                "3349663": "https://www.drupal.org/files/issues/2023-07-28/3349663-8.patch"
+            },
             "drupal/views_ajax_history": {
                 "3028400": "https://www.drupal.org/files/issues/2019-05-16/wrong-url-with-infinit-scroll-3028400-1.patch"
             }

vendor/composer/installed.json

@@ -6852,6 +6852,9 @@
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
                     }
+                },
+                "patches_applied": {
+                    "3349663": "https://www.drupal.org/files/issues/2023-07-28/3349663-8.patch"
                 }
             },
             "installation-source": "dist",

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'osu-asc-webservices/d8-upstream',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '05958e998d86c53e31823802689f58f8be89fa8c',
+        'reference' => '8af06bbba89858bf4993340c07ccc65d6910aec4',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -1402,7 +1402,7 @@
         'osu-asc-webservices/d8-upstream' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '05958e998d86c53e31823802689f58f8be89fa8c',
+            'reference' => '8af06bbba89858bf4993340c07ccc65d6910aec4',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

web/modules/userprotect/PATCHES.txt

+This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
+Patches applied to this directory:
+
+3349663
+Source: https://www.drupal.org/files/issues/2023-07-28/3349663-8.patch
+
+

web/modules/userprotect/userprotect.install

@@ -12,7 +12,10 @@
  *
  * Installs default userprotect permissions for authenticated users.
  */
-function userprotect_install() {
+function userprotect_install($is_syncing) {
+  if ($is_syncing) {
+    return;
+  }
   $role = \Drupal::entityTypeManager()->getStorage('user_role')->load(AccountInterface::AUTHENTICATED_ROLE);
   $role->grantPermission('userprotect.mail.edit');
   $role->grantPermission('userprotect.pass.edit');