Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure setUserCreator is called when a store is assigned #3867

Merged
merged 4 commits into from
Nov 11, 2023
Merged

Ensure setUserCreator is called when a store is assigned #3867

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2067dab
Add method to set store
MidhunSureshR Nov 9, 2023
3fc2344
Use not null assertion
MidhunSureshR Nov 9, 2023
21fc4d5
Use getter/setter
MidhunSureshR Nov 9, 2023
955232e
No need for check if we use setter
MidhunSureshR Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
public reEmitter = new TypedReEmitter<EmittedEvents, ClientEventHandlerMap>(this);
public olmVersion: [number, number, number] | null = null; // populated after initCrypto
public usingExternalCrypto = false;
public store: Store;
private _store!: Store;
public deviceId: string | null;
public credentials: { userId: string | null };

Expand Down Expand Up @@ -1332,7 +1332,6 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa

this.usingExternalCrypto = opts.usingExternalCrypto ?? false;
this.store = opts.store || new StubStore();
this.store.setUserCreator((userId) => User.createUser(userId, this));
this.deviceId = opts.deviceId || null;
this.sessionId = randomString(10);

Expand Down Expand Up @@ -1497,6 +1496,16 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
this._secretStorage = new ServerSideSecretStorageImpl(this, opts.cryptoCallbacks ?? {});
}

public set store(newStore: Store) {
if (!newStore) throw new Error("store passed to MatrixClient.store setter is undefined!");
t3chguy marked this conversation as resolved.
Show resolved Hide resolved
this._store = newStore;
this._store.setUserCreator((userId) => User.createUser(userId, this));
}

public get store(): Store {
return this._store;
}

/**
* High level helper method to begin syncing and poll for new events. To listen for these
* events, add a listener for {@link ClientEvent.Event}
Expand Down
Loading