Rename "xmpp" user service back to "ejabberd"
If we ever add support for others, we can combine them as "xmpp" in helper methods
This commit is contained in:
parent
15e2f9b962
commit
0e3180602c
@ -3,7 +3,7 @@ class Services::ChatController < Services::BaseController
|
|||||||
before_action :require_service_available
|
before_action :require_service_available
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@service_enabled = current_user.service_enabled?(:xmpp)
|
@service_enabled = current_user.service_enabled?(:ejabberd)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
@ -2,8 +2,8 @@ class XmppExchangeContactsJob < ApplicationJob
|
|||||||
queue_as :default
|
queue_as :default
|
||||||
|
|
||||||
def perform(inviter, invitee)
|
def perform(inviter, invitee)
|
||||||
return unless inviter.service_enabled?(:xmpp) &&
|
return unless inviter.service_enabled?(:ejabberd) &&
|
||||||
invitee.service_enabled?(:xmpp) &&
|
invitee.service_enabled?(:ejabberd) &&
|
||||||
inviter.preferences[:xmpp_exchange_contacts_with_invitees]
|
inviter.preferences[:xmpp_exchange_contacts_with_invitees]
|
||||||
|
|
||||||
ejabberd = EjabberdApiClient.new
|
ejabberd = EjabberdApiClient.new
|
||||||
|
@ -44,7 +44,7 @@ RSpec.describe CreateLdapUserJob, type: :job do
|
|||||||
|
|
||||||
it "adds default services for pre-confirmed accounts" do
|
it "adds default services for pre-confirmed accounts" do
|
||||||
allow(ldap_client_mock).to receive(:add) # spy on mock
|
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 }
|
perform_enqueued_jobs { job_for_preconfirmed_account }
|
||||||
|
|
||||||
@ -56,7 +56,7 @@ RSpec.describe CreateLdapUserJob, type: :job do
|
|||||||
sn: "halfinney",
|
sn: "halfinney",
|
||||||
uid: "halfinney",
|
uid: "halfinney",
|
||||||
mail: "halfinney@example.com",
|
mail: "halfinney@example.com",
|
||||||
serviceEnabled: ["xmpp", "discourse"],
|
serviceEnabled: ["ejabberd", "discourse"],
|
||||||
userPassword: "remember-remember-the-5th-of-november"
|
userPassword: "remember-remember-the-5th-of-november"
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
@ -13,7 +13,7 @@ RSpec.describe XmppExchangeContactsJob, type: :job do
|
|||||||
before do
|
before do
|
||||||
stub_request(:post, "http://xmpp.example.com/api/add_rosteritem")
|
stub_request(:post, "http://xmpp.example.com/api/add_rosteritem")
|
||||||
.to_return(status: 200, body: "", headers: {})
|
.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
|
end
|
||||||
|
|
||||||
it "posts add_rosteritem commands to the ejabberd API" do
|
it "posts add_rosteritem commands to the ejabberd API" do
|
||||||
|
@ -78,9 +78,9 @@ RSpec.describe User, type: :model do
|
|||||||
it "returns the entries from the LDAP service attribute" do
|
it "returns the entries from the LDAP service attribute" do
|
||||||
expect(user).to receive(:ldap_entry).and_return({
|
expect(user).to receive(:ldap_entry).and_return({
|
||||||
uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -88,7 +88,7 @@ RSpec.describe User, type: :model do
|
|||||||
before do
|
before do
|
||||||
allow(user).to receive(:ldap_entry).and_return({
|
allow(user).to receive(:ldap_entry).and_return({
|
||||||
uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
|
uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
|
||||||
services_enabled: ["gitea", "xmpp"]
|
services_enabled: ["ejabberd", "gitea"]
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -121,9 +121,9 @@ RSpec.describe User, type: :model do
|
|||||||
|
|
||||||
it "adds multiple service to the LDAP entry" do
|
it "adds multiple service to the LDAP entry" do
|
||||||
expect_any_instance_of(LdapService).to receive(:replace_attribute)
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -131,7 +131,7 @@ RSpec.describe User, type: :model do
|
|||||||
before do
|
before do
|
||||||
allow(user).to receive(:ldap_entry).and_return({
|
allow(user).to receive(:ldap_entry).and_return({
|
||||||
uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
|
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)
|
allow(user).to receive(:dn).and_return(dn)
|
||||||
end
|
end
|
||||||
@ -140,14 +140,14 @@ RSpec.describe User, type: :model do
|
|||||||
expect_any_instance_of(LdapService).to receive(:replace_attribute)
|
expect_any_instance_of(LdapService).to receive(:replace_attribute)
|
||||||
.with(dn, :serviceEnabled, ["discourse", "gitea"]).and_return(true)
|
.with(dn, :serviceEnabled, ["discourse", "gitea"]).and_return(true)
|
||||||
|
|
||||||
user.disable_service(:xmpp)
|
user.disable_service(:ejabberd)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "removes multiple services from the LDAP entry" do
|
it "removes multiple services from the LDAP entry" do
|
||||||
expect_any_instance_of(LdapService).to receive(:replace_attribute)
|
expect_any_instance_of(LdapService).to receive(:replace_attribute)
|
||||||
.with(dn, :serviceEnabled, ["discourse"]).and_return(true)
|
.with(dn, :serviceEnabled, ["discourse"]).and_return(true)
|
||||||
|
|
||||||
user.disable_service([:xmpp, "gitea"])
|
user.disable_service([:ejabberd, "gitea"])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ RSpec.describe "WebFinger", type: :request do
|
|||||||
before do
|
before do
|
||||||
allow_any_instance_of(User).to receive(:ldap_entry).and_return({
|
allow_any_instance_of(User).to receive(:ldap_entry).and_return({
|
||||||
uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
|
uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
|
||||||
services_enabled: ["xmpp"]
|
services_enabled: ["ejabberd"]
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -100,7 +100,7 @@ RSpec.describe "WebFinger", type: :request do
|
|||||||
before do
|
before do
|
||||||
allow_any_instance_of(User).to receive(:ldap_entry).and_return({
|
allow_any_instance_of(User).to receive(:ldap_entry).and_return({
|
||||||
uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
|
uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
|
||||||
services_enabled: ["xmpp"]
|
services_enabled: ["ejabberd"]
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user