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. Refs: matrix-org/matrix-spec-proposals#1961 Signed-off-by: Jason Robinson <[email protected]>
element-hq · Aug 26, 2019 · 2235a87 · 2235a87
1 parent f23e9d8
commit 2235a87
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,7 +13,7 @@ Improvements:
  -
 
 Other changes:
- -
+ - Widgets: Whitelist [MSC1961](https://github.com/matrix-org/matrix-doc/pull/1961) widget urls
 
 Bugfix:
  - Widgets: Whitelist https://scalar-staging.vector.im/api (#3234)

diff --git a/vector/src/main/res/values/config.xml b/vector/src/main/res/values/config.xml
@@ -19,9 +19,11 @@
     <string name="integrations_jitsi_widget_url" translatable="false">"https://scalar.vector.im/api/widgets/jitsi.html"</string>
 
     <string-array name="integrations_widgets_urls" translatable="false">
-        <item>https://scalar-staging.riot.im/scalar/api</item>
-        <item>https://scalar-staging.vector.im/api</item>
+        <item>https://scalar.vector.im/_matrix/integrations/v1</item>
         <item>https://scalar.vector.im/api</item>
+        <item>https://scalar-staging.vector.im/_matrix/integrations/v1</item>
+        <item>https://scalar-staging.vector.im/api</item>
+        <item>https://scalar-staging.riot.im/scalar/api</item>
     </string-array>
 
     <!-- empty means to use the active HS url -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ Improvements: @@
      -
     Other changes:
-     -
+     - Widgets: Whitelist [MSC1961](https://github.com/matrix-org/matrix-doc/pull/1961) widget urls
     Bugfix:
      - Widgets: Whitelist https://scalar-staging.vector.im/api (#3234)
@@ Expand Down @@