From 8d4663f43714d8f54a127f12d7fd02620f3c892b Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 4 May 2017 18:03:35 +0100
Subject: [PATCH 1/2] Fix lint in Lifecycle.js
---
src/Lifecycle.js | 47 ++++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index f20716cae6..e3be318b31 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -49,7 +49,7 @@ import sdk from './index';
* If any of steps 1-4 are successful, it will call {setLoggedIn}, which in
* turn will raise on_logged_in and will_start_client events.
*
- * It returns a promise which resolves when the above process completes.
+ * @param {object} opts
*
* @param {object} opts.realQueryParams: string->string map of the
* query-parameters extracted from the real query-string of the starting
@@ -67,6 +67,7 @@ import sdk from './index';
* @params {string} opts.guestIsUrl: homeserver URL. Only used if enableGuest is
* true; defines the IS to use.
*
+ * @returns {Promise} a promise which resolves when the above process completes.
*/
export function loadSession(opts) {
const realQueryParams = opts.realQueryParams || {};
@@ -127,7 +128,7 @@ export function loadSession(opts) {
function _loginWithToken(queryParams, defaultDeviceDisplayName) {
// create a temporary MatrixClient to do the login
- var client = Matrix.createClient({
+ const client = Matrix.createClient({
baseUrl: queryParams.homeserver,
});
@@ -159,7 +160,7 @@ function _registerAsGuest(hsUrl, isUrl, defaultDeviceDisplayName) {
// Not really sure where the right home for it is.
// create a temporary MatrixClient to do the login
- var client = Matrix.createClient({
+ const client = Matrix.createClient({
baseUrl: hsUrl,
});
@@ -188,30 +189,30 @@ function _restoreFromLocalStorage() {
if (!localStorage) {
return q(false);
}
- const hs_url = localStorage.getItem("mx_hs_url");
- const is_url = localStorage.getItem("mx_is_url") || 'https://matrix.org';
- const access_token = localStorage.getItem("mx_access_token");
- const user_id = localStorage.getItem("mx_user_id");
- const device_id = localStorage.getItem("mx_device_id");
+ const hsUrl = localStorage.getItem("mx_hs_url");
+ const isUrl = localStorage.getItem("mx_is_url") || 'https://matrix.org';
+ const accessToken = localStorage.getItem("mx_access_token");
+ const userId = localStorage.getItem("mx_user_id");
+ const deviceId = localStorage.getItem("mx_device_id");
- let is_guest;
+ let isGuest;
if (localStorage.getItem("mx_is_guest") !== null) {
- is_guest = localStorage.getItem("mx_is_guest") === "true";
+ isGuest = localStorage.getItem("mx_is_guest") === "true";
} else {
// legacy key name
- is_guest = localStorage.getItem("matrix-is-guest") === "true";
+ isGuest = localStorage.getItem("matrix-is-guest") === "true";
}
- if (access_token && user_id && hs_url) {
- console.log("Restoring session for %s", user_id);
+ if (accessToken && userId && hsUrl) {
+ console.log("Restoring session for %s", userId);
try {
setLoggedIn({
- userId: user_id,
- deviceId: device_id,
- accessToken: access_token,
- homeserverUrl: hs_url,
- identityServerUrl: is_url,
- guest: is_guest,
+ userId: userId,
+ deviceId: deviceId,
+ accessToken: accessToken,
+ homeserverUrl: hsUrl,
+ identityServerUrl: isUrl,
+ guest: isGuest,
});
return q(true);
} catch (e) {
@@ -352,7 +353,7 @@ export function logout() {
return;
}
- return MatrixClientPeg.get().logout().then(onLoggedOut,
+ MatrixClientPeg.get().logout().then(onLoggedOut,
(err) => {
// Just throwing an error here is going to be very unhelpful
// if you're trying to log out because your server's down and
@@ -363,8 +364,8 @@ export function logout() {
// change your password).
console.log("Failed to call logout API: token will not be invalidated");
onLoggedOut();
- }
- );
+ },
+ ).done();
}
/**
@@ -420,7 +421,7 @@ export function stopMatrixClient() {
UserActivity.stop();
Presence.stop();
if (DMRoomMap.shared()) DMRoomMap.shared().stop();
- var cli = MatrixClientPeg.get();
+ const cli = MatrixClientPeg.get();
if (cli) {
cli.stopClient();
cli.removeAllListeners();
From bfceaa827b4053894f67c74d5112f0a482751c69 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 4 May 2017 18:04:47 +0100
Subject: [PATCH 2/2] Log deviceid at login
- to help understand rageshakes
---
src/Lifecycle.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index e3be318b31..f34aeae0e5 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -274,9 +274,13 @@ export function initRtsClient(url) {
*/
export function setLoggedIn(credentials) {
credentials.guest = Boolean(credentials.guest);
- console.log("setLoggedIn => %s (guest=%s) hs=%s",
- credentials.userId, credentials.guest,
- credentials.homeserverUrl);
+
+ console.log(
+ "setLoggedIn: mxid:", credentials.userId,
+ "deviceId:", credentials.deviceId,
+ "guest:", credentials.guest,
+ "hs:", credentials.homeserverUrl,
+ );
// This is dispatched to indicate that the user is still in the process of logging in
// because `teamPromise` may take some time to resolve, breaking the assumption that
// `setLoggedIn` takes an "instant" to complete, and dispatch `on_logged_in` a few ms