mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 03:25:12 +01:00
Code Issues Projects Releases Wiki Activity

Create cross-signing in load

Browse Source
This commit is contained in:
RMidhunSuresh 2023-06-14 16:18:09 +05:30
parent 1747186843
commit 816bdbba70
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/matrix/Session.js
View File

@ -113,6 +113,7 @@ export class Session {
this.needsKeyBackup = new ObservableValue(false); this.needsKeyBackup = new ObservableValue(false);
this._secretFetcher = new SecretFetcher(); this._secretFetcher = new SecretFetcher();
this._secretSharing = null; this._secretSharing = null;
this._secretStorage = null;
} }
get fingerprintKey() { get fingerprintKey() {
@ -274,11 +275,6 @@ export class Session {
this._keyBackup.get().dispose(); this._keyBackup.get().dispose();
this._keyBackup.set(undefined); this._keyBackup.set(undefined);
} }
// const crossSigning = this._crossSigning.get();
// if (crossSigning) {
// crossSigning.dispose();
// this._crossSigning.set(undefined);
// }
const key = await ssssKeyFromCredential(type, credential, this._storage, this._platform, this._olm); const key = await ssssKeyFromCredential(type, credential, this._storage, this._platform, this._olm);
if (await this._tryLoadSecretStorage(key, log)) { if (await this._tryLoadSecretStorage(key, log)) {
// only after having read a secret, write the key // only after having read a secret, write the key
@ -550,6 +546,25 @@ export class Session {
await this._tryLoadSecretStorage(ssssKey, log); await this._tryLoadSecretStorage(ssssKey, log);
} }
} }
if (this._features.crossSigning) {
this._platform.logger.run("enable cross-signing", async log => {
const crossSigning = new CrossSigning({
storage: this._storage,
secretFetcher: this._secretFetcher,
platform: this._platform,
olm: this._olm,
olmUtil: this._olmUtil,
deviceTracker: this._deviceTracker,
deviceMessageHandler: this._deviceMessageHandler,
hsApi: this._hsApi,
ownUserId: this.userId,
e2eeAccount: this._e2eeAccount,
deviceId: this.deviceId,
});
await crossSigning.load(log);
this._crossSigning.set(crossSigning);
});
}
} }
dispose() { dispose() {
@ -599,26 +614,6 @@ export class Session {
}); });
} }
if (this._features.crossSigning) {
this._platform.logger.run("enable cross-signing", async log => {
const crossSigning = new CrossSigning({
storage: this._storage,
// secretStorage: this._secretStorage,
secretFetcher: this._secretFetcher,
platform: this._platform,
olm: this._olm,
olmUtil: this._olmUtil,
deviceTracker: this._deviceTracker,
deviceMessageHandler: this._deviceMessageHandler,
hsApi: this._hsApi,
ownUserId: this.userId,
e2eeAccount: this._e2eeAccount,
deviceId: this.deviceId,
});
await crossSigning.load(log);
this._crossSigning.set(crossSigning);
});
}
await this._keyBackup.get()?.start(log); await this._keyBackup.get()?.start(log);
await this._crossSigning.get()?.start(log); await this._crossSigning.get()?.start(log);