@hmcts/media-viewer 4.1.0-CVE-fix → 4.1.0-exui-2900-rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/icp/icp-update.service.mjs +2 -2
- package/esm2022/lib/icp/socket.service.mjs +5 -3
- package/fesm2022/hmcts-media-viewer.mjs +5 -3
- package/fesm2022/hmcts-media-viewer.mjs.map +1 -1
- package/lib/icp/socket.service.d.ts +1 -1
- package/lib/icp/socket.service.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -8,7 +8,7 @@ export class IcpUpdateService {
|
|
|
8
8
|
}
|
|
9
9
|
joinSession(username, session) {
|
|
10
10
|
this.session = session;
|
|
11
|
-
this.socket.connect(session.connectionUrl);
|
|
11
|
+
this.socket.connect(session.connectionUrl, session.caseId, session.documentId);
|
|
12
12
|
this.socket.connected().subscribe(isConnected => {
|
|
13
13
|
if (isConnected) {
|
|
14
14
|
this.socket.join({ ...this.session, username });
|
|
@@ -63,4 +63,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
|
|
|
63
63
|
type: Injectable,
|
|
64
64
|
args: [{ providedIn: 'root' }]
|
|
65
65
|
}], ctorParameters: () => [{ type: i1.SocketService }] });
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWNwLXVwZGF0ZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbWVkaWEtdmlld2VyL3NyYy9saWIvaWNwL2ljcC11cGRhdGUuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRzNDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUM7OztBQUd6QyxNQUFNLE9BQU8sZ0JBQWdCO0lBSTNCLFlBQW9CLE1BQXFCO1FBQXJCLFdBQU0sR0FBTixNQUFNLENBQWU7SUFBSSxDQUFDO0lBRTlDLFdBQVcsQ0FBQyxRQUFnQixFQUFFLE9BQW1CO1FBQy9DLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxhQUFhLEVBQUUsT0FBTyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDL0UsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLEVBQUU7WUFDOUMsSUFBSSxXQUFXLEVBQUUsQ0FBQztnQkFDaEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxPQUFPLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUNsRCxDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRUQsWUFBWTtRQUNWLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNsQyxDQUFDO0lBRUQsb0JBQW9CO1FBQ2xCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLHNCQUFzQixDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVELGtCQUFrQjtRQUNoQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBQzNELENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxhQUFhO1FBQzdCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsRUFBRTtZQUM3QyxhQUFhLEVBQUUsYUFBYTtZQUM1QixNQUFNLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNO1lBQzNCLFVBQVUsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVU7U0FDcEMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELHNCQUFzQjtRQUNwQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxlQUFlLENBQUMsU0FBeUI7UUFDdkMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLGdCQUFnQixFQUFFO1lBQzNDLEdBQUcsSUFBSSxDQUFDLE9BQU87WUFDZixXQUFXLEVBQUUsU0FBUyxDQUFDLEVBQUU7WUFDekIsYUFBYSxFQUFFLFNBQVMsQ0FBQyxRQUFRO1NBQ2xDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxnQkFBZ0I7UUFDZCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFRCxZQUFZLENBQUMsTUFBdUI7UUFDbEMsTUFBTSxNQUFNLEdBQUc7WUFDYixJQUFJLEVBQUUsTUFBTTtZQUNaLE1BQU0sRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU07WUFDM0IsVUFBVSxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVTtTQUNwQyxDQUFDO1FBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRUQsYUFBYTtRQUNYLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ3RELENBQUM7a0lBaEVVLGdCQUFnQjtzSUFBaEIsZ0JBQWdCLGNBREgsTUFBTTs7NEZBQ25CLGdCQUFnQjtrQkFENUIsVUFBVTttQkFBQyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBTb2NrZXRTZXJ2aWNlIH0gZnJvbSAnLi9zb2NrZXQuc2VydmljZSc7XG5pbXBvcnQgeyBJY3BQYXJ0aWNpcGFudCwgSWNwU2NyZWVuVXBkYXRlLCBJY3BTZXNzaW9uIH0gZnJvbSAnLi9pY3AuaW50ZXJmYWNlcyc7XG5pbXBvcnQgeyBJY3BFdmVudHMgfSBmcm9tICcuL2ljcC5ldmVudHMnO1xuXG5ASW5qZWN0YWJsZSh7IHByb3ZpZGVkSW46ICdyb290JyB9KVxuZXhwb3J0IGNsYXNzIEljcFVwZGF0ZVNlcnZpY2Uge1xuXG4gIHNlc3Npb246IEljcFNlc3Npb247XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBzb2NrZXQ6IFNvY2tldFNlcnZpY2UpIHsgfVxuXG4gIGpvaW5TZXNzaW9uKHVzZXJuYW1lOiBzdHJpbmcsIHNlc3Npb246IEljcFNlc3Npb24pIHtcbiAgICB0aGlzLnNlc3Npb24gPSBzZXNzaW9uO1xuICAgIHRoaXMuc29ja2V0LmNvbm5lY3Qoc2Vzc2lvbi5jb25uZWN0aW9uVXJsLCBzZXNzaW9uLmNhc2VJZCwgc2Vzc2lvbi5kb2N1bWVudElkKTtcbiAgICB0aGlzLnNvY2tldC5jb25uZWN0ZWQoKS5zdWJzY3JpYmUoaXNDb25uZWN0ZWQgPT4ge1xuICAgICAgaWYgKGlzQ29ubmVjdGVkKSB7XG4gICAgICAgIHRoaXMuc29ja2V0LmpvaW4oeyAuLi50aGlzLnNlc3Npb24sIHVzZXJuYW1lIH0pO1xuICAgICAgfVxuICAgIH0pO1xuICAgIHJldHVybiB0aGlzLnNvY2tldC5saXN0ZW4oSWNwRXZlbnRzLlNFU1NJT05fSk9JTkVEKTtcbiAgfVxuXG4gIGxlYXZlU2Vzc2lvbigpIHtcbiAgICB0aGlzLnNvY2tldC5sZWF2ZSh0aGlzLnNlc3Npb24pO1xuICB9XG5cbiAgbmV3UGFydGljaXBhbnRKb2luZWQoKSB7XG4gICAgcmV0dXJuIHRoaXMuc29ja2V0Lmxpc3RlbihJY3BFdmVudHMuTkVXX1BBUlRJQ0lQQU5UX0pPSU5FRCk7XG4gIH1cblxuICBjbGllbnREaXNjb25uZWN0ZWQoKSB7XG4gICAgcmV0dXJuIHRoaXMuc29ja2V0Lmxpc3RlbihJY3BFdmVudHMuQ0xJRU5UX0RJU0NPTk5FQ1RFRCk7XG4gIH1cblxuICByZW1vdmVQYXJ0aWNpcGFudChwYXJ0aWNpcGFudElkKSB7XG4gICAgdGhpcy5zb2NrZXQuZW1pdChJY3BFdmVudHMuUkVNT1ZFX1BBUlRJQ0lQQU5ULCB7XG4gICAgICBwYXJ0aWNpcGFudElkOiBwYXJ0aWNpcGFudElkLFxuICAgICAgY2FzZUlkOiB0aGlzLnNlc3Npb24uY2FzZUlkLFxuICAgICAgZG9jdW1lbnRJZDogdGhpcy5zZXNzaW9uLmRvY3VtZW50SWRcbiAgICB9KTtcbiAgfVxuXG4gIHBhcnRpY2lwYW50TGlzdFVwZGF0ZWQoKSB7XG4gICAgcmV0dXJuIHRoaXMuc29ja2V0Lmxpc3RlbihJY3BFdmVudHMuUEFSVElDSVBBTlRTX1VQREFURUQpO1xuICB9XG5cbiAgdXBkYXRlUHJlc2VudGVyKHByZXNlbnRlcjogSWNwUGFydGljaXBhbnQpIHtcbiAgICB0aGlzLnNvY2tldC5lbWl0KEljcEV2ZW50cy5VUERBVEVfUFJFU0VOVEVSLCB7XG4gICAgICAuLi50aGlzLnNlc3Npb24sXG4gICAgICBwcmVzZW50ZXJJZDogcHJlc2VudGVyLmlkLFxuICAgICAgcHJlc2VudGVyTmFtZTogcHJlc2VudGVyLnVzZXJuYW1lXG4gICAgfSk7XG4gIH1cblxuICBwcmVzZW50ZXJVcGRhdGVkKCkge1xuICAgIHJldHVybiB0aGlzLnNvY2tldC5saXN0ZW4oSWNwRXZlbnRzLlBSRVNFTlRFUl9VUERBVEVEKTtcbiAgfVxuXG4gIHVwZGF0ZVNjcmVlbihzY3JlZW46IEljcFNjcmVlblVwZGF0ZSkge1xuICAgIGNvbnN0IHVwZGF0ZSA9IHtcbiAgICAgIGJvZHk6IHNjcmVlbixcbiAgICAgIGNhc2VJZDogdGhpcy5zZXNzaW9uLmNhc2VJZCxcbiAgICAgIGRvY3VtZW50SWQ6IHRoaXMuc2Vzc2lvbi5kb2N1bWVudElkXG4gICAgfTtcbiAgICB0aGlzLnNvY2tldC5lbWl0KEljcEV2ZW50cy5VUERBVEVfU0NSRUVOLCB1cGRhdGUpO1xuICB9XG5cbiAgc2NyZWVuVXBkYXRlZCgpIHtcbiAgICByZXR1cm4gdGhpcy5zb2NrZXQubGlzdGVuKEljcEV2ZW50cy5TQ1JFRU5fVVBEQVRFRCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -15,8 +15,10 @@ export class SocketService {
|
|
|
15
15
|
ngOnDestroy() {
|
|
16
16
|
this.subscription.unsubscribe();
|
|
17
17
|
}
|
|
18
|
-
connect(url) {
|
|
19
|
-
|
|
18
|
+
connect(url, caseId, documentId) {
|
|
19
|
+
const socketUrl = new URL(url);
|
|
20
|
+
socketUrl.searchParams.append('sessionId', `${caseId}--${documentId}`);
|
|
21
|
+
return this.getSocketClient(socketUrl.toString()).subscribe((socket) => {
|
|
20
22
|
socket.onopen = (event) => {
|
|
21
23
|
this.connected$.next(true);
|
|
22
24
|
};
|
|
@@ -116,4 +118,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
|
|
|
116
118
|
type: Injectable,
|
|
117
119
|
args: [{ providedIn: 'root' }]
|
|
118
120
|
}], ctorParameters: () => [] });
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"socket.service.js","sourceRoot":"","sources":["../../../../../projects/media-viewer/src/lib/icp/socket.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, OnDestroy } from '@angular/core';\nimport { BehaviorSubject, from, Observable, of, Subject, Subscription } from 'rxjs';\nimport { IcpEvents } from './icp.events';\nimport { IcpParticipant } from './icp.interfaces';\n\n@Injectable({ providedIn: 'root' })\nexport class SocketService implements OnDestroy {\n\n  private socket: WebSocket;\n  subscription: Subscription;\n  connected$ = new BehaviorSubject<boolean>(false);\n  sessionJoined$ = new Subject<void>();\n  presenterUpdated$ = new Subject<void>();\n  clientDisconnected$ = new Subject<void>();\n  participantUpdated$ = new Subject<void>();\n  newParticipantJoined$ = new Subject<void>();\n  screenUpdated$ = new Subject<void>();\n\n  constructor() { }\n\n  ngOnDestroy() {\n    this.subscription.unsubscribe();\n  }\n\n  connect(url: string) {\n    return this.getSocketClient(url).subscribe((socket: WebSocket) => {\n\n      socket.onopen = (event: Event) => {\n        this.connected$.next(true);\n      };\n\n      socket.onmessage = (event: MessageEvent) => {\n        console.log('onmessage');\n        const eventData = JSON.parse(event.data);\n        if (eventData.data && eventData.data.eventName) {\n          this.messageEventHandller(eventData.data.eventName, eventData.data.data);\n        }\n      };\n\n      socket.onerror = (event: Event) => {\n        console.log('onerror');\n      };\n\n      socket.onclose = (event: CloseEvent) => {\n        console.log('onclose');\n      };\n    });\n  }\n\n  connected(): Observable<boolean> {\n    return this.connected$.asObservable();\n  }\n\n  join(session) {\n    this.emit(IcpEvents.SESSION_JOIN, session);\n  }\n\n  leave(session) {\n    this.emit(IcpEvents.SESSION_LEAVE, session);\n    this.subscription.unsubscribe();\n  }\n\n  emit(event: string, data: any) {\n    this.socket.send(JSON.stringify({\n      type: 'event',\n      event,\n      data\n    }));\n  }\n\n  listen(event: IcpEvents): Observable<any> {\n    switch (event) {\n      case IcpEvents.SESSION_JOINED: {\n        return this.sessionJoined$.asObservable();\n      }\n      case IcpEvents.PRESENTER_UPDATED: {\n        return this.presenterUpdated$.asObservable();\n      }\n      case IcpEvents.CLIENT_DISCONNECTED: {\n        return this.clientDisconnected$.asObservable();\n      }\n      case IcpEvents.PARTICIPANTS_UPDATED: {\n        return this.participantUpdated$.asObservable();\n      }\n      case IcpEvents.NEW_PARTICIPANT_JOINED: {\n        return this.newParticipantJoined$.asObservable();\n      }\n      case IcpEvents.SCREEN_UPDATED: {\n        return this.screenUpdated$.asObservable();\n      }\n      default: {\n        break;\n      }\n    }\n  }\n\n  messageEventHandller(eventName: string, data: any) {\n    switch (eventName) {\n      case IcpEvents.SESSION_JOINED: {\n        this.sessionJoined$.next(data);\n        break;\n      }\n      case IcpEvents.PRESENTER_UPDATED: {\n        this.presenterUpdated$.next(data);\n        break;\n      }\n      case IcpEvents.CLIENT_DISCONNECTED: {\n        this.clientDisconnected$.next();\n        break;\n      }\n      case IcpEvents.PARTICIPANTS_UPDATED: {\n        this.participantUpdated$.next(data);\n        break;\n      }\n      case IcpEvents.NEW_PARTICIPANT_JOINED: {\n        this.newParticipantJoined$.next();\n        break;\n      }\n      case IcpEvents.SCREEN_UPDATED: {\n        this.screenUpdated$.next(data);\n        break;\n      }\n    }\n  }\n\n  getSocketClient(url: string): Observable<WebSocket> {\n    this.socket = new WebSocket(url, 'json.webpubsub.azure.v1');\n    return of(this.socket);\n  }\n}\n"]}
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"socket.service.js","sourceRoot":"","sources":["../../../../../projects/media-viewer/src/lib/icp/socket.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, OnDestroy } from '@angular/core';\nimport { BehaviorSubject, from, Observable, of, Subject, Subscription } from 'rxjs';\nimport { IcpEvents } from './icp.events';\nimport { IcpParticipant } from './icp.interfaces';\n\n@Injectable({ providedIn: 'root' })\nexport class SocketService implements OnDestroy {\n\n  private socket: WebSocket;\n  subscription: Subscription;\n  connected$ = new BehaviorSubject<boolean>(false);\n  sessionJoined$ = new Subject<void>();\n  presenterUpdated$ = new Subject<void>();\n  clientDisconnected$ = new Subject<void>();\n  participantUpdated$ = new Subject<void>();\n  newParticipantJoined$ = new Subject<void>();\n  screenUpdated$ = new Subject<void>();\n\n  constructor() { }\n\n  ngOnDestroy() {\n    this.subscription.unsubscribe();\n  }\n\n  connect(url: string, caseId: string, documentId: string) {\n    const socketUrl = new URL(url);\n    socketUrl.searchParams.append('sessionId', `${caseId}--${documentId}`);\n    return this.getSocketClient(socketUrl.toString()).subscribe((socket: WebSocket) => {\n\n      socket.onopen = (event: Event) => {\n        this.connected$.next(true);\n      };\n\n      socket.onmessage = (event: MessageEvent) => {\n        console.log('onmessage');\n        const eventData = JSON.parse(event.data);\n        if (eventData.data && eventData.data.eventName) {\n          this.messageEventHandller(eventData.data.eventName, eventData.data.data);\n        }\n      };\n\n      socket.onerror = (event: Event) => {\n        console.log('onerror');\n      };\n\n      socket.onclose = (event: CloseEvent) => {\n        console.log('onclose');\n      };\n    });\n  }\n\n  connected(): Observable<boolean> {\n    return this.connected$.asObservable();\n  }\n\n  join(session) {\n    this.emit(IcpEvents.SESSION_JOIN, session);\n  }\n\n  leave(session) {\n    this.emit(IcpEvents.SESSION_LEAVE, session);\n    this.subscription.unsubscribe();\n  }\n\n  emit(event: string, data: any) {\n    this.socket.send(JSON.stringify({\n      type: 'event',\n      event,\n      data\n    }));\n  }\n\n  listen(event: IcpEvents): Observable<any> {\n    switch (event) {\n      case IcpEvents.SESSION_JOINED: {\n        return this.sessionJoined$.asObservable();\n      }\n      case IcpEvents.PRESENTER_UPDATED: {\n        return this.presenterUpdated$.asObservable();\n      }\n      case IcpEvents.CLIENT_DISCONNECTED: {\n        return this.clientDisconnected$.asObservable();\n      }\n      case IcpEvents.PARTICIPANTS_UPDATED: {\n        return this.participantUpdated$.asObservable();\n      }\n      case IcpEvents.NEW_PARTICIPANT_JOINED: {\n        return this.newParticipantJoined$.asObservable();\n      }\n      case IcpEvents.SCREEN_UPDATED: {\n        return this.screenUpdated$.asObservable();\n      }\n      default: {\n        break;\n      }\n    }\n  }\n\n  messageEventHandller(eventName: string, data: any) {\n    switch (eventName) {\n      case IcpEvents.SESSION_JOINED: {\n        this.sessionJoined$.next(data);\n        break;\n      }\n      case IcpEvents.PRESENTER_UPDATED: {\n        this.presenterUpdated$.next(data);\n        break;\n      }\n      case IcpEvents.CLIENT_DISCONNECTED: {\n        this.clientDisconnected$.next();\n        break;\n      }\n      case IcpEvents.PARTICIPANTS_UPDATED: {\n        this.participantUpdated$.next(data);\n        break;\n      }\n      case IcpEvents.NEW_PARTICIPANT_JOINED: {\n        this.newParticipantJoined$.next();\n        break;\n      }\n      case IcpEvents.SCREEN_UPDATED: {\n        this.screenUpdated$.next(data);\n        break;\n      }\n    }\n  }\n\n  getSocketClient(url: string): Observable<WebSocket> {\n    this.socket = new WebSocket(url, 'json.webpubsub.azure.v1');\n    return of(this.socket);\n  }\n}\n"]}
|
|
@@ -2067,8 +2067,10 @@ class SocketService {
|
|
|
2067
2067
|
ngOnDestroy() {
|
|
2068
2068
|
this.subscription.unsubscribe();
|
|
2069
2069
|
}
|
|
2070
|
-
connect(url) {
|
|
2071
|
-
|
|
2070
|
+
connect(url, caseId, documentId) {
|
|
2071
|
+
const socketUrl = new URL(url);
|
|
2072
|
+
socketUrl.searchParams.append('sessionId', `${caseId}--${documentId}`);
|
|
2073
|
+
return this.getSocketClient(socketUrl.toString()).subscribe((socket) => {
|
|
2072
2074
|
socket.onopen = (event) => {
|
|
2073
2075
|
this.connected$.next(true);
|
|
2074
2076
|
};
|
|
@@ -2175,7 +2177,7 @@ class IcpUpdateService {
|
|
|
2175
2177
|
}
|
|
2176
2178
|
joinSession(username, session) {
|
|
2177
2179
|
this.session = session;
|
|
2178
|
-
this.socket.connect(session.connectionUrl);
|
|
2180
|
+
this.socket.connect(session.connectionUrl, session.caseId, session.documentId);
|
|
2179
2181
|
this.socket.connected().subscribe(isConnected => {
|
|
2180
2182
|
if (isConnected) {
|
|
2181
2183
|
this.socket.join({ ...this.session, username });
|