diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-28 23:57:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-28 23:57:38 +0200 |
commit | 894956e20cfa7ea36bb124fb3561fde5694ac955 (patch) | |
tree | 54cbb73cd9d0455378876ad3eb6c83cedc75fb32 /app/controllers/api/v2/admin | |
parent | 22eeaf2645e44ea800a6e4c4acb7bf9d72211344 (diff) |
Fix /api/v1/admin/accounts (#17887)
* Fix /api/v1/admin/accounts Compatibility was broken since #17009 which changed the underlying filter class without changing the controller. This commits restore support for the old parameters. * Add /api/v2/admin/accounts with the new parameters * Add tests * Add missing filter for `silenced` status Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Diffstat (limited to 'app/controllers/api/v2/admin')
-rw-r--r-- | app/controllers/api/v2/admin/accounts_controller.rb | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/app/controllers/api/v2/admin/accounts_controller.rb b/app/controllers/api/v2/admin/accounts_controller.rb new file mode 100644 index 000000000..a89e6835e --- /dev/null +++ b/app/controllers/api/v2/admin/accounts_controller.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +class Api::V2::Admin::AccountsController < Api::V1::Admin::AccountsController + FILTER_PARAMS = %i( + origin + status + permissions + username + by_domain + display_name + email + ip + invited_by + ).freeze + + PAGINATION_PARAMS = (%i(limit) + FILTER_PARAMS).freeze + + private + + def filtered_accounts + AccountFilter.new(filter_params).results + end + + def filter_params + params.permit(*FILTER_PARAMS) + end + + def pagination_params(core_params) + params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params) + end +end |