From 1b0d8510a2ee93beddcd34c2d5770aa9fc76b1d9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 23 Jul 2019 10:09:16 +0100 Subject: [PATCH] Add note from commit message as a comment --- src/ScalarAuthClient.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js index 54445260d1..1168be4c8e 100644 --- a/src/ScalarAuthClient.js +++ b/src/ScalarAuthClient.js @@ -108,6 +108,17 @@ class ScalarAuthClient { // The terms endpoints are new and so live on standard _matrix prefixes, // but IM rest urls are currently configured with paths, so remove the // path from the base URL before passing it to the js-sdk + + // We continue to use the full URL for the calls done by + // matrix-react-sdk, but the standard terms API called + // by the js-sdk lives on the standard _matrix path. This means we + // don't support running IMs on a non-root path, but it's the only + // realistic way of transitioning to _matrix paths since configs in + // the wild contain bits of the API path. + + // Once we've fully transitioned to _matrix URLs, we can give people + // a grace period to update their configs, then use the rest url as + // a regular base url. const parsedImRestUrl = url.parse(SdkConfig.get().integrations_rest_url); parsedImRestUrl.path = ''; parsedImRestUrl.pathname = '';