matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-07-31 15:24:23 +03:00
Code Activity

Add authenticated media parameter to getMediaConfig (#4762)

Browse Source 
* feat(client): Add authenticated media parameter to getMediaConfig

* test(client): add tests for mediaconfig

---------

Co-authored-by: Maurizio <maurizio-noah.abbruzzo-santiago@t-systems.com>
This commit is contained in:
m004
2025-03-20 17:16:11 +01:00
committed by GitHub
parent e2bdb2f057
commit 0760c5f64c
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spec/integ/matrix-client-methods.spec.ts
View File

@ -157,6 +157,30 @@ describe("MatrixClient", function () {
}); });
}); });
describe("mediaConfig", function () {
it("should get media config on unauthenticated media call", async () => {
httpBackend.when("GET", "/_matrix/media/v3/config").respond(200, '{"m.upload.size": 50000000}', true);
const prom = client.getMediaConfig();
httpBackend.flushAllExpected();
expect((await prom)["m.upload.size"]).toEqual(50000000);
});
it("should get media config on authenticated media call", async () => {
httpBackend
.when("GET", "/_matrix/client/v1/media/config")
.respond(200, '{"m.upload.size": 50000000}', true);
const prom = client.getMediaConfig(true);
httpBackend.flushAllExpected();
expect((await prom)["m.upload.size"]).toEqual(50000000);
});
});
describe("joinRoom", function () { describe("joinRoom", function () {
it("should no-op given the ID of a room you've already joined", async () => { it("should no-op given the ID of a room you've already joined", async () => {
const roomId = "!foo:bar"; const roomId = "!foo:bar";

13
src/client.ts
View File

@ -2069,11 +2069,18 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
/** /**
* Get the config for the media repository. * Get the config for the media repository.
*
* @param useAuthenticatedMedia - If true, the caller supports authenticated
* media and wants an authentication-required URL. Note that server support
* for authenticated media will *not* be checked - it is the caller's responsibility
* to do so before calling this function.
*
* @returns Promise which resolves with an object containing the config. * @returns Promise which resolves with an object containing the config.
*/ */
public getMediaConfig(): Promise<IMediaConfig> { public getMediaConfig(useAuthenticatedMedia: boolean = false): Promise<IMediaConfig> {
return this.http.authedRequest(Method.Get, "/config", undefined, undefined, { const path = useAuthenticatedMedia ? "/media/config" : "/config";
prefix: MediaPrefix.V3, return this.http.authedRequest(Method.Get, path, undefined, undefined, {
prefix: useAuthenticatedMedia ? ClientPrefix.V1 : MediaPrefix.V3,
}); });
} }