tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-31 01:35:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Ivan Diaz] - Remove isAdmin property form user model

Browse Source
This commit is contained in:
Ivan Diaz 2016-04-28 21:23:27 -03:00
parent b44f6f18dc
commit e7445a1c21
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/controllers/user/login.php
View File

@ -39,7 +39,6 @@ class LoginController extends Controller {
return array( return array(
'userId' => $userInstance->id, 'userId' => $userInstance->id,
'userEmail' => $userInstance->email, 'userEmail' => $userInstance->email,
'userIsAdmin' => $userInstance->admin,
'token' => $this->getSession()->getToken() 'token' => $this->getSession()->getToken()
); );
} }

3
server/controllers/user/signup.php
View File

@ -19,8 +19,7 @@ class SignUpController extends Controller {
$userInstance = new User(); $userInstance = new User();
$userInstance->setProperties(array( $userInstance->setProperties(array(
'email' => $email, 'email' => $email,
'password' => User::hashPassword($password), 'password' => User::hashPassword($password)
'admin' => 0
)); ));
return $userInstance->store(); return $userInstance->store();

7
server/models/User.php
View File

@ -20,15 +20,12 @@ class User extends DataStore {
public static function getProps() { public static function getProps() {
return array( return array(
'email', 'email',
'password', 'password'
'admin',
); );
} }
public function getDefaultProperties() { public function getDefaultProperties() {
return [ return array();
'admin' => 0
];
} }
public static function getUser($value, $property = 'id') { public static function getUser($value, $property = 'id') {

1
server/tests/__mocks__/UserMock.php
View File

@ -14,7 +14,6 @@ class User extends \Mock {
$mockUserInstance->id = 'MOCK_ID'; $mockUserInstance->id = 'MOCK_ID';
$mockUserInstance->email = 'MOCK_EMAIL'; $mockUserInstance->email = 'MOCK_EMAIL';
$mockUserInstance->password = 'MOCK_PASSWORD'; $mockUserInstance->password = 'MOCK_PASSWORD';
$mockUserInstance->admin = 'MOCK_ADMIN_VALUE';
return $mockUserInstance; return $mockUserInstance;
} }

1
server/tests/controllers/user/loginTest.php
View File

@ -38,7 +38,6 @@ class LoginControllerTest extends PHPUnit_Framework_TestCase {
$this->assertTrue(Response::get('respondSuccess')->hasBeenCalledWithArgs(array( $this->assertTrue(Response::get('respondSuccess')->hasBeenCalledWithArgs(array(
'userId' => 'MOCK_ID', 'userId' => 'MOCK_ID',
'userEmail' => 'MOCK_EMAIL', 'userEmail' => 'MOCK_EMAIL',
'userIsAdmin' => 'MOCK_ADMIN_VALUE',
'token' => 'TEST_TOKEN' 'token' => 'TEST_TOKEN'
))); )));
} }