diff --git a/src/livekit/openIDSFU.test.ts b/src/livekit/openIDSFU.test.ts index cc77fa7a..74d44116 100644 --- a/src/livekit/openIDSFU.test.ts +++ b/src/livekit/openIDSFU.test.ts @@ -16,20 +16,7 @@ import { } from "vitest"; import fetchMock from "fetch-mock"; import { getSFUConfigWithOpenID, OpenIDClientParts } from "./openIDSFU"; - -const jwtToken = [ - {}, // header - { - // payload - sub: "@me:example.org:ABCDEF", - video: { - room: "!example_room_id", - }, - }, - {}, // signature -] - .map((d) => global.btoa(JSON.stringify(d))) - .join("."); +import { testJWTToken } from "../utils/test-fixtures"; const sfuUrl = "https://sfu.example.org"; @@ -49,7 +36,7 @@ describe("getSFUConfigWithOpenID", () => { fetchMock.post("https://sfu.example.org/sfu/get", () => { return { status: 200, - body: { url: sfuUrl, jwt: jwtToken }, + body: { url: sfuUrl, jwt: testJWTToken }, }; }); const config = await getSFUConfigWithOpenID( @@ -58,7 +45,7 @@ describe("getSFUConfigWithOpenID", () => { "!example_room_id", ); expect(config).toEqual({ - jwt: jwtToken, + jwt: testJWTToken, url: sfuUrl, livekitIdentity: "@me:example.org:ABCDEF", livekitAlias: "!example_room_id", @@ -105,7 +92,7 @@ describe("getSFUConfigWithOpenID", () => { fetchMock.post("https://sfu.example.org/sfu/get", () => { return { status: 200, - body: { url: sfuUrl, jwt: jwtToken }, + body: { url: sfuUrl, jwt: testJWTToken }, }; }); const config = await getSFUConfigWithOpenID( @@ -114,7 +101,7 @@ describe("getSFUConfigWithOpenID", () => { "!example_room_id", ); expect(config).toEqual({ - jwt: jwtToken, + jwt: testJWTToken, url: sfuUrl, livekitIdentity: "@me:example.org:ABCDEF", livekitAlias: "!example_room_id", diff --git a/src/state/CallViewModel/remoteMembers/Connection.test.ts b/src/state/CallViewModel/remoteMembers/Connection.test.ts index 8f9471d0..74fd44e6 100644 --- a/src/state/CallViewModel/remoteMembers/Connection.test.ts +++ b/src/state/CallViewModel/remoteMembers/Connection.test.ts @@ -40,6 +40,7 @@ import { ElementCallError, FailToGetOpenIdToken, } from "../../../utils/errors.ts"; +import { testJWTToken } from "../../../utils/test-fixtures.ts"; let testScope: ObservableScope; @@ -121,7 +122,7 @@ function setupRemoteConnection(): Connection { status: 200, body: { url: "wss://matrix-rtc.m.localhost/livekit/sfu", - jwt: "ATOKEN", + jwt: testJWTToken, }, }; }); @@ -258,7 +259,7 @@ describe("Start connection states", () => { capturedState.cause instanceof Error ) { expect(capturedState.cause.message).toContain( - "SFU Config fetch failed with exception Error", + "SFU Config fetch failed with exception", ); expect(connection.transport.livekit_alias).toEqual( livekitFocus.livekit_alias, @@ -294,7 +295,7 @@ describe("Start connection states", () => { status: 200, body: { url: "wss://matrix-rtc.m.localhost/livekit/sfu", - jwt: "ATOKEN", + jwt: testJWTToken, }, }; }); diff --git a/src/utils/test-fixtures.ts b/src/utils/test-fixtures.ts index 4cf330b7..f915bb19 100644 --- a/src/utils/test-fixtures.ts +++ b/src/utils/test-fixtures.ts @@ -59,3 +59,17 @@ export const daveRTLRtcMember = mockRtcMembership("@dave2:example.org", "DDDD"); export const daveRTL = mockMatrixRoomMember(daveRTLRtcMember, { rawDisplayName: "\u202eevaD", }); + +export const testJWTToken = [ + {}, // header + { + // payload + sub: "@me:example.org:ABCDEF", + video: { + room: "!example_room_id", + }, + }, + {}, // signature +] + .map((d) => global.btoa(JSON.stringify(d))) + .join(".");