Possibility to configure an OpenID Connect provider on the instance
level WIP (#128) Fix chat federation.
This commit is contained in:
@ -190,6 +190,7 @@ async function _serverBuildInfos (
|
||||
const prosodyDomain = await getProsodyDomain(options)
|
||||
const mucDomain = 'room.' + prosodyDomain
|
||||
const anonDomain = 'anon.' + prosodyDomain
|
||||
const externalDomain = 'external.' + prosodyDomain
|
||||
|
||||
let directs2s
|
||||
if (settings['prosody-room-allow-s2s'] && settings['prosody-s2s-port']) {
|
||||
@ -232,6 +233,7 @@ async function _serverBuildInfos (
|
||||
return {
|
||||
host: prosodyDomain,
|
||||
muc: mucDomain,
|
||||
external: externalDomain, // we will always add it, even if disabled. Can't cause trouble.
|
||||
directs2s,
|
||||
websockets2s,
|
||||
anonymous
|
||||
|
@ -88,6 +88,12 @@ function sanitizePeertubeLiveChatServerInfos (
|
||||
muc
|
||||
}
|
||||
|
||||
// This comes with livechat >= 9.0.0, can be absent.
|
||||
const external = _validateHost(xmppserver.external, checkHost)
|
||||
if (external) {
|
||||
r.external = external
|
||||
}
|
||||
|
||||
if (xmppserver.directs2s) {
|
||||
if ((typeof xmppserver.directs2s) === 'object') {
|
||||
const port = xmppserver.directs2s.port
|
||||
|
@ -122,7 +122,8 @@ async function storeRemoteServerInfos (
|
||||
const mainHost = xmppserver.host
|
||||
const hosts = [
|
||||
xmppserver.host,
|
||||
xmppserver.muc
|
||||
xmppserver.muc,
|
||||
xmppserver.external
|
||||
]
|
||||
|
||||
for (const host of hosts) {
|
||||
|
@ -7,6 +7,7 @@ interface VideoBuildResultContext {
|
||||
interface PeertubeXMPPServerInfos {
|
||||
host: string // main host (should be the peertube url)
|
||||
muc: string // muc component url
|
||||
external?: string // external users virtualhost (livechat version >=9.0.0)
|
||||
directs2s?: { // if direct S2S is enabled
|
||||
port: string
|
||||
}
|
||||
|
Reference in New Issue
Block a user