extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2024-11-30 04:03:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix TwoFAccounts assignment when destination group does not exist

Browse Source
This commit is contained in:
Bubka 2021-10-08 23:18:39 +02:00
parent faada93720
commit 194eb54335
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Services/GroupService.php
View File

@ -108,25 +108,27 @@ public function delete($ids) : int
*
* @param array|int $ids accounts ids to assign
* @param Group $group The target group
* @return Group The updated group
* @return void
*/
public function assign($ids, Group $group = null) : Group
public function assign($ids, Group $group = null) : void
{
if (!$group) {
$group = $this->destinationGroup();
$group = $this->defaultGroup();
}
if (!is_array($ids)) {
$ids = array($ids);
if ($group) {
// saveMany() expect an iterable so we pass an array to
// find() to always obtain a list of TwoFAccount
if (!is_array($ids)) {
$ids = array($ids);
}
$twofaccounts = TwoFAccount::find($ids);
$group->twofaccounts()->saveMany($twofaccounts);
}
$twofaccounts = TwoFAccount::find($ids);
$group->twofaccounts()->saveMany($twofaccounts);
$group->loadCount('twofaccounts');
return $group;
}
/**
* Finds twofaccounts assigned to the group
*
@ -144,9 +146,9 @@ public function getAccounts(Group $group) : Collection
/**
* Determines the destination group
*
* @return Group The group
* @return Group|null The group or null if it does not exist
*/
private function destinationGroup() : Group
private function defaultGroup()
{
$id = $this->settingService->get('defaultGroup') === '-1' ? (int) $this->settingService->get('activeGroup') : (int) $this->settingService->get('defaultGroup');