Remove remaining old dehydration

Author: florianduros

src/Lifecycle.ts

@@ -664,43 +664,6 @@ export async function setLoggedIn(credentials: IMatrixClientCreds): Promise<Matr
     return doSetLoggedIn(Object.assign({}, credentials, { pickleKey }), true, true);
 }
 
-/**
- * Hydrates an existing session by using the credentials provided. This will
- * not clear any local storage, unlike setLoggedIn().
- *
- * Stops the existing Matrix client (without clearing its data) and starts a
- * new one in its place. This additionally starts all other react-sdk services
- * which use the new Matrix client.
- *
- * If the credentials belong to a different user from the session already stored,
- * the old session will be cleared automatically.
- *
- * @param {IMatrixClientCreds} credentials The credentials to use
- *
- * @returns {Promise} promise which resolves to the new MatrixClient once it has been started
- */
-export async function hydrateSession(credentials: IMatrixClientCreds): Promise<MatrixClient> {
-    const oldUserId = MatrixClientPeg.safeGet().getUserId();
-    const oldDeviceId = MatrixClientPeg.safeGet().getDeviceId();
-
-    stopMatrixClient(); // unsets MatrixClientPeg.get()
-    localStorage.removeItem("mx_soft_logout");
-    _isLoggingOut = false;
-
-    const overwrite = credentials.userId !== oldUserId || credentials.deviceId !== oldDeviceId;
-    if (overwrite) {
-        logger.warn("Clearing all data: Old session belongs to a different user/session");
-    }
-
-    if (!credentials.pickleKey && credentials.deviceId !== undefined) {
-        logger.info("Lifecycle#hydrateSession: Pickle key not provided - trying to get one");
-        credentials.pickleKey =
-            (await PlatformPeg.get()?.getPickleKey(credentials.userId, credentials.deviceId)) ?? undefined;
-    }
-
-    return doSetLoggedIn(credentials, overwrite, false);
-}
-
 /**
  * When we have a authenticated via OIDC-native flow and have a refresh token
  * try to create a token refresher.

src/SecurityManager.ts

@@ -275,13 +275,6 @@ async function doAccessSecretStorage(func: () => Promise<void>, forceReset: bool
             });
             logger.debug("accessSecretStorage: bootstrapSecretStorage");
             await crypto.bootstrapSecretStorage({});
-
-            const keyId = Object.keys(secretStorageKeys)[0];
-            if (!keyId) {
-                logger.warn("accessSecretStorage: Not setting dehydration key: no SSSS key found");
-            } else {
-                logger.log("accessSecretStorage: Not setting dehydration key: feature disabled");
-            }
         }
 
         logger.debug("accessSecretStorage: 4S now ready");

src/components/structures/auth/SoftLogout.tsx

@@ -15,7 +15,7 @@ import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";
 import * as Lifecycle from "../../../Lifecycle";
 import Modal from "../../../Modal";
-import { IMatrixClientCreds, MatrixClientPeg } from "../../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { sendLoginRequest } from "../../../Login";
 import AuthPage from "../../views/auth/AuthPage";
 import { SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY } from "../../../BasePlatform";
@@ -148,9 +148,8 @@ export default class SoftLogout extends React.Component<IProps, IState> {
             device_id: cli.getDeviceId() ?? undefined,
         };
 
-        let credentials: IMatrixClientCreds;
         try {
-            credentials = await sendLoginRequest(hsUrl, isUrl, loginType, loginParams);
+            await sendLoginRequest(hsUrl, isUrl, loginType, loginParams);
         } catch (e) {
             let errorText = _t("auth|failed_soft_logout_homeserver");
             if (
@@ -167,11 +166,6 @@ export default class SoftLogout extends React.Component<IProps, IState> {
             });
             return;
         }
-
-        Lifecycle.hydrateSession(credentials).catch((e) => {
-            logger.error(e);
-            this.setState({ busy: false, errorText: _t("auth|failed_soft_logout_auth") });
-        });
     };
 
     /**
@@ -195,27 +189,15 @@ export default class SoftLogout extends React.Component<IProps, IState> {
             device_id: MatrixClientPeg.safeGet().getDeviceId() ?? undefined,
         };
 
-        let credentials: IMatrixClientCreds;
         try {
-            credentials = await sendLoginRequest(hsUrl, isUrl, loginType, loginParams);
+            await sendLoginRequest(hsUrl, isUrl, loginType, loginParams);
+            this.props.onTokenLoginCompleted();
+            return true;
         } catch (e) {
             logger.error(e);
             this.setState({ busy: false, loginView: LoginView.Unsupported });
             return false;
         }
-
-        return Lifecycle.hydrateSession(credentials)
-            .then(() => {
-                if (this.props.onTokenLoginCompleted) {
-                    this.props.onTokenLoginCompleted();
-                }
-                return true;
-            })
-            .catch((e) => {
-                logger.error(e);
-                this.setState({ busy: false, loginView: LoginView.Unsupported });
-                return false;
-            });
     }
 
     private renderPasswordForm(introText: Optional<string>): JSX.Element {

src/i18n/strings/en_EN.json

@@ -206,7 +206,6 @@
         "failed_connect_identity_server_reset_password": "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
         "failed_homeserver_discovery": "Failed to perform homeserver discovery",
         "failed_query_registration_methods": "Unable to query for supported registration methods.",
-        "failed_soft_logout_auth": "Failed to re-authenticate",
         "failed_soft_logout_homeserver": "Failed to re-authenticate due to a homeserver problem",
         "footer_powered_by_matrix": "powered by Matrix",
         "forgot_password_email_invalid": "The email address doesn't appear to be valid.",