diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.php new file mode 100644 index 0000000000..61a92a0bd4 --- /dev/null +++ b/app/Api/V1/Controllers/Data/DestroyController.php @@ -0,0 +1,280 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Api\V1\Controllers\Data; + +use FireflyIII\Api\V1\Controllers\Controller; +use FireflyIII\Api\V1\Requests\DataDestroyRequest; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface; +use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; +use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use FireflyIII\Repositories\Tag\TagRepositoryInterface; +use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepository; +use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; +use FireflyIII\Services\Internal\Destroy\AccountDestroyService; +use FireflyIII\Services\Internal\Destroy\JournalDestroyService; +use Illuminate\Http\JsonResponse; + +/** + * Class DestroyController + */ +class DestroyController extends Controller +{ + /** + * @return JsonResponse + */ + public function destroy(DataDestroyRequest $request): JsonResponse + { + $objects = $request->getObjects(); + + switch ($objects) { + default: + throw new FireflyException(sprintf('This endpoint can\'t handle object "%s"', $objects)); + case 'budgets': + $this->destroyBudgets(); + break; + case 'bills': + $this->destroyBills(); + break; + case 'piggy_banks': + $this->destroyPiggyBanks(); + break; + case 'rules': + $this->destroyRules(); + break; + case 'recurring': + $this->destroyRecurringTransactions(); + break; + case 'categories': + $this->destroyCategories(); + break; + case 'tags': + $this->destroyTags(); + break; + case 'object_groups': + $this->destroyObjectGroups(); + break; + case 'accounts': + $this->destroyAccounts( + [ + AccountType::ASSET, AccountType::DEFAULT, + AccountType::BENEFICIARY, AccountType::EXPENSE, + AccountType::REVENUE, AccountType::INITIAL_BALANCE, + AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD, + ] + ); + break; + case 'asset_accounts': + $this->destroyAccounts( + [ + AccountType::ASSET, AccountType::DEFAULT, + ] + ); + break; + case 'expense_accounts': + $this->destroyAccounts( + [ + AccountType::BENEFICIARY, AccountType::EXPENSE, + ] + ); + break; + case 'revenue_accounts': + $this->destroyAccounts( + [ + AccountType::REVENUE, + ] + ); + break; + case 'liabilities': + $this->destroyAccounts( + [ + AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD, + ] + ); + break; + case 'transactions': + $this->destroyTransactions( + [ + TransactionType::WITHDRAWAL, + TransactionType::DEPOSIT, + TransactionType::TRANSFER, + TransactionType::RECONCILIATION, + TransactionType::OPENING_BALANCE, + ] + ); + break; + case 'withdrawals': + $this->destroyTransactions( + [ + TransactionType::WITHDRAWAL, + ] + ); + break; + case 'deposits': + $this->destroyTransactions( + [ + TransactionType::DEPOSIT, + ] + ); + break; + case 'transfers': + $this->destroyTransactions( + [ + TransactionType::TRANSFER, + ] + ); + break; + } + + return response()->json([], 204); + } + + /** + * @param array $types + */ + private function destroyAccounts(array $types): void + { + /** @var AccountRepositoryInterface $repository */ + $repository = app(AccountRepositoryInterface::class); + $collection = $repository->getAccountsByType($types); + $service = app(AccountDestroyService::class); + /** @var Account $account */ + foreach ($collection as $account) { + $service->destroy($account, null); + } + } + + /** + * + */ + private function destroyBills(): void + { + /** @var BillRepositoryInterface $repository */ + $repository = app(BillRepositoryInterface::class); + $repository->destroyAll(); + } + + /** + * + */ + private function destroyBudgets(): void + { + /** @var AvailableBudgetRepositoryInterface $abRepository */ + $abRepository = app(AvailableBudgetRepositoryInterface::class); + $abRepository->destroyAll(); + + /** @var BudgetLimitRepositoryInterface $blRepository */ + $blRepository = app(BudgetLimitRepositoryInterface::class); + $blRepository->destroyAll(); + + /** @var BudgetRepositoryInterface $budgetRepository */ + $budgetRepository = app(BudgetRepositoryInterface::class); + $budgetRepository->destroyAll(); + } + + /** + * + */ + private function destroyCategories(): void + { + /** @var CategoryRepositoryInterface $categoryRepos */ + $categoryRepos = app(CategoryRepositoryInterface::class); + $categoryRepos->destroyAll(); + } + + private function destroyObjectGroups(): void + { + /** @var ObjectGroupRepositoryInterface $repository */ + $repository = app(ObjectGroupRepositoryInterface::class); + $repository->deleteAll(); + } + + /** + * + */ + private function destroyPiggyBanks(): void + { + /** @var PiggyBankRepositoryInterface $repository */ + $repository = app(PiggyBankRepositoryInterface::class); + $repository->destroyAll(); + } + + /** + * + */ + private function destroyRecurringTransactions(): void + { + /** @var RecurringRepositoryInterface $repository */ + $repository = app(RecurringRepositoryInterface::class); + $repository->destroyAll(); + } + + /** + * + */ + private function destroyRules(): void + { + /** @var RuleGroupRepositoryInterface $repository */ + $repository = app(RuleGroupRepositoryInterface::class); + $repository->destroyAll(); + } + + /** + * + */ + private function destroyTags(): void + { + /** @var TagRepositoryInterface $tagRepository */ + $tagRepository = app(TagRepositoryInterface::class); + $tagRepository->destroyAll(); + } + + /** + * @param array $types + */ + private function destroyTransactions(array $types): void + { + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepositoryInterface::class); + $journals = $repository->findByType($types); + $service = app(JournalDestroyService::class); + /** @var TransactionJournal $journal */ + foreach($journals as $journal) { + $service->destroy($journal); + } + } + +} diff --git a/app/Api/V1/Requests/DataDestroyRequest.php b/app/Api/V1/Requests/DataDestroyRequest.php new file mode 100644 index 0000000000..dbdec0da59 --- /dev/null +++ b/app/Api/V1/Requests/DataDestroyRequest.php @@ -0,0 +1,66 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Api\V1\Requests; + +/** + * Class DataDestroyRequest + */ +class DataDestroyRequest extends Request +{ + /** + * Authorize logged in users. + * + * @return bool + */ + public function authorize(): bool + { + // Only allow authenticated users + return auth()->check(); + } + + /** + * Get all data from the request. + * + * @return string + */ + public function getObjects(): string + { + return $this->get('objects') ?? ''; + } + + /** + * The rules that the incoming request must be matched against. + * + * @return array + */ + public function rules(): array + { + $valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups' . + ',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'; + + return [ + 'objects' => sprintf('min:1|string|in:%s', $valid), + ]; + } +} diff --git a/app/Http/Controllers/Profile/DataController.php b/app/Http/Controllers/Profile/DataController.php deleted file mode 100644 index fa52bd1253..0000000000 --- a/app/Http/Controllers/Profile/DataController.php +++ /dev/null @@ -1,91 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Http\Controllers\Profile; - -use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface; -use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface; -use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Category\CategoryRepositoryInterface; -use FireflyIII\Repositories\Tag\TagRepositoryInterface; -use Illuminate\Http\RedirectResponse; - -/** - * Class DataController - */ -class DataController extends Controller -{ - - /** - * - */ - public function deleteBudgets(): RedirectResponse - { - /** @var AvailableBudgetRepositoryInterface $abRepository */ - $abRepository = app(AvailableBudgetRepositoryInterface::class); - $abRepository->destroyAll(); - - /** @var BudgetLimitRepositoryInterface $blRepository */ - $blRepository = app(BudgetLimitRepositoryInterface::class); - $blRepository->destroyAll(); - - /** @var BudgetRepositoryInterface $budgetRepository */ - $budgetRepository = app(BudgetRepositoryInterface::class); - $budgetRepository->destroyAll(); - - session()->flash('success', trans('firefly.deleted_all_budgets')); - - return redirect(route('profile.index')); - } - - /** - * - */ - public function deleteCategories(): RedirectResponse - { - /** @var CategoryRepositoryInterface $categoryRepos */ - $categoryRepos = app(CategoryRepositoryInterface::class); - $categoryRepos->destroyAll(); - - session()->flash('success', trans('firefly.deleted_all_categories')); - - return redirect(route('profile.index')); - } - - - /** - * - */ - public function deleteTags(): RedirectResponse - { - /** @var TagRepositoryInterface $tagRepository */ - $tagRepository = app(TagRepositoryInterface::class); - $tagRepository->destroyAll(); - - session()->flash('success', trans('firefly.deleted_all_tags')); - - return redirect(route('profile.index')); - } -} diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 4a14a7025e..c2163ae597 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -50,8 +50,7 @@ use Storage; class BillRepository implements BillRepositoryInterface { use CreatesObjectGroups; - /** @var User */ - private $user; + private User $user; /** * Constructor. @@ -764,4 +763,12 @@ class BillRepository implements BillRepositoryInterface $bill->order = $order; $bill->save(); } + + /** + * @inheritDoc + */ + public function destroyAll(): void + { + $this->user->bills()->delete(); + } } diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 91952f9fe7..4ae68097fc 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -43,6 +43,11 @@ interface BillRepositoryInterface */ public function setObjectGroup(Bill $bill, string $objectGroupTitle): Bill; + /** + * + */ + public function destroyAll(): void; + /** * @param Bill $bill * diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 118f2aeace..793f1b21a3 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -396,4 +396,16 @@ class JournalRepository implements JournalRepositoryInterface return $result; } + + /** + * @inheritDoc + */ + public function findByType(array $types): Collection + { + return $this->user + ->transactionJournals() + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') + ->whereIn('transaction_types.type', $types) + ->get(['transaction_journals.*']); + } } diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 6c34c92337..dde2dfdd62 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -42,6 +42,13 @@ interface JournalRepositoryInterface */ public function getLast(): ?TransactionJournal; + /** + * @param array $types + * + * @return Collection + */ + public function findByType(array $types): Collection; + /** * TODO maybe create JSON repository? * diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepository.php b/app/Repositories/ObjectGroup/ObjectGroupRepository.php index 1354215ebf..2f71683a36 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepository.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepository.php @@ -171,4 +171,18 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface { return $objectGroup->piggyBanks; } + + /** + * @inheritDoc + */ + public function deleteAll(): void + { + $all = $this->get(); + /** @var ObjectGroup $group */ + foreach ($all as $group) { + $group->piggyBanks()->sync([]); + $group->bills()->sync([]); + $group->delete(); + } + } } diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php index 472f72edce..7e63681c98 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php @@ -48,6 +48,10 @@ interface ObjectGroupRepositoryInterface * Delete empty ones. */ public function deleteEmpty(): void; + /** + * Delete all. + */ + public function deleteAll(): void; /** * @param ObjectGroup $objectGroup diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index fe5e14c097..4ec0ca2351 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -396,4 +396,11 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface } + /** + * @inheritDoc + */ + public function destroyAll(): void + { + $this->user->piggyBanks()->delete(); + } } diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index bc4257f628..942e104f18 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -36,6 +36,11 @@ use Illuminate\Support\Collection; */ interface PiggyBankRepositoryInterface { + /** + * + */ + public function destroyAll(): void; + /** * @param PiggyBank $piggyBank * @param string $objectGroupTitle diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 3bdb71946a..d44a7cd9a3 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -561,4 +561,12 @@ class RecurringRepository implements RecurringRepositoryInterface return $filtered; } + + /** + * @inheritDoc + */ + public function destroyAll(): void + { + $this->user->recurrences()->delete(); + } } diff --git a/app/Repositories/Recurring/RecurringRepositoryInterface.php b/app/Repositories/Recurring/RecurringRepositoryInterface.php index 5ebbcb1921..751bceec01 100644 --- a/app/Repositories/Recurring/RecurringRepositoryInterface.php +++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php @@ -25,7 +25,6 @@ namespace FireflyIII\Repositories\Recurring; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Models\PiggyBank; use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceRepetition; use FireflyIII\Models\RecurrenceTransaction; @@ -40,6 +39,11 @@ use Illuminate\Support\Collection; */ interface RecurringRepositoryInterface { + /** + * Destroy all recurring transactions. + */ + public function destroyAll(): void; + /** * Destroy a recurring transaction. * diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index 1d51301a19..063e714e79 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -358,4 +358,16 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface return $this->user->ruleGroups()->where('title', $title)->first(); } + /** + * @inheritDoc + */ + public function destroyAll(): void + { + $groups = $this->get(); + /** @var RuleGroup $group */ + foreach ($groups as $group) { + $group->rules()->delete(); + $group->delete(); + } + } } diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index e4dac7011a..9e88e0829d 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -31,13 +31,18 @@ use Illuminate\Support\Collection; */ interface RuleGroupRepositoryInterface { + /** + * Delete everything. + */ + public function destroyAll(): void; + /** * @return int */ public function count(): int; /** - * @param RuleGroup $ruleGroup + * @param RuleGroup $ruleGroup * @param RuleGroup|null $moveTo * * @return bool diff --git a/app/Services/Internal/Destroy/JournalDestroyService.php b/app/Services/Internal/Destroy/JournalDestroyService.php index 219f8657e9..2c9a9867b1 100644 --- a/app/Services/Internal/Destroy/JournalDestroyService.php +++ b/app/Services/Internal/Destroy/JournalDestroyService.php @@ -96,6 +96,16 @@ class JournalDestroyService $journal->piggyBankEvents()->update(['transaction_journal_id' => null]); $journal->delete(); + + // delete group, if group is empty: + $group = $journal->transactionGroup; + if (null !== $group) { + $count = $group->transactionJournals->count(); + if (0 === $count) { + $group->delete(); + } + } + } catch (Exception $e) { Log::error(sprintf('Could not delete bill: %s', $e->getMessage())); // @codeCoverageIgnore } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 4606c878b1..8ee6641df1 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -605,54 +605,84 @@ return [ 'list_page_size_help' => 'Any list of things (accounts, transactions, etc) shows at most this many per page.', 'list_page_size_label' => 'Page size', 'between_dates' => '(:start and :end)', - 'pref_optional_fields_transaction' => 'Optional fields for transactions', - 'pref_optional_fields_transaction_help' => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.', - 'optional_tj_date_fields' => 'Date fields', - 'optional_tj_business_fields' => 'Business fields', - 'optional_tj_attachment_fields' => 'Attachment fields', - 'pref_optional_tj_interest_date' => 'Interest date', - 'pref_optional_tj_book_date' => 'Book date', - 'pref_optional_tj_process_date' => 'Processing date', - 'pref_optional_tj_due_date' => 'Due date', - 'pref_optional_tj_payment_date' => 'Payment date', - 'pref_optional_tj_invoice_date' => 'Invoice date', - 'pref_optional_tj_internal_reference' => 'Internal reference', - 'pref_optional_tj_notes' => 'Notes', - 'pref_optional_tj_attachments' => 'Attachments', - 'optional_field_meta_dates' => 'Dates', - 'optional_field_meta_business' => 'Business', - 'optional_field_attachments' => 'Attachments', - 'optional_field_meta_data' => 'Optional meta data', + 'pref_optional_fields_transaction' => 'Optional fields for transactions', + 'pref_optional_fields_transaction_help' => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.', + 'optional_tj_date_fields' => 'Date fields', + 'optional_tj_business_fields' => 'Business fields', + 'optional_tj_attachment_fields' => 'Attachment fields', + 'pref_optional_tj_interest_date' => 'Interest date', + 'pref_optional_tj_book_date' => 'Book date', + 'pref_optional_tj_process_date' => 'Processing date', + 'pref_optional_tj_due_date' => 'Due date', + 'pref_optional_tj_payment_date' => 'Payment date', + 'pref_optional_tj_invoice_date' => 'Invoice date', + 'pref_optional_tj_internal_reference' => 'Internal reference', + 'pref_optional_tj_notes' => 'Notes', + 'pref_optional_tj_attachments' => 'Attachments', + 'optional_field_meta_dates' => 'Dates', + 'optional_field_meta_business' => 'Business', + 'optional_field_attachments' => 'Attachments', + 'optional_field_meta_data' => 'Optional meta data', // profile: - 'permanent_delete_stuff' => 'Be careful with these buttons. Deleting stuff is permanent.', - 'other_sessions_logged_out' => 'All your other sessions have been logged out.', - 'delete_all_budgets' => 'Delete ALL your budgets', - 'delete_all_categories' => 'Delete ALL your categories', - 'delete_all_tags' => 'Delete ALL your tags', - 'deleted_all_budgets' => 'All budgets have been deleted', - 'deleted_all_categories' => 'All categories have been deleted', - 'deleted_all_tags' => 'All tags have been deleted', - 'change_your_password' => 'Change your password', - 'delete_account' => 'Delete account', - 'current_password' => 'Current password', - 'new_password' => 'New password', - 'new_password_again' => 'New password (again)', - 'delete_your_account' => 'Delete your account', - 'delete_your_account_help' => 'Deleting your account will also delete any accounts, transactions, anything you might have saved into Firefly III. It\'ll be GONE.', - 'delete_your_account_password' => 'Enter your password to continue.', - 'password' => 'Password', - 'are_you_sure' => 'Are you sure? You cannot undo this.', - 'delete_account_button' => 'DELETE your account', - 'invalid_current_password' => 'Invalid current password!', - 'password_changed' => 'Password changed!', - 'should_change' => 'The idea is to change your password.', - 'invalid_password' => 'Invalid password!', - 'what_is_pw_security' => 'What is "verify password security"?', - 'secure_pw_title' => 'How to choose a secure password', - 'secure_pw_history' => 'Not a week goes by that you read in the news about a site losing the passwords of its users. Hackers and thieves use these passwords to try to steal your private information. This information is valuable.', - 'secure_pw_ff' => 'Do you use the same password all over the internet? If one site loses your password, hackers have access to all your data. Firefly III relies on you to choose a strong and unique password to protect your financial records.', - 'secure_pw_check_box' => 'To help you do that Firefly III can check if the password you want to use has been stolen in the past. If this is the case, Firefly III advises you NOT to use that password.', + 'delete_stuff_header' => 'Delete data from Firefly III', + 'permanent_delete_stuff' => 'Be careful with these buttons. Deleting stuff is permanent.', + 'other_sessions_logged_out' => 'All your other sessions have been logged out.', + 'delete_all_budgets' => 'Delete ALL your budgets', + 'delete_all_categories' => 'Delete ALL your categories', + 'delete_all_tags' => 'Delete ALL your tags', + 'delete_all_bills' => 'Delete ALL your bills', + 'delete_all_piggy_banks' => 'Delete ALL your piggy banks', + 'delete_all_rules' => 'Delete ALL your rules', + 'delete_all_recurring' => 'Delete ALL your recurring transactions', + 'delete_all_object_groups' => 'Delete ALL your object groups', + 'delete_all_accounts' => 'Delete ALL your accounts', + 'delete_all_asset_accounts' => 'Delete ALL your asset accounts', + 'delete_all_expense_accounts' => 'Delete ALL your expense accounts', + 'delete_all_revenue_accounts' => 'Delete ALL your revenue accounts', + 'delete_all_liabilities' => 'Delete ALL your liabilities', + 'delete_all_transactions' => 'Delete ALL your transactions', + 'delete_all_withdrawals' => 'Delete ALL your withdrawals', + 'delete_all_deposits' => 'Delete ALL your deposits', + 'delete_all_transfers' => 'Delete ALL your transfers', + 'also_delete_transactions' => 'Deleting accounts will also delete ALL associated withdrawals, deposits and transfers!', + 'deleted_all_budgets' => 'All budgets have been deleted', + 'deleted_all_categories' => 'All categories have been deleted', + 'deleted_all_tags' => 'All tags have been deleted', + 'deleted_all_bills' => 'All bills have been deleted', + 'deleted_all_piggy_banks' => 'All piggy banks have been deleted', + 'deleted_all_rules' => 'All rules and rule groups have been deleted', + 'deleted_all_object_groups' => 'All groups have been deleted', + 'deleted_all_accounts' => 'All accounts have been deleted', + 'deleted_all_asset_accounts' => 'All asset accounts have been deleted', + 'deleted_all_expense_accounts' => 'All expense accounts have been deleted', + 'deleted_all_revenue_accounts' => 'All revenue accounts have been deleted', + 'deleted_all_liabilities' => 'All liabilities have been deleted', + 'deleted_all_transactions' => 'All transactions have been deleted', + 'deleted_all_withdrawals' => 'All withdrawals have been deleted', + 'deleted_all_deposits' => 'All deposits have been deleted', + 'deleted_all_transfers' => 'All transfers have been deleted', + 'deleted_all_recurring' => 'All recurring transactions have been deleted', + 'change_your_password' => 'Change your password', + 'delete_account' => 'Delete account', + 'current_password' => 'Current password', + 'new_password' => 'New password', + 'new_password_again' => 'New password (again)', + 'delete_your_account' => 'Delete your account', + 'delete_your_account_help' => 'Deleting your account will also delete any accounts, transactions, anything you might have saved into Firefly III. It\'ll be GONE.', + 'delete_your_account_password' => 'Enter your password to continue.', + 'password' => 'Password', + 'are_you_sure' => 'Are you sure? You cannot undo this.', + 'delete_account_button' => 'DELETE your account', + 'invalid_current_password' => 'Invalid current password!', + 'password_changed' => 'Password changed!', + 'should_change' => 'The idea is to change your password.', + 'invalid_password' => 'Invalid password!', + 'what_is_pw_security' => 'What is "verify password security"?', + 'secure_pw_title' => 'How to choose a secure password', + 'secure_pw_history' => 'Not a week goes by that you read in the news about a site losing the passwords of its users. Hackers and thieves use these passwords to try to steal your private information. This information is valuable.', + 'secure_pw_ff' => 'Do you use the same password all over the internet? If one site loses your password, hackers have access to all your data. Firefly III relies on you to choose a strong and unique password to protect your financial records.', + 'secure_pw_check_box' => 'To help you do that Firefly III can check if the password you want to use has been stolen in the past. If this is the case, Firefly III advises you NOT to use that password.', 'secure_pw_working_title' => 'How does it work?', 'secure_pw_working' => 'By checking the box, Firefly III will send the first five characters of the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.', 'secure_pw_should' => 'Should I check the box?', diff --git a/resources/views/v1/profile/index.twig b/resources/views/v1/profile/index.twig index b6b54cb67e..7b92b91c40 100644 --- a/resources/views/v1/profile/index.twig +++ b/resources/views/v1/profile/index.twig @@ -27,84 +27,225 @@
  • {{ 'delete_account'|_ }}
    • -
    -

    - {{ 'permanent_delete_stuff'|_ }} -

    - -
    +
    +
    +
    +
    +

    {{ 'command_line_token'|_ }}

    +
    +
    +

    + {{ 'explain_command_line_token'|_ }} +

    +

    + -

    -
    -
    -
    -

    {{ 'command_line_token'|_ }}

    -
    -
    -

    - {{ 'explain_command_line_token'|_ }} -

    -

    - +

    +

    +

    + + +
    +

    +
    +
    +
    +
    +
    +
    +
    +
    +

    {{ 'pref_two_factor_auth'|_ }}

    +
    +
    +

    {{ 'pref_two_factor_auth_help'|_ }}

    + {% if enabled2FA == true %} +

    + {{ trans_choice('firefly.pref_two_factor_backup_code_count', mfaBackupCount) }}

    + +
    + + + {{ 'pref_two_factor_auth_reset_code'|_ }} + + + {{ 'pref_two_factor_new_backup_codes'|_ }} + + + {{ 'pref_two_factor_auth_disable_2fa'|_ }} +
    + {% else %}

    -

    + - +

    + {% endif %} +
    +
    +
    +
    +
    +
    +
    +
    +

    {{ 'delete_stuff_header'|_ }}

    +
    +
    +
    +

    + {{ 'permanent_delete_stuff'|_ }} +

    +

    {{ 'financial_control'|_ }}

    +

    + + + + + +

    +

    {{ 'automation'|_ }}

    +

    + + + +

    + +

    {{ 'classification'|_ }}

    +

    + + + + + +

    + +

    {{ 'accounts'|_ }}

    +

    + {{ 'also_delete_transactions'|_ }} +

    +

    + + + + + +

    +

    + + + +

    +

    {{ 'transactions'|_ }}

    +

    + + + + + + + +

    +

    + +

    +
    -
    -
    -
    -
    -

    {{ 'pref_two_factor_auth'|_ }}

    -
    -
    -

    {{ 'pref_two_factor_auth_help'|_ }}

    - {% if enabled2FA == true %} -

    - {{ trans_choice('firefly.pref_two_factor_backup_code_count', mfaBackupCount) }} -

    - -
    - - - {{ 'pref_two_factor_auth_reset_code'|_ }} - - - {{ 'pref_two_factor_new_backup_codes'|_ }} - - - {{ 'pref_two_factor_auth_disable_2fa'|_ }} -
    - {% else %} -

    -

    - - -
    -

    - {% endif %} -
    -
    -
    -
    {% endblock %} {% block scripts %} + {% endblock %} diff --git a/routes/api.php b/routes/api.php index 038f582f7a..45b8561c59 100644 --- a/routes/api.php +++ b/routes/api.php @@ -386,6 +386,16 @@ Route::group( } ); +Route::group( + ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'data', + 'as' => 'api.v1.data.',], + static function () { + + // Overview API routes: + Route::delete('destroy', ['uses' => 'Data\DestroyController@destroy', 'as' => 'destroy']); + } +); + Route::group( ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'currencies', 'as' => 'api.v1.currencies.',], diff --git a/routes/web.php b/routes/web.php index bbbe224227..c55a45396d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -721,10 +721,6 @@ Route::group( Route::get('/delete-code', ['uses' => 'ProfileController@deleteCode', 'as' => 'delete-code']); Route::get('2fa/new-codes', ['uses' => 'ProfileController@newBackupCodes', 'as' => 'new-backup-codes']); - // routes to delete stuff. - Route::get('delete-budgets', ['uses' => 'Profile\DataController@deleteBudgets', 'as' => 'delete-budgets']); - Route::get('delete-categories', ['uses' => 'Profile\DataController@deleteCategories', 'as' => 'delete-categories']); - Route::get('delete-tags', ['uses' => 'Profile\DataController@deleteTags', 'as' => 'delete-tags']); } );