StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More subuser Model updates.

Browse source
This commit is contained in:
Dane Everitt 2017-02-09 19:38:54 -05:00
parent c8f6c93d26
commit 99812b0407
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
8 changed files with 54 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/Repositories/SubuserRepository.php
View file

@ -167,8 +167,7 @@ class SubuserRepository
}
Models\Permission::create([
'user_id' => $user->id,
'server_id' => $server->id,
'subuser_id' => $subuser->id,
'permission' => $permission,
]);
}
@ -213,14 +212,12 @@ class SubuserRepository
*/
public function delete($id)
{
$subuser = Models\Subuser::with('server.node', 'permissions')->findOrFail($id);
$subuser = Models\Subuser::with('server.node')->findOrFail($id);
$server = $subuser->server;
DB::beginTransaction();
try {
Models\Permission::where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->delete();
$server->node->guzzleClient([
'X-Access-Server' => $server->uuid,
'X-Access-Token' => $server->node->daemonSecret,
@ -232,6 +229,9 @@ class SubuserRepository
],
]);
foreach($subuser->permissions as &$permission) {
$permission->delete();
}
$subuser->delete();
DB::commit();
@ -273,7 +273,9 @@ class SubuserRepository
DB::beginTransaction();
try {
Models\Permission::where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->delete();
foreach($subuser->permissions as &$permission) {
$permission->delete();
}
$daemonPermissions = $this->coreDaemonPermissions;
foreach ($data['permissions'] as $permission) {
@ -282,13 +284,10 @@ class SubuserRepository
if (! is_null($this->permissions[$permission])) {
array_push($daemonPermissions, $this->permissions[$permission]);
}
$model = new Models\Permission;
$model->fill([
'user_id' => $data['user'],
'server_id' => $data['server'],
Models\Permission::create([
'subuser_id' => $subuser->id,
'permission' => $permission,
]);
$model->save();
}
}