gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3333 from vector-im/dbkr/register_ui_auth 

Support InteractiveAuth based registration
This commit is contained in:
David Baker 2017-03-03 13:37:46 +00:00 committed by GitHub
parent c6da4d93f1 a8e99109b1
commit ae27667f48
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/vector/index.js
View File

@ -1,5 +1,6 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd Copyright 2015, 2016 OpenMarket Ltd
Copyright 2017 Vector Creations Ltd
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -147,16 +148,30 @@ var onNewScreen = function(screen) {
// If we're in electron, we should never pass through a file:// URL otherwise // If we're in electron, we should never pass through a file:// URL otherwise
// the identity server will try to 302 the browser to it, which breaks horribly. // the identity server will try to 302 the browser to it, which breaks horribly.
// so in that instance, hardcode to use riot.im/app for now instead. // so in that instance, hardcode to use riot.im/app for now instead.
var makeRegistrationUrl = function() { var makeRegistrationUrl = function(params) {
let url;
if (window.location.protocol === "file:") { if (window.location.protocol === "file:") {
return 'https://riot.im/app/#/register'; url = 'https://riot.im/app/#/register';
} } else {
else { url = (
return window.location.protocol + '//' + window.location.protocol + '//' +
window.location.host + window.location.host +
window.location.pathname + window.location.pathname +
'#/register'; '#/register'
);
} }
const keys = Object.keys(params);
for (let i = 0; i < keys.length; ++i) {
if (i == 0) {
url += '?';
} else {
url += '&';
}
const k = keys[i];
url += k + '=' + encodeURIComponent(params[k]);
}
return url;
} }
window.addEventListener('hashchange', onHashChange); window.addEventListener('hashchange', onHashChange);
@ -258,7 +273,7 @@ async function loadApp() {
window.matrixChat = ReactDOM.render( window.matrixChat = ReactDOM.render(
<MatrixChat <MatrixChat
onNewScreen={onNewScreen} onNewScreen={onNewScreen}
registrationUrl={makeRegistrationUrl()} makeRegistrationUrl={makeRegistrationUrl}
ConferenceHandler={VectorConferenceHandler} ConferenceHandler={VectorConferenceHandler}
config={configJson} config={configJson}
realQueryParams={params} realQueryParams={params}