probably working but tests not passing

PostHog · Jan 13, 2024 · 93618df · 93618df
1 parent 08e3465
commit 93618df
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 8 deletions.
diff --git a/cypress/e2e/session-recording.cy.js b/cypress/e2e/session-recording.cy.js
@@ -65,8 +65,6 @@ describe('Session recording', () => {
         it('does not capture events when config opts out by default', () => {
             cy.posthogInit({ opt_out_capturing_by_default: true })
 
-            cy.get('[data-cy-input]').type('hello world! ')
-
             assertWhetherPostHogRequestsWereCalled({
                 '@recorder': false,
                 '@decide': true,
@@ -81,6 +79,38 @@ describe('Session recording', () => {
                     })
                 })
         })
+
+        it('can start recording after starting opted out', () => {
+            cy.posthogInit({ opt_out_capturing_by_default: true })
+
+            assertWhetherPostHogRequestsWereCalled({
+                '@recorder': false,
+                '@decide': true,
+                '@session-recording': false,
+            })
+
+            cy.posthog().invoke('opt_in_capturing')
+            // TODO: should we require this call?
+            cy.posthog().invoke('startSessionRecording')
+
+            cy.phCaptures({ full: true }).then((captures) => {
+                expect((captures || []).map((c) => c.event)).to.deep.equal(['$opt_in'])
+            })
+
+            assertWhetherPostHogRequestsWereCalled({
+                '@recorder': true,
+                '@decide': true,
+                // no call to session-recording yet
+            })
+
+            cy.get('[data-cy-input]')
+                .type('hello posthog!')
+                .then(() => {
+                    cy.phCaptures({ full: true }).then((captures) => {
+                        expect(JSON.stringify((captures || []).map((c) => c.event))).to.deep.equal([])
+                    })
+                })
+        })
     })
 
     describe('array.full.js', () => {

diff --git a/src/extensions/replay/sessionrecording.ts b/src/extensions/replay/sessionrecording.ts
@@ -25,6 +25,7 @@ import { logger } from '../../utils/logger'
 import { assignableWindow, window } from '../../utils/globals'
 import { buildNetworkRequestOptions } from './config'
 import { isLocalhost } from '../../utils/request-utils'
+import { userOptedOut } from '../../gdpr-utils'
 
 const BASE_ENDPOINT = '/s/'
 
@@ -348,11 +349,8 @@ export class SessionRecording {
         }
 
         // We do not switch recorder versions midway through a recording.
-        if (
-            this._captureStarted ||
-            this.instance.config.disable_session_recording ||
-            this.instance.config.opt_out_capturing_by_default
-        ) {
+        // do not start if explicitly disabled or if the user has opted out
+        if (this._captureStarted || this.instance.config.disable_session_recording || userOptedOut(this.instance)) {
             return
         }
 

diff --git a/src/posthog-core.ts b/src/posthog-core.ts
@@ -1749,7 +1749,13 @@ export class PostHog {
             }
 
             if (this.sessionRecording && !_isUndefined(config.disable_session_recording)) {
-                if (oldConfig.disable_session_recording !== config.disable_session_recording) {
+                const disable_session_recording_has_changed =
+                    oldConfig.disable_session_recording !== config.disable_session_recording
+                // if opting back in, this config might not have changed
+                const try_enable_after_opt_in =
+                    !userOptedOut(this) && !config.disable_session_recording && !this.sessionRecording.started
+
+                if (disable_session_recording_has_changed || try_enable_after_opt_in) {
                     if (config.disable_session_recording) {
                         this.sessionRecording.stopRecording()
                     } else {