Merge pull request #971 from MyPureCloud/STREAM-1034

STREAM-1034: jwt support for live-monitoring

Author: AidanWZ

changelog.md

@@ -4,6 +4,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 # [Unreleased](https://github.com/MyPureCloud/genesys-cloud-webrtc-sdk/compare/v11.5.0...HEAD)
+### Added
+* [STREAM-1034](https://inindca.atlassian.net/browse/STREAM-1034) - Added JWT support for live monitoring sessions
 
 ### Changed
 * [STREAM-1122](https://inindca.atlassian.net/browse/STREAM-1122) - Bump streaming-client to v19.5.0.

src/client.ts

@@ -145,10 +145,10 @@ export class GenesysCloudWebrtcSdk extends (EventEmitter as { new(): StrictEvent
 
     let allowedSessionTypes = options.allowedSessionTypes || [SessionTypes.softphone, SessionTypes.collaborateVideo, SessionTypes.acdScreenShare, SessionTypes.liveScreenMonitoring];
 
-    // If using JWT auth, we only support screen recording and video conferencing.
+    // If using JWT auth, we only support screen recording, video conferencing and live screen monitoring.
     if (options.jwt) {
-      console.debug(`Forcing allowed session types to be ${SessionTypes.screenRecording} and ${SessionTypes.collaborateVideo} due to jwt auth`);
-      allowedSessionTypes = [ SessionTypes.screenRecording, SessionTypes.collaborateVideo ];
+      console.debug(`Forcing allowed session types to be ${SessionTypes.screenRecording}, ${SessionTypes.collaborateVideo} and ${SessionTypes.liveScreenMonitoring} due to jwt auth`);
+      allowedSessionTypes = [ SessionTypes.screenRecording, SessionTypes.collaborateVideo, SessionTypes.liveScreenMonitoring ];
     }
 
     this._config = {

src/sessions/live-monitoring-session-handler.ts

@@ -29,13 +29,19 @@ export class LiveMonitoringSessionHandler extends BaseSessionHandler {
       return this.proceedWithSession(pendingSession);
     }
 
+    // Auto-accept if current user is the target (fromUserId matches current user)
+    if (pendingSession.fromUserId === this.sdk._personDetails?.id) {
+      this._liveMonitoringObserver = false;
+      return this.proceedWithSession(pendingSession);
+    }
+
     // if not auto accepting sessions, emit this event for the consumer to accept
     await super.handlePropose(pendingSession);
   }
 
   async acceptSession(session: LiveScreenMonitoringSession, params: IAcceptSessionRequest): Promise<void> {
-    // Store the liveMonitoringObserver flag
-    this._liveMonitoringObserver = params.liveMonitoringObserver || false;
+    // Store the liveMonitoringObserver flag (use existing flag if already set in handlePropose)
+    this._liveMonitoringObserver = this._liveMonitoringObserver || params.liveMonitoringObserver || false;
 
     if (this._liveMonitoringObserver) {
       await this.acceptSessionForObserver(session, params)

test/unit/sessions/live-monitoring-session-handler.test.ts

@@ -5,7 +5,9 @@ import LiveMonitoringSessionHandler from '../../../src/sessions/live-monitoring-
 import * as utils from '../../../src/utils';
 import BaseSessionHandler from "../../../src/sessions/base-session-handler";
 import * as mediaUtils from "../../../src/media/media-utils";
-import {IExtendedMediaSession, LiveScreenMonitoringSession, VideoMediaSession} from "../../../src";
+import {
+  LiveScreenMonitoringSession,
+} from "../../../src";
 
 let handler: LiveMonitoringSessionHandler;
 let mockSdk: GenesysCloudWebrtcSdk;
@@ -54,15 +56,32 @@ describe('handlePropose', () => {
     expect(superSpy).not.toHaveBeenCalled();
   });
 
-  it('should not accept session if not autoAcceptPendingLiveScreenMonitoringRequests', async () => {
+  it('should auto-accept as target when current user is the fromUserId', async () => {
     const proceedSpy = jest.spyOn(handler, 'proceedWithSession').mockResolvedValue(null);
     const superSpy = jest.spyOn(BaseSessionHandler.prototype, 'handlePropose').mockResolvedValue(null);
 
     mockSdk._config.autoAcceptPendingLiveScreenMonitoringRequests = false;
-    await handler.handlePropose({} as any);
+    const pendingSession = { fromUserId: 'user123' } as any;
+    
+    await handler.handlePropose(pendingSession);
+
+    expect(handler._liveMonitoringObserver).toBe(false);
+    expect(proceedSpy).toHaveBeenCalledWith(pendingSession);
+    expect(superSpy).not.toHaveBeenCalled();
+  });
 
+  it('should not accept session if not autoAcceptPendingLiveScreenMonitoringRequests and user is not observer', async () => {
+    const proceedSpy = jest.spyOn(handler, 'proceedWithSession').mockResolvedValue(null);
+    const superSpy = jest.spyOn(BaseSessionHandler.prototype, 'handlePropose').mockResolvedValue(null);
+
+    mockSdk._config.autoAcceptPendingLiveScreenMonitoringRequests = false;
+    const pendingSession = { fromUserId: 'different-user' } as any;
+    
+    await handler.handlePropose(pendingSession);
+
+    expect(handler._liveMonitoringObserver).toBe(false);
     expect(proceedSpy).not.toHaveBeenCalled();
-    expect(superSpy).toHaveBeenCalled();
+    expect(superSpy).toHaveBeenCalledWith(pendingSession);
   });
 });
 
@@ -103,14 +122,15 @@ describe('acceptSession', () => {
     expect(superAcceptSessionSpy).toHaveBeenCalledWith(session, params);
   });
 
-  it('should default liveMonitoringObserver to false when not provided', async () => {
+  it('should preserve liveMonitoringObserver flag set in handlePropose', async () => {
     const params = { conversationId: session.conversationId };
+    handler._liveMonitoringObserver = true; // Simulate flag set in handlePropose
 
     await handler.acceptSession(session as any, params);
 
-    expect(handler._liveMonitoringObserver).toBe(false);
-    expect(acceptSessionForTargetSpy).toHaveBeenCalledWith(session, params);
-    expect(acceptSessionForObserverSpy).not.toHaveBeenCalled();
+    expect(handler._liveMonitoringObserver).toBe(true);
+    expect(acceptSessionForObserverSpy).toHaveBeenCalledWith(session, params);
+    expect(acceptSessionForTargetSpy).not.toHaveBeenCalled();
     expect(superAcceptSessionSpy).toHaveBeenCalledWith(session, params);
   });
 });