Page MenuHomePhorge
Files F117756541

D5796.1775205873.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D5796.1775205873.diff
View Options

diff --git a/src/app/Http/Controllers/API/V4/UsersController.php b/src/app/Http/Controllers/API/V4/UsersController.php
--- a/src/app/Http/Controllers/API/V4/UsersController.php
+++ b/src/app/Http/Controllers/API/V4/UsersController.php
@@ -333,7 +333,8 @@
$user = User::create([
'email' => $request->email,
'password' => $request->password,
- 'status' => $wallet->owner->isRestricted() ? User::STATUS_RESTRICTED : 0,
+ 'status' => ($wallet->owner->isRestricted() ? User::STATUS_RESTRICTED : 0)
+ + ($wallet->owner->isSuspended() ? User::STATUS_SUSPENDED : 0),
]);
$this->activatePassCode($user);
diff --git a/src/tests/Feature/Controller/UsersTest.php b/src/tests/Feature/Controller/UsersTest.php
--- a/src/tests/Feature/Controller/UsersTest.php
+++ b/src/tests/Feature/Controller/UsersTest.php
@@ -1000,6 +1000,7 @@
$this->assertSame('Doe2', $user->getSetting('last_name'));
$this->assertSame('TestOrg', $user->getSetting('organization'));
$this->assertFalse($user->isRestricted());
+ $this->assertFalse($user->isSuspended());
/** @var UserAlias[] $aliases */
$aliases = $user->aliases()->orderBy('alias')->get();
$this->assertCount(2, $aliases);
@@ -1103,6 +1104,19 @@
$user = User::where('email', 'UsersControllerTest1@userscontroller.com')->first();
$this->assertTrue($user->isRestricted());
+ $this->assertFalse($user->isSuspended());
+
+ // Test creating a user when the account owner is suspended
+ $owner->status |= User::STATUS_SUSPENDED;
+ $owner->save();
+ $post['email'] = 'UsersControllerTest3@userscontroller.com';
+
+ $response = $this->actingAs($owner)->post('/api/v4/users', $post);
+ $response->assertStatus(200);
+
+ $user = User::where('email', 'UsersControllerTest3@userscontroller.com')->first();
+ $this->assertTrue($user->isRestricted());
+ $this->assertTrue($user->isSuspended());
}
/**

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 8:44 AM (18 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18820271
Default Alt Text
D5796.1775205873.diff (2 KB)

Event Timeline