Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Trigger Discourse events from authenticators. (#7724)

This commit is contained in:
Dan Ungureanu 2019-06-11 04:28:42 +03:00 committed by Sam
parent d073a7d5a8
commit a046f6ced5
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/users/omniauth_callbacks_controller.rb
View File

@ -43,6 +43,7 @@ class Users::OmniauthCallbacksController < ApplicationController
else else
@auth_result = authenticator.after_authenticate(auth) @auth_result = authenticator.after_authenticate(auth)
end end
DiscourseEvent.trigger(:after_auth, authenticator, @auth_result)
preferred_origin = request.env['omniauth.origin'] preferred_origin = request.env['omniauth.origin']

1
app/controllers/users_controller.rb
View File

@ -1165,6 +1165,7 @@ class UsersController < ApplicationController
# We're likely going to contact the remote auth provider, so hijack request # We're likely going to contact the remote auth provider, so hijack request
hijack do hijack do
DiscourseEvent.trigger(:before_auth_revoke, authenticator, user)
result = authenticator.revoke(user, skip_remote: skip_remote) result = authenticator.revoke(user, skip_remote: skip_remote)
if result if result
render json: success_json render json: success_json

2
lib/auth/result.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class Auth::Result class Auth::Result
attr_accessor :user, :name, :username, :email, :user, attr_accessor :user, :name, :username, :email,
:email_valid, :extra_data, :awaiting_activation, :email_valid, :extra_data, :awaiting_activation,
:awaiting_approval, :authenticated, :authenticator_name, :awaiting_approval, :authenticated, :authenticator_name,
:requires_invite, :not_allowed_from_ip_address, :requires_invite, :not_allowed_from_ip_address,