Addressed test failures from users API changes

diff --git a/app/Auth/UserRepo.php b/app/Auth/UserRepo.php
index c87fda4c89b5322ddc18164f4d00edf6aff012a2..f9cfc078ed0b6ed62c5fcedd0e09df0b03d6d220 100644 (file)
--- a/app/Auth/UserRepo.php
+++ b/app/Auth/UserRepo.php
@@ -192,7 +192,7 @@ class UserRepo
      */
     public function create(array $data, bool $sendInvite = false): User
     {
-        $user = $this->createWithoutActivity($data, false);
+        $user = $this->createWithoutActivity($data, true);
 
         if ($sendInvite) {
             $this->inviteService->sendInvitation($user);

diff --git a/app/Exceptions/NotifyException.php b/app/Exceptions/NotifyException.php
index e09247208fc7d432e84932c97c3252e3bda8f124..ced4780900669897d2a9a8b18b5791968287613f 100644 (file)
--- a/app/Exceptions/NotifyException.php
+++ b/app/Exceptions/NotifyException.php
@@ -39,6 +39,11 @@ class NotifyException extends Exception implements Responsable
     {
         $message = $this->getMessage();
 
+        // Front-end JSON handling. API-side handling managed via handler.
+        if ($request->wantsJson()) {
+            return response()->json(['error' => $message], 403);
+        }
+
         if (!empty($message)) {
             session()->flash('error', $message);
         }

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 46e858d9b6276eeb5c73805803738da9476e5dff..3b443aa81e029a3b4a102ca38c9a38336d164a61 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -140,6 +140,7 @@ class UserController extends Controller
             'language'         => ['string'],
             'roles'            => ['array'],
             'roles.*'          => ['integer'],
+            'external_auth_id' => ['string'],
             'profile_image'    => array_merge(['nullable'], $this->getImageValidationRules()),
         ]);
 

diff --git a/tests/Auth/UserInviteTest.php b/tests/Auth/UserInviteTest.php
index 922a98ef3d438235bcf8444d23eb6c64a91990e4..38124cc1aef4ca64de5a2878d6dd0935acab9c3c 100644 (file)
--- a/tests/Auth/UserInviteTest.php
+++ b/tests/Auth/UserInviteTest.php
@@ -45,9 +45,7 @@ class UserInviteTest extends TestCase
             'name'        => 'Barry',
             'email'       => $email,
             'send_invite' => 'true',
-            'setting'     => [
-                'language' => 'de',
-            ],
+            'language'    => 'de',
         ]);
         $resp->assertRedirect('/settings/users');
 

diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index 2fbbee7e20725b09a90d011df4c2a616da88ce71..5870b6827c763567fc4096aa151901ca6e442557 100644 (file)
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -189,7 +189,7 @@ class UserManagementTest extends TestCase
         foreach ($langs as $lang) {
             config()->set('app.locale', $lang);
             $resp = $this->asAdmin()->get('/settings/users/create');
-            $resp->assertElementExists('select[name="setting[language]"] option[value="' . $lang . '"][selected]');
+            $resp->assertElementExists('select[name="language"] option[value="' . $lang . '"][selected]');
         }
     }