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

make electron send email validation URLs with a nextlink of riot.im rather than file:///

pull/2543/merge
Matthew Hodgson 2016-12-24 03:18:12 +00:00
parent cbf105f2a0
commit 078493912c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/vector/index.js
View File

@ -136,11 +136,20 @@ var onNewScreen = function(screen) {
// click back to the client having registered. // click back to the client having registered.
// It's up to us to recognise if we're loaded with // It's up to us to recognise if we're loaded with
// this URL and tell MatrixClient to resume registration. // this URL and tell MatrixClient to resume registration.
//
// 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.
// so in that instance, hardcode to use riot.im/app for now instead.
var makeRegistrationUrl = function() { var makeRegistrationUrl = function() {
if (window.location.protocol === "file:") {
return 'https://riot.im/app/#/register';
}
else {
return window.location.protocol + '//' + return window.location.protocol + '//' +
window.location.host + window.location.host +
window.location.pathname + window.location.pathname +
'#/register'; '#/register';
}
} }
window.addEventListener('hashchange', onHashChange); window.addEventListener('hashchange', onHashChange);