A platform for community discussion. Free, open, simple.
DEV: Change `authenticated_with_oauth` to use key instead of string. (#38381)
Gabriel Grubba52eb4e2ec421
diff --git a/app/services/user_activator.rb b/app/services/user_activator.rbindex 2e8c721cc7f..6a43f8f1e65 100644--- a/app/services/user_activator.rb+++ b/app/services/user_activator.rb@@ -67,7 +67,7 @@ class LoginActivator < UserActivatorinclude CurrentUserdef activate- log_on_user(user, { authenticated_with_oauth: session["authenticated_with_oauth"] })+ log_on_user(user, { authenticated_with_oauth: session[:authenticated_with_oauth] })user.enqueue_welcome_message("welcome_user")success_messageenddiff --git a/spec/services/user_activator_spec.rb b/spec/services/user_activator_spec.rbindex 42495be3ecd..56c5890579f 100644--- a/spec/services/user_activator_spec.rb+++ b/spec/services/user_activator_spec.rb@@ -18,4 +18,26 @@ RSpec.describe UserActivator doexpect(EmailToken.hash_token(job_args["email_token"])).to eq(email_token.token_hash)endend++ describe "login_activator" do+ let(:request) do+ ActionDispatch::TestRequest.create("rack.session" => { authenticated_with_oauth: true })+ end+ let(:session) { request.session }+ let(:cookies) { ActionDispatch::Cookies::CookieJar.build(request, {}) }+ let(:activator) { LoginActivator.new(user, request, session, cookies) }++ before { SiteSetting.send_welcome_message = true }++ it "passes authenticated_with_oauth from session to log_on_user" do+ activator.activate+ expect(user.user_auth_tokens.last.authenticated_with_oauth).to eq(true)+ end++ it "enqueues a welcome message and returns the active message" do+ message = activator.activate+ expect(Jobs::SendSystemMessage.jobs.last["args"].first["message_type"]).to eq("welcome_user")+ expect(message).to eq(I18n.t("login.active"))+ end+ endend