Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

URI-decode the hash-fragment

Browse Source 
It looks like % characters in the hash-fragment are meant to be interpreted as
a URI-encoding, so we should decode them.
This commit is contained in:
Richard van der Hoff 2016-03-23 15:58:00 +00:00
parent 4507117f89
commit 090db5490b
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/vector/index.js
View File

@ -74,12 +74,27 @@ var validBrowser = checkBrowserFeatures([
// We want to support some name / value pairs in the fragment // We want to support some name / value pairs in the fragment
// so we're re-using query string like format // so we're re-using query string like format
//
// returns {location, params}
function parseQsFromFragment(location) { function parseQsFromFragment(location) {
var hashparts = location.hash.split('?'); // if we have a fragment, it will start with '#', which we need to drop.
// (if we don't, this will return '').
var fragment = location.hash.substring(1);
// our fragment may contain a query-param-like section. we need to fish
// this out *before* URI-decoding because the params may contain ? and &
// characters which are only URI-encoded once.
var hashparts = fragment.split('?');
var result = {
location: decodeURIComponent(hashparts[0]),
params: {}
};
if (hashparts.length > 1) { if (hashparts.length > 1) {
return qs.parse(hashparts[1]); result.params = qs.parse(hashparts[1]);
} }
return {}; return result;
} }
function parseQs(location) { function parseQs(location) {
@ -92,14 +107,13 @@ function routeUrl(location) {
var params = parseQs(location); var params = parseQs(location);
var loginToken = params.loginToken; var loginToken = params.loginToken;
if (loginToken) { if (loginToken) {
window.matrixChat.showScreen('token_login', parseQs(location)); window.matrixChat.showScreen('token_login', params);
} return;
else if (location.hash.indexOf('#/register') == 0) {
window.matrixChat.showScreen('register', parseQsFromFragment(location));
} else {
var hashparts = location.hash.split('?');
window.matrixChat.showScreen(hashparts[0].substring(2), parseQsFromFragment(location));
} }
var fragparts = parseQsFromFragment(location);
window.matrixChat.showScreen(fragparts.location.substring(1),
fragparts.params);
} }
function onHashChange(ev) { function onHashChange(ev) {
@ -160,13 +174,14 @@ window.onload = function() {
function loadApp() { function loadApp() {
if (validBrowser) { if (validBrowser) {
var MatrixChat = sdk.getComponent('structures.MatrixChat'); var MatrixChat = sdk.getComponent('structures.MatrixChat');
var fragParts = parseQsFromFragment(window.location);
window.matrixChat = ReactDOM.render( window.matrixChat = ReactDOM.render(
<MatrixChat <MatrixChat
onNewScreen={onNewScreen} onNewScreen={onNewScreen}
registrationUrl={makeRegistrationUrl()} registrationUrl={makeRegistrationUrl()}
ConferenceHandler={VectorConferenceHandler} ConferenceHandler={VectorConferenceHandler}
config={configJson} config={configJson}
startingQueryParams={parseQsFromFragment(window.location)} startingQueryParams={fragParts.params}
enableGuest={true} />, enableGuest={true} />,
document.getElementById('matrixchat') document.getElementById('matrixchat')
); );