fix: misc cy origin cleanup (#23914)

* chore: remove cannot_visit_previous_origin error message as it is no longer used

* fix: wrap MaybeEndRequestWithBufferedResponse fullCrossOrigin check around feature flag

packages/driver/src/cypress/error_messages.ts

@@ -1250,22 +1250,6 @@ export default {
         docsUrl: 'https://on.cypress.io/session-api',
       },
     },
-    cannot_visit_previous_origin (args) {
-      return {
-        message: stripIndent`\
-          ${cmd('visit')} failed because you are attempting to visit a URL from a previous origin inside of ${cmd('origin')}.
-
-          Instead of placing the ${cmd('visit')} inside of ${cmd('origin')}, the ${cmd('visit')} should be placed outside of the ${cmd('origin')} block.
-
-          \`<commands targeting ${args.attemptedUrl.origin} go here>\`
-
-          \`cy.origin('${args.previousUrl.originPolicy}', () => {\`
-          \`  <commands targeting ${args.previousUrl.origin} go here>\`
-          \`})\`
-
-          \`cy.visit('${args.originalUrl}')\``,
-      }
-    },
     aut_error_prior_to_spec_bridge_attach ({ args }) {
       const { errorMessage, autLocation } = args
 

packages/proxy/lib/http/request-middleware.ts

@@ -124,7 +124,7 @@ const MaybeEndRequestWithBufferedResponse: RequestMiddleware = function () {
 
   if (buffer) {
     this.debug('ending request with buffered response')
-    this.res.wantsInjection = buffer.isCrossOrigin ? 'fullCrossOrigin' : 'full'
+    this.res.wantsInjection = this.config.experimentalSessionAndOrigin && buffer.isCrossOrigin ? 'fullCrossOrigin' : 'full'
 
     return this.onResponse(buffer.response, buffer.stream)
   }

packages/proxy/test/unit/http/request-middleware.spec.ts

@@ -330,7 +330,7 @@ describe('http/request-middleware', () => {
       })
     })
 
-    it('sets wantsInjection to fullCrossOrigin when a cross origin request is buffered', async () => {
+    it('sets wantsInjection to fullCrossOrigin when a cross origin request is buffered and experimentalSessionAndOrigin=true', async () => {
       const buffers = new HttpBuffers()
       const buffer = { url: 'https://www.cypress.io/', isCrossOrigin: true } as HttpBuffer
 
@@ -341,6 +341,9 @@ describe('http/request-middleware', () => {
         req: {
           proxiedUrl: 'https://www.cypress.io/',
         },
+        config: {
+          experimentalSessionAndOrigin: true,
+        },
         res: {} as Partial<CypressOutgoingResponse>,
       }
 
@@ -350,6 +353,29 @@ describe('http/request-middleware', () => {
       })
     })
 
+    it('sets wantsInjection to full when a cross origin request is buffered and experimentalSessionAndOrigin=false', async () => {
+      const buffers = new HttpBuffers()
+      const buffer = { url: 'https://www.cypress.io/', isCrossOrigin: true } as HttpBuffer
+
+      buffers.set(buffer)
+
+      const ctx = {
+        buffers,
+        req: {
+          proxiedUrl: 'https://www.cypress.io/',
+        },
+        config: {
+          experimentalSessionAndOrigin: false,
+        },
+        res: {} as Partial<CypressOutgoingResponse>,
+      }
+
+      await testMiddleware([MaybeEndRequestWithBufferedResponse], ctx)
+      .then(() => {
+        expect(ctx.res.wantsInjection).to.equal('full')
+      })
+    })
+
     it('wantsInjection is not set when the request is not buffered', async () => {
       const buffers = new HttpBuffers()
       const buffer = { url: 'https://www.cypress.io/', isCrossOrigin: true } as HttpBuffer