diff --git a/Modules/User/Assets/js/components/UserForm.vue b/Modules/User/Assets/js/components/UserForm.vue index f531aa070..e7d4e7515 100644 --- a/Modules/User/Assets/js/components/UserForm.vue +++ b/Modules/User/Assets/js/components/UserForm.vue @@ -51,7 +51,7 @@ - Activated + Activated
@@ -161,6 +161,7 @@ permissions: {}, roles: {}, is_new: false, + is_activated: false, }, roles: {}, form: new Form(), diff --git a/Modules/User/Tests/ApiUserControllerTest.php b/Modules/User/Tests/ApiUserControllerTest.php new file mode 100644 index 000000000..92f02675c --- /dev/null +++ b/Modules/User/Tests/ApiUserControllerTest.php @@ -0,0 +1,53 @@ +user = app(UserRepository::class); + $this->permissions = app(PermissionManager::class); + $this->userToken = app(UserTokenRepository::class); + } + + /** @test */ + public function it_creates_a_new_activated_user() + { + $data = [ + 'email' => 'user@domain.tld', + 'password' => 'Pa$$w0rd', + 'is_activated' => true, + ]; + + $request = CreateUserRequest::create('', '', $data); + $controller = new UserController($this->user, $this->permissions, $this->userToken); + + $controller->store($request); + $user = $this->user->find(1); + + $this->assertInstanceOf(User::class, $user); + $this->assertTrue($user->isActivated()); + } +} diff --git a/Modules/User/Transformers/FullUserTransformer.php b/Modules/User/Transformers/FullUserTransformer.php index d544fd0dd..9ccb52640 100644 --- a/Modules/User/Transformers/FullUserTransformer.php +++ b/Modules/User/Transformers/FullUserTransformer.php @@ -17,7 +17,7 @@ public function toArray($request) 'first_name' => $this->first_name, 'last_name' => $this->last_name, 'email' => $this->email, - 'activated' => $this->isActivated(), + 'is_activated' => $this->isActivated(), 'last_login' => $this->last_login, 'created_at' => $this->created_at, 'permissions' => $permissions,