PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2019-01-31 12:00:56 +00:00
commit 15188149ab
2 changed files with 80 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/Registration.js
View file

@ -22,9 +22,9 @@ limitations under the License.
import dis from './dispatcher'; import dis from './dispatcher';
import sdk from './index'; import sdk from './index';
import MatrixClientPeg from './MatrixClientPeg';
import Modal from './Modal'; import Modal from './Modal';
import { _t } from './languageHandler'; import { _t } from './languageHandler';
// import MatrixClientPeg from './MatrixClientPeg';
// Regex for what a "safe" or "Matrix-looking" localpart would be. // Regex for what a "safe" or "Matrix-looking" localpart would be.
// TODO: Update as needed for https://github.com/matrix-org/matrix-doc/issues/1514 // TODO: Update as needed for https://github.com/matrix-org/matrix-doc/issues/1514
@ -40,25 +40,29 @@ export const SAFE_LOCALPART_REGEX = /^[a-z0-9=_\-./]+$/;
*/ */
export async function startAnyRegistrationFlow(options) { export async function startAnyRegistrationFlow(options) {
if (options === undefined) options = {}; if (options === undefined) options = {};
const flows = await _getRegistrationFlows();
// look for an ILAG compatible flow. We define this as one // look for an ILAG compatible flow. We define this as one
// which has only dummy or recaptcha flows. In practice it // which has only dummy or recaptcha flows. In practice it
// would support any stage InteractiveAuth supports, just not // would support any stage InteractiveAuth supports, just not
// ones like email & msisdn which require the user to supply // ones like email & msisdn which require the user to supply
// the relevant details in advance. We err on the side of // the relevant details in advance. We err on the side of
// caution though. // caution though.
const hasIlagFlow = flows.some((flow) => {
return flow.stages.every((stage) => {
return ['m.login.dummy', 'm.login.recaptcha', 'm.login.terms'].includes(stage);
});
});
if (hasIlagFlow) { // XXX: ILAG is disabled for now,
dis.dispatch({ // see https://github.com/vector-im/riot-web/issues/8222
action: 'view_set_mxid',
go_home_on_cancel: options.go_home_on_cancel, // const flows = await _getRegistrationFlows();
}); // const hasIlagFlow = flows.some((flow) => {
} else { // return flow.stages.every((stage) => {
// return ['m.login.dummy', 'm.login.recaptcha', 'm.login.terms'].includes(stage);
// });
// });
// if (hasIlagFlow) {
// dis.dispatch({
// action: 'view_set_mxid',
// go_home_on_cancel: options.go_home_on_cancel,
// });
//} else {
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
Modal.createTrackedDialog('Registration required', '', QuestionDialog, { Modal.createTrackedDialog('Registration required', '', QuestionDialog, {
title: _t("Registration Required"), title: _t("Registration Required"),
@ -72,25 +76,25 @@ export async function startAnyRegistrationFlow(options) {
} }
}, },
}); });
} //}
} }
async function _getRegistrationFlows() { // async function _getRegistrationFlows() {
try { // try {
await MatrixClientPeg.get().register( // await MatrixClientPeg.get().register(
null, // null,
null, // null,
undefined, // undefined,
{}, // {},
{}, // {},
); // );
console.log("Register request succeeded when it should have returned 401!"); // console.log("Register request succeeded when it should have returned 401!");
} catch (e) { // } catch (e) {
if (e.httpStatus === 401) { // if (e.httpStatus === 401) {
return e.data.flows; // return e.data.flows;
} // }
throw e; // throw e;
} // }
throw new Error("Register request succeeded when it should have returned 401!"); // throw new Error("Register request succeeded when it should have returned 401!");
} // }

83
src/components/structures/RoomView.js
View file

@ -892,53 +892,58 @@ module.exports = React.createClass({
dis.dispatch({ dis.dispatch({
action: 'do_after_sync_prepared', action: 'do_after_sync_prepared',
deferred_action: { deferred_action: {
action: 'join_room', action: 'view_room',
opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers }, room_id: this.state.room.roomId,
}, },
}); });
// Don't peek whilst registering otherwise getPendingEventList complains // Don't peek whilst registering otherwise getPendingEventList complains
// Do this by indicating our intention to join // Do this by indicating our intention to join
dis.dispatch({
action: 'will_join',
});
const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog'); // XXX: ILAG is disabled for now,
const close = Modal.createTrackedDialog('Set MXID', '', SetMxIdDialog, { // see https://github.com/vector-im/riot-web/issues/8222
homeserverUrl: cli.getHomeserverUrl(), dis.dispatch({action: 'require_registration'});
onFinished: (submitted, credentials) => { // dis.dispatch({
if (submitted) { // action: 'will_join',
this.props.onRegistered(credentials); // });
} else {
dis.dispatch({ // const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog');
action: 'cancel_after_sync_prepared', // const close = Modal.createTrackedDialog('Set MXID', '', SetMxIdDialog, {
}); // homeserverUrl: cli.getHomeserverUrl(),
dis.dispatch({ // onFinished: (submitted, credentials) => {
action: 'cancel_join', // if (submitted) {
}); // this.props.onRegistered(credentials);
} // } else {
}, // dis.dispatch({
onDifferentServerClicked: (ev) => { // action: 'cancel_after_sync_prepared',
dis.dispatch({action: 'start_registration'}); // });
close(); // dis.dispatch({
}, // action: 'cancel_join',
onLoginClick: (ev) => { // });
dis.dispatch({action: 'start_login'}); // }
close(); // },
}, // onDifferentServerClicked: (ev) => {
}).close; // dis.dispatch({action: 'start_registration'});
return; // close();
// },
// onLoginClick: (ev) => {
// dis.dispatch({action: 'start_login'});
// close();
// },
// }).close;
// return;
} else {
Promise.resolve().then(() => {
const signUrl = this.props.thirdPartyInvite ?
this.props.thirdPartyInvite.inviteSignUrl : undefined;
dis.dispatch({
action: 'join_room',
opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
});
return Promise.resolve();
});
} }
Promise.resolve().then(() => {
const signUrl = this.props.thirdPartyInvite ?
this.props.thirdPartyInvite.inviteSignUrl : undefined;
dis.dispatch({
action: 'join_room',
opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
});
return Promise.resolve();
});
}, },
onMessageListScroll: function(ev) { onMessageListScroll: function(ev) {