tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'v3.0.0' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2019-10-04 19:49:43 +02:00
parent 360234d1bf 83d3e7733d
commit 1bbba0016a
31 changed files with 419 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/services/app_sign_up_service.rb
View File

@@ -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,