aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-10-03 17:50:59 +0200
committerGitHub <noreply@github.com>2019-10-03 17:50:59 +0200
commiteb83d6256e6dc5d9c93dcb2b0a55e1061fee735f (patch)
tree942872aa35182fb748e40a61173ed708f0a983f1
parent9a1be333b8f2a1bb2a25e77053efa16c3e30f068 (diff)
downloadmastodon-eb83d6256e6dc5d9c93dcb2b0a55e1061fee735f.tar
mastodon-eb83d6256e6dc5d9c93dcb2b0a55e1061fee735f.tar.gz
mastodon-eb83d6256e6dc5d9c93dcb2b0a55e1061fee735f.tar.bz2
mastodon-eb83d6256e6dc5d9c93dcb2b0a55e1061fee735f.zip
Add `reason` param to `POST /api/v1/accounts` REST API (#12064)
For approval-required registrations mode
-rw-r--r--app/controllers/api/v1/accounts_controller.rb2
-rw-r--r--app/services/app_sign_up_service.rb7
-rw-r--r--spec/services/app_sign_up_service_spec.rb9
3 files changed, 14 insertions, 4 deletions
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index c12e1c12e..d68d2715f 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -78,7 +78,7 @@ class Api::V1::AccountsController < Api::BaseController
end
def account_params
- params.permit(:username, :email, :password, :agreement, :locale)
+ params.permit(:username, :email, :password, :agreement, :locale, :reason)
end
def check_enabled_registrations
diff --git a/app/services/app_sign_up_service.rb b/app/services/app_sign_up_service.rb
index 6dee9cd81..c9739c77d 100644
--- a/app/services/app_sign_up_service.rb
+++ b/app/services/app_sign_up_service.rb
@@ -4,9 +4,10 @@ class AppSignUpService < BaseService
def call(app, params)
return unless allowed_registrations?
- user_params = params.slice(:email, :password, :agreement, :locale)
- account_params = params.slice(:username)
- user = User.create!(user_params.merge(created_by_application: app, password_confirmation: user_params[:password], account_attributes: account_params))
+ user_params = params.slice(:email, :password, :agreement, :locale)
+ account_params = params.slice(:username)
+ invite_request_params = { text: params[:reason] }
+ user = User.create!(user_params.merge(created_by_application: app, password_confirmation: user_params[:password], account_attributes: account_params, invite_request_attributes: invite_request_params))
Doorkeeper::AccessToken.create!(application: app,
resource_owner_id: user.id,
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
index 7948bb53b..e7c7f3ba1 100644
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -38,6 +38,15 @@ RSpec.describe AppSignUpService, type: :service do
user = User.find_by(id: access_token.resource_owner_id)
expect(user).to_not be_nil
expect(user.account).to_not be_nil
+ expect(user.invite_request).to be_nil
+ end
+
+ it 'creates an account with invite request text' do
+ access_token = subject.call(app, good_params.merge(reason: 'Foo bar'))
+ expect(access_token).to_not be_nil
+ user = User.find_by(id: access_token.resource_owner_id)
+ expect(user).to_not be_nil
+ expect(user.invite_request&.text).to eq 'Foo bar'
end
end
end