From 334001c829123123737e0590c3cb641652c614a6 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 26 Aug 2019 10:01:37 +0300 Subject: [PATCH 1/2] Add and prioritize the new "_matrix/integrations/v1" widget urls As per MSC1961, add to the whitelisted integrations_widget_urls the new paths. This allows us to switch Scalar over to use the new path as default. Note, the legacy "scalar-staging.riot.im" is these days just a redirect to scalar-staging.vector.im, so there is no addition for that. It still needs Riot side whitelisting though for existing widgets. --- electron_app/riot.im/config.json | 6 ++++-- riot.im/app/config.json | 4 +++- riot.im/develop/config.json | 6 ++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index a995a4e9e3..a2df3da047 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -6,9 +6,11 @@ "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", "integrations_widgets_urls": [ + "https://scalar.vector.im/_matrix/integrations/v1", + "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", "https://scalar-staging.vector.im/api", - "https://scalar-staging.riot.im/scalar/api", - "https://scalar.vector.im/api" + "https://scalar-staging.riot.im/scalar/api" ], "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", diff --git a/riot.im/app/config.json b/riot.im/app/config.json index fc67720530..164b81c1ae 100644 --- a/riot.im/app/config.json +++ b/riot.im/app/config.json @@ -5,8 +5,10 @@ "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", "integrations_widgets_urls": [ - "https://scalar-staging.vector.im/api", + "https://scalar.vector.im/_matrix/integrations/v1", "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", + "https://scalar-staging.vector.im/api", "https://scalar-staging.riot.im/scalar/api" ], "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 69f42dd62e..5a6d6829cc 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -5,9 +5,11 @@ "integrations_ui_url": "https://scalar-staging.vector.im/", "integrations_rest_url": "https://scalar-staging.vector.im/api", "integrations_widgets_urls": [ - "https://scalar-staging.riot.im/scalar/api", + "https://scalar.vector.im/_matrix/integrations/v1", + "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", "https://scalar-staging.vector.im/api", - "https://scalar.vector.im/api" + "https://scalar-staging.riot.im/scalar/api" ], "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", From 2b5fcbdcbdec6f30f8970bd8f1271e5bfc5fb9da Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 26 Aug 2019 10:03:50 +0300 Subject: [PATCH 2/2] Provide our common integrations_widget_urls defaults for sample config Closes #10454 --- config.sample.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config.sample.json b/config.sample.json index 1a26289f88..6d9ebe034d 100644 --- a/config.sample.json +++ b/config.sample.json @@ -15,6 +15,13 @@ "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", + "integrations_widgets_urls": [ + "https://scalar.vector.im/_matrix/integrations/v1", + "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", + "https://scalar-staging.vector.im/api", + "https://scalar-staging.riot.im/scalar/api" + ], "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "defaultCountryCode": "GB",