diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 0b52cfa1bc..aeffff9717 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -2,6 +2,7 @@
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2017 Vector Creations Ltd
Copyright 2017-2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -50,8 +51,10 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
import { startAnyRegistrationFlow } from "../../Registration.js";
import { messageForSyncError } from '../../utils/ErrorUtils';
import ResizeNotifier from "../../utils/ResizeNotifier";
-
-const AutoDiscovery = Matrix.AutoDiscovery;
+import { ValidatedServerConfig } from "../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils from "../../utils/AutoDiscoveryUtils";
+import DMRoomMap from '../../utils/DMRoomMap';
+import { countRoomsWithNotif } from '../../RoomNotifs';
// Disable warnings for now: we use deprecated bluebird functions
// and need to migrate, but they spam the console with warnings.
@@ -87,6 +90,10 @@ const VIEWS = {
// we are logged in with an active matrix client.
LOGGED_IN: 7,
+
+ // We are logged out (invalid token) but have our local state again. The user
+ // should log back in to rehydrate the client.
+ SOFT_LOGOUT: 8,
};
// Actions that are redirected through the onboarding process prior to being
@@ -109,6 +116,7 @@ export default React.createClass({
propTypes: {
config: PropTypes.object,
+ serverConfig: PropTypes.instanceOf(ValidatedServerConfig),
ConferenceHandler: PropTypes.any,
onNewScreen: PropTypes.func,
registrationUrl: PropTypes.string,
@@ -181,16 +189,8 @@ export default React.createClass({
// Parameters used in the registration dance with the IS
register_client_secret: null,
register_session_id: null,
- register_hs_url: null,
- register_is_url: null,
register_id_sid: null,
- // Parameters used for setting up the authentication views
- defaultServerName: this.props.config.default_server_name,
- defaultHsUrl: this.props.config.default_hs_url,
- defaultIsUrl: this.props.config.default_is_url,
- defaultServerDiscoveryError: null,
-
// When showing Modal dialogs we need to set aria-hidden on the root app element
// and disable it when there are no dialogs
hideToSRUsers: false,
@@ -211,42 +211,19 @@ export default React.createClass({
};
},
- getDefaultServerName: function() {
- return this.state.defaultServerName;
- },
-
- getCurrentHsUrl: function() {
- if (this.state.register_hs_url) {
- return this.state.register_hs_url;
- } else if (MatrixClientPeg.get()) {
- return MatrixClientPeg.get().getHomeserverUrl();
- } else {
- return this.getDefaultHsUrl();
- }
- },
-
- getDefaultHsUrl(defaultToMatrixDotOrg) {
- defaultToMatrixDotOrg = typeof(defaultToMatrixDotOrg) !== 'boolean' ? true : defaultToMatrixDotOrg;
- if (!this.state.defaultHsUrl && defaultToMatrixDotOrg) return "https://matrix.org";
- return this.state.defaultHsUrl;
- },
-
getFallbackHsUrl: function() {
- return this.props.config.fallback_hs_url;
- },
-
- getCurrentIsUrl: function() {
- if (this.state.register_is_url) {
- return this.state.register_is_url;
- } else if (MatrixClientPeg.get()) {
- return MatrixClientPeg.get().getIdentityServerUrl();
+ if (this.props.serverConfig && this.props.serverConfig.isDefault) {
+ return this.props.config.fallback_hs_url;
} else {
- return this.getDefaultIsUrl();
+ return null;
}
},
- getDefaultIsUrl() {
- return this.state.defaultIsUrl || "https://vector.im";
+ getServerProperties() {
+ let props = this.state.serverConfig;
+ if (!props) props = this.props.serverConfig; // for unit tests
+ if (!props) props = SdkConfig.get()["validated_server_config"];
+ return {serverConfig: props};
},
componentWillMount: function() {
@@ -260,40 +237,6 @@ export default React.createClass({
MatrixClientPeg.opts.initialSyncLimit = this.props.config.sync_timeline_limit;
}
- // Set up the default URLs (async)
- if (this.getDefaultServerName() && !this.getDefaultHsUrl(false)) {
- this.setState({loadingDefaultHomeserver: true});
- this._tryDiscoverDefaultHomeserver(this.getDefaultServerName());
- } else if (this.getDefaultServerName() && this.getDefaultHsUrl(false)) {
- // Ideally we would somehow only communicate this to the server admins, but
- // given this is at login time we can't really do much besides hope that people
- // will check their settings.
- this.setState({
- defaultServerName: null, // To un-hide any secrets people might be keeping
- defaultServerDiscoveryError: _t(
- "Invalid configuration: Cannot supply a default homeserver URL and " +
- "a default server name",
- ),
- });
- }
-
- // Set a default HS with query param `hs_url`
- const paramHs = this.props.startingFragmentQueryParams.hs_url;
- if (paramHs) {
- console.log('Setting register_hs_url ', paramHs);
- this.setState({
- register_hs_url: paramHs,
- });
- }
- // Set a default IS with query param `is_url`
- const paramIs = this.props.startingFragmentQueryParams.is_url;
- if (paramIs) {
- console.log('Setting register_is_url ', paramIs);
- this.setState({
- register_is_url: paramIs,
- });
- }
-
// a thing to call showScreen with once login completes. this is kept
// outside this.state because updating it should never trigger a
// rerender.
@@ -312,6 +255,14 @@ export default React.createClass({
// For PersistentElement
this.state.resizeNotifier.on("middlePanelResized", this._dispatchTimelineResize);
+
+ // Force users to go through the soft logout page if they're soft logged out
+ if (Lifecycle.isSoftLogout()) {
+ // When the session loads it'll be detected as soft logged out and a dispatch
+ // will be sent out to say that, triggering this MatrixChat to show the soft
+ // logout page.
+ Lifecycle.loadSession({});
+ }
},
componentDidMount: function() {
@@ -332,29 +283,32 @@ export default React.createClass({
}
// the first thing to do is to try the token params in the query-string
- Lifecycle.attemptTokenLogin(this.props.realQueryParams).then((loggedIn) => {
- if (loggedIn) {
- this.props.onTokenLoginCompleted();
+ // if the session isn't soft logged out (ie: is a clean session being logged in)
+ if (!Lifecycle.isSoftLogout()) {
+ Lifecycle.attemptTokenLogin(this.props.realQueryParams).then((loggedIn) => {
+ if (loggedIn) {
+ this.props.onTokenLoginCompleted();
- // don't do anything else until the page reloads - just stay in
- // the 'loading' state.
- return;
- }
+ // don't do anything else until the page reloads - just stay in
+ // the 'loading' state.
+ return;
+ }
- // if the user has followed a login or register link, don't reanimate
- // the old creds, but rather go straight to the relevant page
- const firstScreen = this._screenAfterLogin ?
- this._screenAfterLogin.screen : null;
+ // if the user has followed a login or register link, don't reanimate
+ // the old creds, but rather go straight to the relevant page
+ const firstScreen = this._screenAfterLogin ?
+ this._screenAfterLogin.screen : null;
- if (firstScreen === 'login' ||
+ if (firstScreen === 'login' ||
firstScreen === 'register' ||
firstScreen === 'forgot_password') {
- this._showScreenAfterLogin();
- return;
- }
+ this._showScreenAfterLogin();
+ return;
+ }
- return this._loadSession();
- });
+ return this._loadSession();
+ });
+ }
if (SettingsStore.getValue("showCookieBar")) {
this.setState({
@@ -374,8 +328,8 @@ export default React.createClass({
return Lifecycle.loadSession({
fragmentQueryParams: this.props.startingFragmentQueryParams,
enableGuest: this.props.enableGuest,
- guestHsUrl: this.getCurrentHsUrl(),
- guestIsUrl: this.getCurrentIsUrl(),
+ guestHsUrl: this.getServerProperties().serverConfig.hsUrl,
+ guestIsUrl: this.getServerProperties().serverConfig.isUrl,
defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
});
}).then((loadedSession) => {
@@ -492,6 +446,29 @@ export default React.createClass({
}
switch (payload.action) {
+ case 'MatrixActions.accountData':
+ // XXX: This is a collection of several hacks to solve a minor problem. We want to
+ // update our local state when the ID server changes, but don't want to put that in
+ // the js-sdk as we'd be then dictating how all consumers need to behave. However,
+ // this component is already bloated and we probably don't want this tiny logic in
+ // here, but there's no better place in the react-sdk for it. Additionally, we're
+ // abusing the MatrixActionCreator stuff to avoid errors on dispatches.
+ if (payload.event_type === 'm.identity_server') {
+ const fullUrl = payload.event_content ? payload.event_content['base_url'] : null;
+ if (!fullUrl) {
+ MatrixClientPeg.get().setIdentityServerUrl(null);
+ localStorage.removeItem("mx_is_access_token");
+ localStorage.removeItem("mx_is_url");
+ } else {
+ MatrixClientPeg.get().setIdentityServerUrl(fullUrl);
+ localStorage.removeItem("mx_is_access_token"); // clear token
+ localStorage.setItem("mx_is_url", fullUrl); // XXX: Do we still need this?
+ }
+
+ // redispatch the change with a more specific action
+ dis.dispatch({action: 'id_server_changed'});
+ }
+ break;
case 'logout':
Lifecycle.logout();
break;
@@ -499,10 +476,24 @@ export default React.createClass({
startAnyRegistrationFlow(payload);
break;
case 'start_registration':
+ if (Lifecycle.isSoftLogout()) {
+ this._onSoftLogout();
+ break;
+ }
// This starts the full registration flow
+ if (payload.screenAfterLogin) {
+ this._screenAfterLogin = payload.screenAfterLogin;
+ }
this._startRegistration(payload.params || {});
break;
case 'start_login':
+ if (Lifecycle.isSoftLogout()) {
+ this._onSoftLogout();
+ break;
+ }
+ if (payload.screenAfterLogin) {
+ this._screenAfterLogin = payload.screenAfterLogin;
+ }
this.setStateForNewView({
view: VIEWS.LOGIN,
});
@@ -616,7 +607,7 @@ export default React.createClass({
this._setMxId(payload);
break;
case 'view_start_chat_or_reuse':
- this._chatCreateOrReuse(payload.user_id, payload.go_home_on_cancel);
+ this._chatCreateOrReuse(payload.user_id);
break;
case 'view_create_chat':
showStartChatInviteDialog();
@@ -670,7 +661,12 @@ export default React.createClass({
});
break;
case 'on_logged_in':
- this._onLoggedIn();
+ if (!Lifecycle.isSoftLogout()) {
+ this._onLoggedIn();
+ }
+ break;
+ case 'on_client_not_viable':
+ this._onSoftLogout();
break;
case 'on_logged_out':
this._onLoggedOut();
@@ -734,7 +730,7 @@ export default React.createClass({
});
},
- _startRegistration: function(params) {
+ _startRegistration: async function(params) {
const newState = {
view: VIEWS.REGISTER,
};
@@ -747,10 +743,12 @@ export default React.createClass({
params.is_url &&
params.sid
) {
+ newState.serverConfig = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(
+ params.hs_url, params.is_url,
+ );
+
newState.register_client_secret = params.client_secret;
newState.register_session_id = params.session_id;
- newState.register_hs_url = params.hs_url;
- newState.register_is_url = params.is_url;
newState.register_id_sid = params.sid;
}
@@ -942,6 +940,7 @@ export default React.createClass({
}
return;
}
+ MatrixClientPeg.setJustRegisteredUserId(credentials.user_id);
this.onRegistered(credentials);
},
onDifferentServerClicked: (ev) => {
@@ -955,26 +954,20 @@ export default React.createClass({
}).close;
},
- _createRoom: function() {
+ _createRoom: async function() {
const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
- Modal.createTrackedDialog('Create Room', '', CreateRoomDialog, {
- onFinished: (shouldCreate, name, noFederate) => {
- if (shouldCreate) {
- const createOpts = {};
- if (name) createOpts.name = name;
- if (noFederate) createOpts.creation_content = {'m.federate': false};
- createRoom({createOpts}).done();
- }
- },
- });
+ const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog);
+
+ const [shouldCreate, name, noFederate] = await modal.finished;
+ if (shouldCreate) {
+ const createOpts = {};
+ if (name) createOpts.name = name;
+ if (noFederate) createOpts.creation_content = {'m.federate': false};
+ createRoom({createOpts}).done();
+ }
},
- _chatCreateOrReuse: function(userId, goHomeOnCancel) {
- if (goHomeOnCancel === undefined) goHomeOnCancel = true;
-
- const ChatCreateOrReuseDialog = sdk.getComponent(
- 'views.dialogs.ChatCreateOrReuseDialog',
- );
+ _chatCreateOrReuse: function(userId) {
// Use a deferred action to reshow the dialog once the user has registered
if (MatrixClientPeg.get().isGuest()) {
// No point in making 2 DMs with welcome bot. This assumes view_set_mxid will
@@ -999,30 +992,23 @@ export default React.createClass({
return;
}
- const close = Modal.createTrackedDialog('Chat create or reuse', '', ChatCreateOrReuseDialog, {
- userId: userId,
- onFinished: (success) => {
- if (!success && goHomeOnCancel) {
- // Dialog cancelled, default to home
- dis.dispatch({ action: 'view_home_page' });
- }
- },
- onNewDMClick: () => {
- dis.dispatch({
- action: 'start_chat',
- user_id: userId,
- });
- // Close the dialog, indicate success (calls onFinished(true))
- close(true);
- },
- onExistingRoomSelected: (roomId) => {
- dis.dispatch({
- action: 'view_room',
- room_id: roomId,
- });
- close(true);
- },
- }).close;
+ // TODO: Immutable DMs replaces this
+
+ const client = MatrixClientPeg.get();
+ const dmRoomMap = new DMRoomMap(client);
+ const dmRooms = dmRoomMap.getDMRoomsForUserId(userId);
+
+ if (dmRooms.length > 0) {
+ dis.dispatch({
+ action: 'view_room',
+ room_id: dmRooms[0],
+ });
+ } else {
+ dis.dispatch({
+ action: 'start_chat',
+ user_id: userId,
+ });
+ }
},
_leaveRoomWarnings: function(roomId) {
@@ -1186,29 +1172,81 @@ export default React.createClass({
}
},
+ /**
+ * Starts a chat with the welcome user, if the user doesn't already have one
+ * @returns {string} The room ID of the new room, or null if no room was created
+ */
+ async _startWelcomeUserChat() {
+ // We can end up with multiple tabs post-registration where the user
+ // might then end up with a session and we don't want them all making
+ // a chat with the welcome user: try to de-dupe.
+ // We need to wait for the first sync to complete for this to
+ // work though.
+ let waitFor;
+ if (!this.firstSyncComplete) {
+ waitFor = this.firstSyncPromise.promise;
+ } else {
+ waitFor = Promise.resolve();
+ }
+ await waitFor;
+
+ const welcomeUserRooms = DMRoomMap.shared().getDMRoomsForUserId(
+ this.props.config.welcomeUserId,
+ );
+ if (welcomeUserRooms.length === 0) {
+ const roomId = await createRoom({
+ dmUserId: this.props.config.welcomeUserId,
+ // Only view the welcome user if we're NOT looking at a room
+ andView: !this.state.currentRoomId,
+ spinner: false, // we're already showing one: we don't need another one
+ });
+ // This is a bit of a hack, but since the deduplication relies
+ // on m.direct being up to date, we need to force a sync
+ // of the database, otherwise if the user goes to the other
+ // tab before the next save happens (a few minutes), the
+ // saved sync will be restored from the db and this code will
+ // run without the update to m.direct, making another welcome
+ // user room (it doesn't wait for new data from the server, just
+ // the saved sync to be loaded).
+ const saveWelcomeUser = (ev) => {
+ if (
+ ev.getType() == 'm.direct' &&
+ ev.getContent() &&
+ ev.getContent()[this.props.config.welcomeUserId]
+ ) {
+ MatrixClientPeg.get().store.save(true);
+ MatrixClientPeg.get().removeListener(
+ "accountData", saveWelcomeUser,
+ );
+ }
+ };
+ MatrixClientPeg.get().on("accountData", saveWelcomeUser);
+
+ return roomId;
+ }
+ return null;
+ },
+
/**
* Called when a new logged in session has started
*/
_onLoggedIn: async function() {
this.setStateForNewView({ view: VIEWS.LOGGED_IN });
- if (this._is_registered) {
- this._is_registered = false;
+ if (MatrixClientPeg.currentUserIsJustRegistered()) {
+ MatrixClientPeg.setJustRegisteredUserId(null);
if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
- const roomId = await createRoom({
- dmUserId: this.props.config.welcomeUserId,
- // Only view the welcome user if we're NOT looking at a room
- andView: !this.state.currentRoomId,
- });
- // if successful, return because we're already
- // viewing the welcomeUserId room
- // else, if failed, fall through to view_home_page
- if (roomId) {
- return;
+ const welcomeUserRoom = await this._startWelcomeUserChat();
+ if (welcomeUserRoom === null) {
+ // We didn't rediret to the welcome user room, so show
+ // the homepage.
+ dis.dispatch({action: 'view_home_page'});
}
+ } else {
+ // The user has just logged in after registering,
+ // so show the homepage.
+ dis.dispatch({action: 'view_home_page'});
}
- // The user has just logged in after registering
- dis.dispatch({action: 'view_home_page'});
} else {
this._showScreenAfterLogin();
}
@@ -1225,10 +1263,7 @@ export default React.createClass({
this._screenAfterLogin = null;
} else if (localStorage && localStorage.getItem('mx_last_room_id')) {
// Before defaulting to directory, show the last viewed room
- dis.dispatch({
- action: 'view_room',
- room_id: localStorage.getItem('mx_last_room_id'),
- });
+ this._viewLastRoom();
} else {
if (MatrixClientPeg.get().isGuest()) {
dis.dispatch({action: 'view_welcome_page'});
@@ -1242,6 +1277,13 @@ export default React.createClass({
}
},
+ _viewLastRoom: function() {
+ dis.dispatch({
+ action: 'view_room',
+ room_id: localStorage.getItem('mx_last_room_id'),
+ });
+ },
+
/**
* Called when the session is logged out
*/
@@ -1253,7 +1295,21 @@ export default React.createClass({
collapseLhs: false,
collapsedRhs: false,
currentRoomId: null,
- page_type: PageTypes.RoomDirectory,
+ });
+ this._setPageSubtitle();
+ },
+
+ /**
+ * Called when the session is softly logged out
+ */
+ _onSoftLogout: function() {
+ this.notifyNewScreen('soft_logout');
+ this.setStateForNewView({
+ view: VIEWS.SOFT_LOGOUT,
+ ready: false,
+ collapseLhs: false,
+ collapsedRhs: false,
+ currentRoomId: null,
});
this._setPageSubtitle();
},
@@ -1337,8 +1393,15 @@ export default React.createClass({
call: call,
}, true);
});
- cli.on('Session.logged_out', function(call) {
+ cli.on('Session.logged_out', function(errObj) {
if (Lifecycle.isLoggingOut()) return;
+
+ if (errObj.httpStatus === 401 && errObj.data && errObj.data['soft_logout']) {
+ console.warn("Soft logout issued by server - avoiding data deletion");
+ Lifecycle.softLogout();
+ return;
+ }
+
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Signed out', '', ErrorDialog, {
title: _t('Signed Out'),
@@ -1519,6 +1582,17 @@ export default React.createClass({
action: 'start_password_recovery',
params: params,
});
+ } else if (screen === 'soft_logout') {
+ if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
+ // Logged in - visit a room
+ this._viewLastRoom();
+ } else {
+ // Ultimately triggers soft_logout if needed
+ dis.dispatch({
+ action: 'start_login',
+ params: params,
+ });
+ }
} else if (screen == 'new') {
dis.dispatch({
action: 'view_create_room',
@@ -1710,48 +1784,6 @@ export default React.createClass({
// returns a promise which resolves to the new MatrixClient
onRegistered: function(credentials) {
- if (this.state.register_session_id) {
- // The user came in through an email validation link. To avoid overwriting
- // their session, check to make sure the session isn't someone else, and
- // isn't a guest user since we'll usually have set a guest user session before
- // starting the registration process. This isn't perfect since it's possible
- // the user had a separate guest session they didn't actually mean to replace.
- const sessionOwner = Lifecycle.getStoredSessionOwner();
- const sessionIsGuest = Lifecycle.getStoredSessionIsGuest();
- if (sessionOwner && !sessionIsGuest && sessionOwner !== credentials.userId) {
- console.log(
- `Found a session for ${sessionOwner} but ${credentials.userId} is trying to verify their ` +
- `email address. Restoring the session for ${sessionOwner} with warning.`,
- );
- this._loadSession();
-
- const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
- // N.B. first param is passed to piwik and so doesn't want i18n
- Modal.createTrackedDialog('Existing session on register', '',
- QuestionDialog, {
- title: _t('You are logged in to another account'),
- description: _t(
- "Thank you for verifying your email! The account you're logged into here " +
- "(%(sessionUserId)s) appears to be different from the account you've verified an " +
- "email for (%(verifiedUserId)s). If you would like to log in to %(verifiedUserId2)s, " +
- "please log out first.", {
- sessionUserId: sessionOwner,
- verifiedUserId: credentials.userId,
-
- // TODO: Fix translations to support reusing variables.
- // https://github.com/vector-im/riot-web/issues/9086
- verifiedUserId2: credentials.userId,
- },
- ),
- hasCancelButton: false,
- });
-
- return MatrixClientPeg.get();
- }
- }
- // XXX: This should be in state or ideally store(s) because we risk not
- // rendering the most up-to-date view of state otherwise.
- this._is_registered = true;
return Lifecycle.setLoggedIn(credentials);
},
@@ -1792,19 +1824,7 @@ export default React.createClass({
},
updateStatusIndicator: function(state, prevState) {
- let notifCount = 0;
-
- const rooms = MatrixClientPeg.get().getRooms();
- for (let i = 0; i < rooms.length; ++i) {
- if (rooms[i].hasMembershipState(MatrixClientPeg.get().credentials.userId, 'invite')) {
- notifCount++;
- } else if (rooms[i].getUnreadNotificationCount()) {
- // if we were summing unread notifs:
- // notifCount += rooms[i].getUnreadNotificationCount();
- // instead, we just count the number of rooms with notifs.
- notifCount++;
- }
- }
+ const notifCount = countRoomsWithNotif(MatrixClientPeg.get().getRooms()).count;
if (PlatformPeg.get()) {
PlatformPeg.get().setErrorStatus(state === 'ERROR');
@@ -1827,44 +1847,7 @@ export default React.createClass({
},
onServerConfigChange(config) {
- const newState = {};
- if (config.hsUrl) {
- newState.register_hs_url = config.hsUrl;
- }
- if (config.isUrl) {
- newState.register_is_url = config.isUrl;
- }
- this.setState(newState);
- },
-
- _tryDiscoverDefaultHomeserver: async function(serverName) {
- try {
- const discovery = await AutoDiscovery.findClientConfig(serverName);
- const state = discovery["m.homeserver"].state;
- if (state !== AutoDiscovery.SUCCESS) {
- console.error("Failed to discover homeserver on startup:", discovery);
- this.setState({
- defaultServerDiscoveryError: discovery["m.homeserver"].error,
- loadingDefaultHomeserver: false,
- });
- } else {
- const hsUrl = discovery["m.homeserver"].base_url;
- const isUrl = discovery["m.identity_server"].state === AutoDiscovery.SUCCESS
- ? discovery["m.identity_server"].base_url
- : "https://vector.im";
- this.setState({
- defaultHsUrl: hsUrl,
- defaultIsUrl: isUrl,
- loadingDefaultHomeserver: false,
- });
- }
- } catch (e) {
- console.error(e);
- this.setState({
- defaultServerDiscoveryError: _t("Unknown error discovering homeserver"),
- loadingDefaultHomeserver: false,
- });
- }
+ this.setState({serverConfig: config});
},
_makeRegistrationUrl: function(params) {
@@ -1883,8 +1866,7 @@ export default React.createClass({
if (
this.state.view === VIEWS.LOADING ||
- this.state.view === VIEWS.LOGGING_IN ||
- this.state.loadingDefaultHomeserver
+ this.state.view === VIEWS.LOGGING_IN
) {
const Spinner = sdk.getComponent('elements.Spinner');
return (
@@ -1962,18 +1944,13 @@ export default React.createClass({
sessionId={this.state.register_session_id}
idSid={this.state.register_id_sid}
email={this.props.startingFragmentQueryParams.email}
- defaultServerName={this.getDefaultServerName()}
- defaultServerDiscoveryError={this.state.defaultServerDiscoveryError}
- defaultHsUrl={this.getDefaultHsUrl()}
- defaultIsUrl={this.getDefaultIsUrl()}
brand={this.props.config.brand}
- customHsUrl={this.getCurrentHsUrl()}
- customIsUrl={this.getCurrentIsUrl()}
makeRegistrationUrl={this._makeRegistrationUrl}
onLoggedIn={this.onRegistered}
onLoginClick={this.onLoginClick}
onServerConfigChange={this.onServerConfigChange}
- />
+ {...this.getServerProperties()}
+ />
);
}
@@ -1982,14 +1959,11 @@ export default React.createClass({
const ForgotPassword = sdk.getComponent('structures.auth.ForgotPassword');
return (
+ onLoginClick={this.onLoginClick}
+ onServerConfigChange={this.onServerConfigChange}
+ {...this.getServerProperties()}
+ />
);
}
@@ -1999,16 +1973,21 @@ export default React.createClass({
+ );
+ }
+
+ if (this.state.view === VIEWS.SOFT_LOGOUT) {
+ const SoftLogout = sdk.getComponent('structures.auth.SoftLogout');
+ return (
+
);
}
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 17e44f2a0f..1fb0d6c725 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+/* global Velocity */
+
import React from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
@@ -29,6 +31,8 @@ import SettingsStore from '../../settings/SettingsStore';
const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
const continuedTypes = ['m.sticker', 'm.room.message'];
+const isMembershipChange = (e) => e.getType() === 'm.room.member' || e.getType() === 'm.room.third_party_invite';
+
/* (almost) stateless UI component which builds the event tiles in the room timeline.
*/
module.exports = React.createClass({
@@ -52,6 +56,10 @@ module.exports = React.createClass({
// ID of an event to highlight. If undefined, no event will be highlighted.
highlightedEventId: PropTypes.string,
+ // The room these events are all in together, if any.
+ // (The notification panel won't have a room here, for example.)
+ room: PropTypes.object,
+
// Should we show URL Previews
showUrlPreview: PropTypes.bool,
@@ -115,10 +123,48 @@ module.exports = React.createClass({
// to manage its animations
this._readReceiptMap = {};
+ // Track read receipts by event ID. For each _shown_ event ID, we store
+ // the list of read receipts to display:
+ // [
+ // {
+ // userId: string,
+ // member: RoomMember,
+ // ts: number,
+ // },
+ // ]
+ // This is recomputed on each render. It's only stored on the component
+ // for ease of passing the data around since it's computed in one pass
+ // over all events.
+ this._readReceiptsByEvent = {};
+
+ // Track read receipts by user ID. For each user ID we've ever shown a
+ // a read receipt for, we store an object:
+ // {
+ // lastShownEventId: string,
+ // receipt: {
+ // userId: string,
+ // member: RoomMember,
+ // ts: number,
+ // },
+ // }
+ // so that we can always keep receipts displayed by reverting back to
+ // the last shown event for that user ID when needed. This may feel like
+ // it duplicates the receipt storage in the room, but at this layer, we
+ // are tracking _shown_ event IDs, which the JS SDK knows nothing about.
+ // This is recomputed on each render, using the data from the previous
+ // render as our fallback for any user IDs we can't match a receipt to a
+ // displayed event in the current render cycle.
+ this._readReceiptsByUserId = {};
+
// Remember the read marker ghost node so we can do the cleanup that
// Velocity requires
this._readMarkerGhostNode = null;
+ // Cache hidden events setting on mount since Settings is expensive to
+ // query, and we check this in a hot code path.
+ this._showHiddenEventsInTimeline =
+ SettingsStore.getValue("showHiddenEventsInTimeline");
+
this._isMounted = true;
},
@@ -234,6 +280,13 @@ module.exports = React.createClass({
}
},
+ scrollToEventIfNeeded: function(eventId) {
+ const node = this.eventNodes[eventId];
+ if (node) {
+ node.scrollIntoView({block: "nearest", behavior: "instant"});
+ }
+ },
+
/* check the scroll state and send out pagination requests if necessary.
*/
checkFillState: function() {
@@ -252,7 +305,7 @@ module.exports = React.createClass({
return false; // ignored = no show (only happens if the ignore happens after an event was received)
}
- if (SettingsStore.getValue("showHiddenEventsInTimeline")) {
+ if (this._showHiddenEventsInTimeline) {
return true;
}
@@ -318,7 +371,10 @@ module.exports = React.createClass({
this.currentGhostEventId = null;
}
- const isMembershipChange = (e) => e.getType() === 'm.room.member';
+ this._readReceiptsByEvent = {};
+ if (this.props.showReadReceipts) {
+ this._readReceiptsByEvent = this._getReadReceiptsByShownEvent();
+ }
for (i = 0; i < this.props.events.length; i++) {
const mxEv = this.props.events[i];
@@ -387,7 +443,7 @@ module.exports = React.createClass({
// In order to prevent DateSeparators from appearing in the expanded form
// of MemberEventListSummary, render each member event as if the previous
// one was itself. This way, the timestamp of the previous event === the
- // timestamp of the current event, and no DateSeperator is inserted.
+ // timestamp of the current event, and no DateSeparator is inserted.
return this._getTilesForEvent(e, e, e === lastShownEvent);
}).reduce((a, b) => a.concat(b));
@@ -461,7 +517,8 @@ module.exports = React.createClass({
const DateSeparator = sdk.getComponent('messages.DateSeparator');
const ret = [];
- const isEditing = this.props.editEvent && this.props.editEvent.getId() === mxEv.getId();
+ const isEditing = this.props.editState &&
+ this.props.editState.getEvent().getId() === mxEv.getId();
// is this a continuation of the previous message?
let continuation = false;
@@ -518,10 +575,8 @@ module.exports = React.createClass({
// Local echos have a send "status".
const scrollToken = mxEv.status ? undefined : eventId;
- let readReceipts;
- if (this.props.showReadReceipts) {
- readReceipts = this._getReadReceiptsForEvent(mxEv);
- }
+ const readReceipts = this._readReceiptsByEvent[eventId];
+
ret.push(
{
- return r2.ts - r1.ts;
- });
+ // Get an object that maps from event ID to a list of read receipts that
+ // should be shown next to that event. If a hidden event has read receipts,
+ // they are folded into the receipts of the last shown event.
+ _getReadReceiptsByShownEvent: function() {
+ const receiptsByEvent = {};
+ const receiptsByUserId = {};
+
+ let lastShownEventId;
+ for (const event of this.props.events) {
+ if (this._shouldShowEvent(event)) {
+ lastShownEventId = event.getId();
+ }
+ if (!lastShownEventId) {
+ continue;
+ }
+
+ const existingReceipts = receiptsByEvent[lastShownEventId] || [];
+ const newReceipts = this._getReadReceiptsForEvent(event);
+ receiptsByEvent[lastShownEventId] = existingReceipts.concat(newReceipts);
+
+ // Record these receipts along with their last shown event ID for
+ // each associated user ID.
+ for (const receipt of newReceipts) {
+ receiptsByUserId[receipt.userId] = {
+ lastShownEventId,
+ receipt,
+ };
+ }
+ }
+
+ // It's possible in some cases (for example, when a read receipt
+ // advances before we have paginated in the new event that it's marking
+ // received) that we can temporarily not have a matching event for
+ // someone which had one in the last. By looking through our previous
+ // mapping of receipts by user ID, we can cover recover any receipts
+ // that would have been lost by using the same event ID from last time.
+ for (const userId in this._readReceiptsByUserId) {
+ if (receiptsByUserId[userId]) {
+ continue;
+ }
+ const { lastShownEventId, receipt } = this._readReceiptsByUserId[userId];
+ const existingReceipts = receiptsByEvent[lastShownEventId] || [];
+ receiptsByEvent[lastShownEventId] = existingReceipts.concat(receipt);
+ receiptsByUserId[userId] = { lastShownEventId, receipt };
+ }
+ this._readReceiptsByUserId = receiptsByUserId;
+
+ // After grouping receipts by shown events, do another pass to sort each
+ // receipt list.
+ for (const eventId in receiptsByEvent) {
+ receiptsByEvent[eventId].sort((r1, r2) => {
+ return r2.ts - r1.ts;
+ });
+ }
+
+ return receiptsByEvent;
},
_getReadMarkerTile: function(visible) {
@@ -615,6 +725,7 @@ module.exports = React.createClass({
this._readMarkerGhostNode = ghostNode;
if (ghostNode) {
+ // eslint-disable-next-line new-cap
Velocity(ghostNode, {opacity: '0', width: '10%'},
{duration: 400, easing: 'easeInSine',
delay: 1000});
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 7411c7e6c1..aec4767e7b 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -1,5 +1,6 @@
/*
Copyright 2017 Vector Creations Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,19 +17,15 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
+import { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../index';
import { _t } from '../../languageHandler';
import dis from '../../dispatcher';
-import withMatrixClient from '../../wrappers/withMatrixClient';
import AccessibleButton from '../views/elements/AccessibleButton';
-export default withMatrixClient(React.createClass({
+export default React.createClass({
displayName: 'MyGroups',
- propTypes: {
- matrixClient: PropTypes.object.isRequired,
- },
-
getInitialState: function() {
return {
groups: null,
@@ -36,6 +33,10 @@ export default withMatrixClient(React.createClass({
};
},
+ contextTypes: {
+ matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+ },
+
componentWillMount: function() {
this._fetch();
},
@@ -45,7 +46,7 @@ export default withMatrixClient(React.createClass({
},
_fetch: function() {
- this.props.matrixClient.getJoinedGroups().done((result) => {
+ this.context.matrixClient.getJoinedGroups().done((result) => {
this.setState({groups: result.groups, error: null});
}, (err) => {
if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
@@ -146,4 +147,4 @@ export default withMatrixClient(React.createClass({