nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add locale param to sign-up API (#9747) 

Fix #9627
This commit is contained in:
Eugen Rochko 2019-01-07 14:50:20 +01:00 committed by GitHub
parent 0a4caa89c3
commit 43c61bca60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/accounts_controller.rb
View File

@ -76,7 +76,7 @@ class Api::V1::AccountsController < Api::BaseController
end end
def account_params def account_params
params.permit(:username, :email, :password, :agreement) params.permit(:username, :email, :password, :agreement, :locale)
end end
def check_enabled_registrations def check_enabled_registrations

2
app/services/app_sign_up_service.rb
View File

@ -4,7 +4,7 @@ class AppSignUpService < BaseService
def call(app, params) def call(app, params)
return unless allowed_registrations? return unless allowed_registrations?
user_params = params.slice(:email, :password, :agreement) user_params = params.slice(:email, :password, :agreement, :locale)
account_params = params.slice(:username) 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 = User.create!(user_params.merge(created_by_application: app, password_confirmation: user_params[:password], account_attributes: account_params))