STREAM-1034: add check for fromUserId for observer

Author: Aidan Zimmermann

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 observer (fromUserId matches current user)
+    if (pendingSession.fromUserId === this.sdk._personDetails?.id) {
+      this._liveMonitoringObserver = true;
+      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

@@ -56,15 +56,32 @@ describe('handlePropose', () => {
     expect(superSpy).not.toHaveBeenCalled();
   });
 
-  it('should not accept session if not autoAcceptPendingLiveScreenMonitoringRequests', async () => {
+  it('should auto-accept as observer 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(true);
+    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);
   });
 });
 
@@ -105,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);
   });
 });