Re-rename "ejabberd" service to "xmpp"

Shouldn't matter which implementation is integrated if someone adds
another one
This commit is contained in:
Râu Cao 2023-04-04 12:29:39 +02:00
parent f19baaf22a
commit 62cd0eb7d1
Signed by: raucao
GPG Key ID: 15E65F399D084BA9
3 changed files with 8 additions and 8 deletions

View File

@ -57,7 +57,7 @@ class User < ApplicationRecord
end end
def devise_after_confirmation def devise_after_confirmation
enable_service %w[ discourse ejabberd gitea mediawiki ] enable_service %w[ discourse gitea mediawiki xmpp ]
#TODO enable in development when we have easy setup of ejabberd etc. #TODO enable in development when we have easy setup of ejabberd etc.
return if Rails.env.development? return if Rails.env.development?
@ -137,12 +137,12 @@ class User < ApplicationRecord
def pref_enabled?(key) def pref_enabled?(key)
value = preferences.dig(*key.split(":")) value = preferences.dig(*key.split(":"))
[true, "true", 1, "enabled"].include?(value) [true, "true", "enabled", 1].include?(value)
end end
def exchange_xmpp_contact_with_inviter def exchange_xmpp_contact_with_inviter
return unless inviter.services_enabled.include?("ejabberd") && return unless inviter.services_enabled.include?("xmpp") &&
services_enabled.include?("ejabberd") services_enabled.include?("xmpp")
XmppExchangeContactsJob.perform_later(inviter, self.cn, self.ou) XmppExchangeContactsJob.perform_later(inviter, self.cn, self.ou)
end end

View File

@ -135,7 +135,7 @@
<td>XMPP (ejabberd)</td> <td>XMPP (ejabberd)</td>
<td> <td>
<%= render FormElements::ToggleComponent.new( <%= render FormElements::ToggleComponent.new(
enabled: @services_enabled.include?("ejabberd"), enabled: @services_enabled.include?("xmpp"),
input_enabled: false input_enabled: false
) %> ) %>
</td> </td>

View File

@ -109,7 +109,7 @@ RSpec.describe User, type: :model do
before do before do
Invitation.create! user: user, invited_user_id: guest.id, used_at: DateTime.now Invitation.create! user: user, invited_user_id: guest.id, used_at: DateTime.now
allow_any_instance_of(User).to receive(:services_enabled).and_return(%w[ ejabberd ]) allow_any_instance_of(User).to receive(:services_enabled).and_return(%w[ xmpp ])
end end
it "enqueues a job to exchange XMPP contacts between inviter and invitee" do it "enqueues a job to exchange XMPP contacts between inviter and invitee" do
@ -131,11 +131,11 @@ RSpec.describe User, type: :model do
let(:user) { create :user, cn: "willherschel", ou: "kosmos.org" } let(:user) { create :user, cn: "willherschel", ou: "kosmos.org" }
it "enables default services" do it "enables default services" do
expect(user).to receive(:enable_service).with(%w[ discourse ejabberd gitea mediawiki ]) expect(user).to receive(:enable_service).with(%w[ discourse gitea mediawiki xmpp ])
user.send(:devise_after_confirmation) user.send(:devise_after_confirmation)
end end
context "for invited user with ejabberd enabled" do context "for invited user with xmpp enabled" do
let(:guest) { create :user, id: 2, cn: "isaacnewton", ou: "kosmos.org", email: "newt@example.com" } let(:guest) { create :user, id: 2, cn: "isaacnewton", ou: "kosmos.org", email: "newt@example.com" }
before do before do