sij/env.esq
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #175

Browse source
This commit is contained in:
Bruno Windels 2020-12-16 10:58:16 +01:00
parent 66c51828b0
commit 46b6495e71
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/preview/HomeServer.js
View file

@ -14,7 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
function noTrailingSlash(url) {
return url.endsWith("/") ? url.substr(0, url.length - 1) : url;
}
export async function resolveServer(request, baseURL) { export async function resolveServer(request, baseURL) {
baseURL = noTrailingSlash(baseURL);
if (!baseURL.startsWith("http://") && !baseURL.startsWith("https://")) { if (!baseURL.startsWith("http://") && !baseURL.startsWith("https://")) {
baseURL = `https://${baseURL}`; baseURL = `https://${baseURL}`;
} }
@ -23,7 +28,7 @@ export async function resolveServer(request, baseURL) {
if (status === 200) { if (status === 200) {
const proposedBaseURL = body?.['m.homeserver']?.base_url; const proposedBaseURL = body?.['m.homeserver']?.base_url;
if (typeof proposedBaseURL === "string") { if (typeof proposedBaseURL === "string") {
baseURL = proposedBaseURL; baseURL = noTrailingSlash(proposedBaseURL);
} }
} }
} }