Skip to content

Commit 1ee9832

Browse files
committed
fixes types
1 parent bb4abc7 commit 1ee9832

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

JitsiConference.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,14 @@ export interface IConferenceOptions {
105105
userRegion?: string;
106106
};
107107
disableAudioLevels?: boolean;
108+
e2ee?: {
109+
disabled?: boolean;
110+
externallyManagedKey?: boolean;
111+
};
108112
e2eping?: {
109113
enabled?: boolean;
110114
};
115+
enableEncodedTransformSupport?: boolean;
111116
enableNoAudioDetection?: boolean;
112117
enableNoisyMicDetection?: boolean;
113118
enableTalkWhileMuted?: boolean;
@@ -130,6 +135,7 @@ export interface IConferenceOptions {
130135
statisticsId?: string;
131136
testing?: {
132137
allowMultipleTracks?: boolean;
138+
disableE2EE?: boolean;
133139
enableAV1ForFF?: boolean;
134140
enableFirefoxP2p?: boolean;
135141
forceInitiator?: boolean;
@@ -4201,7 +4207,7 @@ export default class JitsiConference extends Listenable {
42014207
* @param {Number} [keyInfo.index] - the index of the encryption key.
42024208
* @returns {void}
42034209
*/
4204-
setMediaEncryptionKey(keyInfo: CryptoKey): void {
4210+
setMediaEncryptionKey(keyInfo: { encryptionKey?: CryptoKey; index?: number; }): void {
42054211
this._e2eEncryption.setEncryptionKey(keyInfo);
42064212
}
42074213

modules/e2ee/E2EEncryption.ts

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
1-
import JitsiConference from '../../JitsiConference';
1+
import JitsiConference, { IConferenceOptions } from '../../JitsiConference';
22
import JitsiParticipant from '../../JitsiParticipant';
33
import browser from '../browser';
44

55
import { ExternallyManagedKeyHandler } from './ExternallyManagedKeyHandler';
66
import { ManagedKeyHandler } from './ManagedKeyHandler';
77
import { OlmAdapter } from './OlmAdapter';
88

9-
export interface IE2EConfig {
10-
e2ee?: {
11-
disabled?: boolean;
12-
externallyManagedKey?: boolean;
13-
};
14-
enableEncodedTransformSupport?: boolean;
15-
testing?: {
16-
disableE2EE?: boolean;
17-
};
18-
}
19-
209
/**
2110
* This module integrates {@link KeyHandler} with {@link JitsiConference} in order to enable E2E encryption.
2211
*/
@@ -46,7 +35,7 @@ export class E2EEncryption {
4635
* @param {object} config - Global configuration.
4736
* @returns {boolean}
4837
*/
49-
static isSupported(config: IE2EConfig): boolean {
38+
static isSupported(config: IConferenceOptions['config']): boolean {
5039
const { e2ee = {} } = config;
5140

5241
if (!e2ee.externallyManagedKey && !OlmAdapter.isSupported()) {

modules/e2ee/OlmAdapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ export class OlmAdapter extends Listenable {
323323
*
324324
* @param {JitsiParticipant} participant - The target participant.
325325
* @returns {Promise<void>}
326-
* @private
326+
* @internal
327327
*/
328328
startVerification(participant) {
329329
const pId = participant.getId();

0 commit comments

Comments
 (0)