mirror of https://github.com/vector-im/riot-web
parent
8016fb82d7
commit
f796bc79c3
|
@ -89,6 +89,7 @@ export default React.createClass({
|
||||||
*/
|
*/
|
||||||
isScalarUrl(url) {
|
isScalarUrl(url) {
|
||||||
if (!url) {
|
if (!url) {
|
||||||
|
console.error('Scalar URL check failed. No URL specified');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,6 +129,7 @@ export default React.createClass({
|
||||||
*/
|
*/
|
||||||
setScalarToken() {
|
setScalarToken() {
|
||||||
if (!this.isScalarUrl(this.props.url)) {
|
if (!this.isScalarUrl(this.props.url)) {
|
||||||
|
console.warn('Non-scalar widget, not setting scalar token!', url);
|
||||||
this.setState({
|
this.setState({
|
||||||
error: null,
|
error: null,
|
||||||
widgetUrl: this.props.url,
|
widgetUrl: this.props.url,
|
||||||
|
@ -147,7 +149,9 @@ export default React.createClass({
|
||||||
const params = qs.parse(u.query);
|
const params = qs.parse(u.query);
|
||||||
if (!params.scalar_token) {
|
if (!params.scalar_token) {
|
||||||
params.scalar_token = encodeURIComponent(token);
|
params.scalar_token = encodeURIComponent(token);
|
||||||
u.query = qs.stringify(params);
|
// u.search must be set to undefined, so that u.format() uses query paramerters - https://nodejs.org/docs/latest/api/url.html#url_url_format_url_options
|
||||||
|
u.search = undefined;
|
||||||
|
u.query = params;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
|
@ -156,6 +160,7 @@ export default React.createClass({
|
||||||
initialising: false,
|
initialising: false,
|
||||||
});
|
});
|
||||||
}, (err) => {
|
}, (err) => {
|
||||||
|
console.error("Failed to get scalar_token", err);
|
||||||
this.setState({
|
this.setState({
|
||||||
error: err.message,
|
error: err.message,
|
||||||
initialising: false,
|
initialising: false,
|
||||||
|
|
Loading…
Reference in New Issue