if ($addon_auth['authenticated'] && !empty($addon_auth['user_record'])) {
$record = $addon_auth['user_record'];
} else {
- $user_id = User::authenticate(trim($user), trim($password), true);
- if ($user_id !== false) {
+ try {
+ $user_id = User::getIdFromPasswordAuthentication(trim($user), trim($password), true);
$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
+ } catch (Exception $ex) {
+ $record = [];
}
}
}
// delete group
- $ret = Group::removeByName($uid, $name);
+ $gid = Group::getIdByName($uid, $name);
+ if (empty($gid)) {
+ throw new BadRequestException('other API error');
+ }
+
+ $ret = Group::remove($gid);
+
if ($ret) {
// return success
$success = ['success' => $ret, 'gid' => $gid, 'name' => $name, 'status' => 'deleted', 'wrong users' => []];
$found = ($user['cid'] == $cid ? true : false);
}
if (!isset($found) || !$found) {
- Group::removeMemberByName($uid, $name, $cid);
+ $gid = Group::getIdByName($uid, $name);
+ Group::removeMember($gid, $cid);
}
}