Merge pull request #599 from vector-im/bwindels/fix-emsonelogin

Don't fail login if dehydrated devices are not supported
element-hq · Nov 25, 2021 · 92bf28e · 92bf28e
2 parents 93abbe8 + ae7d4d0
commit 92bf28e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/matrix/SessionContainer.js b/src/matrix/SessionContainer.js
@@ -329,7 +329,16 @@ export class SessionContainer {
                 request: this._platform.request,
             });
             const olm = await this._olmPromise;
-            const encryptedDehydratedDevice = await getDehydratedDevice(hsApi, olm, this._platform, log);
+            let encryptedDehydratedDevice;
+            try {
+                encryptedDehydratedDevice = await getDehydratedDevice(hsApi, olm, this._platform, log);
+            } catch (err) {
+                if (err.name === "HomeServerError") {
+                    log.set("not_supported", true);
+                } else {
+                    throw err;
+                }
+            }
             if (encryptedDehydratedDevice) {
                 let resolveStageFinish;
                 const promiseStageFinish = new Promise(r => resolveStageFinish = r);