OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
pull/10656/head
Jason Robinson 2019-08-26 10:01:37 +03:00
parent c635fe7f36
commit 334001c829
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electron_app/riot.im/config.json
View File

@ -6,9 +6,11 @@
"integrations_ui_url": "https://scalar.vector.im/", "integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api", "integrations_rest_url": "https://scalar.vector.im/api",
"integrations_widgets_urls": [ "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.vector.im/api",
"https://scalar-staging.riot.im/scalar/api", "https://scalar-staging.riot.im/scalar/api"
"https://scalar.vector.im/api"
], ],
"hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit", "bug_report_endpoint_url": "https://riot.im/bugreports/submit",

4
riot.im/app/config.json
View File

@ -5,8 +5,10 @@
"integrations_ui_url": "https://scalar.vector.im/", "integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api", "integrations_rest_url": "https://scalar.vector.im/api",
"integrations_widgets_urls": [ "integrations_widgets_urls": [
"https://scalar-staging.vector.im/api", "https://scalar.vector.im/_matrix/integrations/v1",
"https://scalar.vector.im/api", "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-staging.riot.im/scalar/api"
], ],
"hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",

6
riot.im/develop/config.json
View File

@ -5,9 +5,11 @@
"integrations_ui_url": "https://scalar-staging.vector.im/", "integrations_ui_url": "https://scalar-staging.vector.im/",
"integrations_rest_url": "https://scalar-staging.vector.im/api", "integrations_rest_url": "https://scalar-staging.vector.im/api",
"integrations_widgets_urls": [ "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-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", "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit", "bug_report_endpoint_url": "https://riot.im/bugreports/submit",