matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken API diagnostic.

Browse Source 
* Moving http_peertubelivechat_test module in muc component, as the
global config has no http_host.
* Adding Host HTTP Header to API call from Peertube to Prosody
This commit is contained in:
John Livingston
2021-07-20 02:52:58 +02:00
parent 2d659b6522
commit 40ad9629fc
6 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/lib/diagnostic/prosody.ts
View File

@ -21,12 +21,14 @@ export async function diagProsody (test: string, options: RegisterServerOptions)
// FIXME: these tests are very similar to tests in testProsodyCorrectlyRunning. Remove from here?
// Testing the prosody config file.
let prosodyPort: string
let prosodyHost: string
try {
const wantedConfig = await getProsodyConfig(options)
const filePath = wantedConfig.paths.config
result.messages.push(`Prosody will run on port '${wantedConfig.port}'`)
prosodyPort = wantedConfig.port
prosodyHost = wantedConfig.host
result.messages.push(`Prosody will use ${wantedConfig.baseApiUrl} as base uri from api calls`)
@ -99,7 +101,8 @@ export async function diagProsody (test: string, options: RegisterServerOptions)
const testResult = await got(apiUrl, {
method: 'GET',
headers: {
authorization: 'Bearer ' + await getAPIKey(options)
authorization: 'Bearer ' + await getAPIKey(options),
host: prosodyHost
},
responseType: 'json',
resolveBodyOnly: true
@ -120,7 +123,8 @@ export async function diagProsody (test: string, options: RegisterServerOptions)
const testResult = await got(apiUrl, {
method: 'GET',
headers: {
authorization: 'Bearer ' + await getAPIKey(options)
authorization: 'Bearer ' + await getAPIKey(options),
host: prosodyHost
},
responseType: 'json',
resolveBodyOnly: true