From 8a6f5a8bc991b8411ca065d99338558ccbc44865 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 15 Jul 2023 21:54:12 -0700
Subject: [PATCH] Standalone - Interpret the $mailParam (same way as everyone
 else)

---
 ext/standaloneusers/Civi/Standalone/Security.php           | 7 ++++---
 .../tests/phpunit/Civi/Standalone/SecurityTest.php         | 4 ++--
 setup/plugins/init/StandaloneUsers.civi-setup.php          | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ext/standaloneusers/Civi/Standalone/Security.php b/ext/standaloneusers/Civi/Standalone/Security.php
index 222d00daa3..be0251cae1 100644
--- a/ext/standaloneusers/Civi/Standalone/Security.php
+++ b/ext/standaloneusers/Civi/Standalone/Security.php
@@ -152,16 +152,17 @@ class Security {
    *    - 'cms_name'
    *    - 'cms_pass' plaintext password
    *    - 'notify' boolean
-   * @param string $mail
-   *   Email address for cms user.
+   * @param string $mailParam
+   *   Name of the $param which contains the email address.
    *
    * @return int|bool
    *   uid if user was created, false otherwise
    */
-  public function createUser(&$params, $mail) {
+  public function createUser(&$params, $mailParam) {
     try {
       // Q. should this be in the api for User.create?
       $hashedPassword = $this->_password_crypt(static::$hashMethod, $params['cms_pass'], $this->_password_generate_salt());
+      $mail = $params[$mailParam];
 
       $userID = \Civi\Api4\User::create(FALSE)
         ->addValue('username', $params['cms_name'])
diff --git a/ext/standaloneusers/tests/phpunit/Civi/Standalone/SecurityTest.php b/ext/standaloneusers/tests/phpunit/Civi/Standalone/SecurityTest.php
index 9336b7ae23..e41312be06 100644
--- a/ext/standaloneusers/tests/phpunit/Civi/Standalone/SecurityTest.php
+++ b/ext/standaloneusers/tests/phpunit/Civi/Standalone/SecurityTest.php
@@ -132,10 +132,10 @@ class SecurityTest extends \PHPUnit\Framework\TestCase implements EndToEndInterf
       ])->execute()->first()['id'];
 
     $security = Security::singleton();
-    $params = ['cms_name' => 'user_one', 'cms_pass' => 'secret1', 'notify' => FALSE, 'contactID' => $contactID, 'user_one@example.org' => 'user_one@example.org'];
+    $params = ['cms_name' => 'user_one', 'cms_pass' => 'secret1', 'notify' => FALSE, 'contactID' => $contactID, 'email' => 'user_one@example.org'];
 
     $this->switchToOurUFClasses();
-    $userID = \CRM_Core_BAO_CMSUser::create($params, 'user_one@example.org');
+    $userID = \CRM_Core_BAO_CMSUser::create($params, 'email');
     $this->switchBackFromOurUFClasses();
 
     $this->assertGreaterThan(0, $userID);
diff --git a/setup/plugins/init/StandaloneUsers.civi-setup.php b/setup/plugins/init/StandaloneUsers.civi-setup.php
index a50ed2da0e..24e66ce87e 100644
--- a/setup/plugins/init/StandaloneUsers.civi-setup.php
+++ b/setup/plugins/init/StandaloneUsers.civi-setup.php
@@ -71,10 +71,11 @@ if (!defined('CIVI_SETUP')) {
     $params = [
       'cms_name'   => $e->getModel()->extras['adminUser'],
       'cms_pass'   => $e->getModel()->extras['adminPass'],
+      'email'       => $adminEmail,
       'notify'     => FALSE,
       'contactID'  => $contactID,
     ];
-    $userID = \CRM_Core_BAO_CMSUser::create($params, $adminEmail);
+    $userID = \CRM_Core_BAO_CMSUser::create($params, 'email');
 
     // Assign 'admin' role to user
     \Civi\Api4\User::update(FALSE)
-- 
2.25.1