From ee8669d778ad46cb65265042eac4c58e9af0bf16 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 21 Jun 2019 21:57:49 +0300 Subject: [PATCH] FIX: Ensure :after_auth event is triggered. (#7791) --- app/controllers/users/omniauth_callbacks_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index d7473a51f6e..4a9b0916e2f 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -32,9 +32,11 @@ class Users::OmniauthCallbacksController < ApplicationController @auth_result = authenticator.after_authenticate(auth, existing_account: current_user) if provider&.full_screen_login || cookies['fsl'] cookies.delete('fsl') + DiscourseEvent.trigger(:after_auth, authenticator, @auth_result) return redirect_to Discourse.base_uri("/my/preferences/account") else @auth_result.authenticated = true + DiscourseEvent.trigger(:after_auth, authenticator, @auth_result) return respond_to do |format| format.html format.json { render json: @auth_result.to_client_hash } @@ -42,8 +44,8 @@ class Users::OmniauthCallbacksController < ApplicationController end else @auth_result = authenticator.after_authenticate(auth) + DiscourseEvent.trigger(:after_auth, authenticator, @auth_result) end - DiscourseEvent.trigger(:after_auth, authenticator, @auth_result) preferred_origin = request.env['omniauth.origin']