Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix bypass account limitation to create more contacts #5125

Merged
merged 3 commits into from
Apr 29, 2021
Merged

fix: fix bypass account limitation to create more contacts #5125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48cc260
fix: fix bypass account limitation to create more contacts
asbiin Apr 29, 2021
16acb35
fix
asbiin Apr 29, 2021
b5839b2
Apply fixes from StyleCI
asbiin Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/Exceptions/AccountLimitException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

namespace App\Exceptions;

use RuntimeException;

/**
* Exception thrown if the account has reach its.
*/
class AccountLimitException extends RuntimeException
{
}
10 changes: 10 additions & 0 deletions app/Services/Contact/Contact/CreateContact.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use App\Services\BaseService;
use App\Helpers\AccountHelper;
use function Safe\json_encode;
use App\Models\Account\Account;
use App\Models\Contact\Contact;
use App\Jobs\AuditLog\LogAccountAudit;
use App\Exceptions\AccountLimitException;
use App\Jobs\Avatars\GenerateDefaultAvatar;
use App\Jobs\Avatars\GetAvatarsFromInternet;

Expand Down Expand Up @@ -57,6 +60,13 @@ public function execute(array $data): Contact
{
$this->validate($data);

$account = Account::find($data['account_id']);
if (AccountHelper::hasReachedContactLimit($account)
&& AccountHelper::hasLimitations($account)
&& ! $account->legacy_free_plan_unlimited_contacts) {
throw new AccountLimitException();
}

// filter out the data that shall not be updated here
$dataOnly = Arr::except(
$data,
Expand Down