From 0e3180602c900e192ad29c36ad47dc729af9d3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 4 Sep 2024 13:03:45 +0200 Subject: [PATCH] Rename "xmpp" user service back to "ejabberd" If we ever add support for others, we can combine them as "xmpp" in helper methods --- app/controllers/services/chat_controller.rb | 2 +- app/jobs/xmpp_exchange_contacts_job.rb | 4 ++-- spec/jobs/create_ldap_user_job_spec.rb | 4 ++-- spec/jobs/xmpp_exchange_contacts_job_spec.rb | 2 +- spec/models/user_spec.rb | 16 ++++++++-------- spec/requests/webfinger_spec.rb | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/controllers/services/chat_controller.rb b/app/controllers/services/chat_controller.rb index dda2be5..9fafaec 100644 --- a/app/controllers/services/chat_controller.rb +++ b/app/controllers/services/chat_controller.rb @@ -3,7 +3,7 @@ class Services::ChatController < Services::BaseController before_action :require_service_available def show - @service_enabled = current_user.service_enabled?(:xmpp) + @service_enabled = current_user.service_enabled?(:ejabberd) end private diff --git a/app/jobs/xmpp_exchange_contacts_job.rb b/app/jobs/xmpp_exchange_contacts_job.rb index 1a9d67a..0de829c 100644 --- a/app/jobs/xmpp_exchange_contacts_job.rb +++ b/app/jobs/xmpp_exchange_contacts_job.rb @@ -2,8 +2,8 @@ class XmppExchangeContactsJob < ApplicationJob queue_as :default def perform(inviter, invitee) - return unless inviter.service_enabled?(:xmpp) && - invitee.service_enabled?(:xmpp) && + return unless inviter.service_enabled?(:ejabberd) && + invitee.service_enabled?(:ejabberd) && inviter.preferences[:xmpp_exchange_contacts_with_invitees] ejabberd = EjabberdApiClient.new diff --git a/spec/jobs/create_ldap_user_job_spec.rb b/spec/jobs/create_ldap_user_job_spec.rb index e8d0e61..87a9a44 100644 --- a/spec/jobs/create_ldap_user_job_spec.rb +++ b/spec/jobs/create_ldap_user_job_spec.rb @@ -44,7 +44,7 @@ RSpec.describe CreateLdapUserJob, type: :job do it "adds default services for pre-confirmed accounts" do allow(ldap_client_mock).to receive(:add) # spy on mock - allow(Setting).to receive(:default_services).and_return(["xmpp", "discourse"]) + Setting.default_services = ["ejabberd", "discourse"] perform_enqueued_jobs { job_for_preconfirmed_account } @@ -56,7 +56,7 @@ RSpec.describe CreateLdapUserJob, type: :job do sn: "halfinney", uid: "halfinney", mail: "halfinney@example.com", - serviceEnabled: ["xmpp", "discourse"], + serviceEnabled: ["ejabberd", "discourse"], userPassword: "remember-remember-the-5th-of-november" } ) diff --git a/spec/jobs/xmpp_exchange_contacts_job_spec.rb b/spec/jobs/xmpp_exchange_contacts_job_spec.rb index c711e87..013a80d 100644 --- a/spec/jobs/xmpp_exchange_contacts_job_spec.rb +++ b/spec/jobs/xmpp_exchange_contacts_job_spec.rb @@ -13,7 +13,7 @@ RSpec.describe XmppExchangeContactsJob, type: :job do before do stub_request(:post, "http://xmpp.example.com/api/add_rosteritem") .to_return(status: 200, body: "", headers: {}) - allow_any_instance_of(User).to receive(:services_enabled).and_return(["xmpp"]) + allow_any_instance_of(User).to receive(:services_enabled).and_return(["ejabberd"]) end it "posts add_rosteritem commands to the ejabberd API" do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 9271b7b..396fcf5 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -78,9 +78,9 @@ RSpec.describe User, type: :model do it "returns the entries from the LDAP service attribute" do expect(user).to receive(:ldap_entry).and_return({ uid: user.cn, ou: user.ou, mail: user.email, admin: nil, - services_enabled: ["discourse", "email", "gitea", "wiki", "xmpp"] + services_enabled: ["discourse", "ejabberd", "email", "gitea", "wiki"] }) - expect(user.services_enabled).to eq(["discourse", "email", "gitea", "wiki", "xmpp"]) + expect(user.services_enabled).to eq(["discourse", "ejabberd", "email", "gitea", "wiki"]) end end @@ -88,7 +88,7 @@ RSpec.describe User, type: :model do before do allow(user).to receive(:ldap_entry).and_return({ uid: user.cn, ou: user.ou, mail: user.email, admin: nil, - services_enabled: ["gitea", "xmpp"] + services_enabled: ["ejabberd", "gitea"] }) end @@ -121,9 +121,9 @@ RSpec.describe User, type: :model do it "adds multiple service to the LDAP entry" do expect_any_instance_of(LdapService).to receive(:replace_attribute) - .with(dn, :serviceEnabled, ["discourse", "gitea", "wiki", "xmpp"]).and_return(true) + .with(dn, :serviceEnabled, ["discourse", "ejabberd", "gitea", "wiki"]).and_return(true) - user.enable_service([:wiki, :xmpp]) + user.enable_service([:ejabberd, :wiki]) end end @@ -131,7 +131,7 @@ RSpec.describe User, type: :model do before do allow(user).to receive(:ldap_entry).and_return({ uid: user.cn, ou: user.ou, mail: user.email, admin: nil, - services_enabled: ["discourse", "gitea", "xmpp"] + services_enabled: ["discourse", "ejabberd", "gitea"] }) allow(user).to receive(:dn).and_return(dn) end @@ -140,14 +140,14 @@ RSpec.describe User, type: :model do expect_any_instance_of(LdapService).to receive(:replace_attribute) .with(dn, :serviceEnabled, ["discourse", "gitea"]).and_return(true) - user.disable_service(:xmpp) + user.disable_service(:ejabberd) end it "removes multiple services from the LDAP entry" do expect_any_instance_of(LdapService).to receive(:replace_attribute) .with(dn, :serviceEnabled, ["discourse"]).and_return(true) - user.disable_service([:xmpp, "gitea"]) + user.disable_service([:ejabberd, "gitea"]) end end diff --git a/spec/requests/webfinger_spec.rb b/spec/requests/webfinger_spec.rb index 8bb0d93..839ffc1 100644 --- a/spec/requests/webfinger_spec.rb +++ b/spec/requests/webfinger_spec.rb @@ -44,7 +44,7 @@ RSpec.describe "WebFinger", type: :request do before do allow_any_instance_of(User).to receive(:ldap_entry).and_return({ uid: user.cn, ou: user.ou, mail: user.email, admin: nil, - services_enabled: ["xmpp"] + services_enabled: ["ejabberd"] }) end @@ -100,7 +100,7 @@ RSpec.describe "WebFinger", type: :request do before do allow_any_instance_of(User).to receive(:ldap_entry).and_return({ uid: user.cn, ou: user.ou, mail: user.email, admin: nil, - services_enabled: ["xmpp"] + services_enabled: ["ejabberd"] }) end