Merge pull request #27834 from overleaf/ii-domain-capture-not-in-group-redirect

[web] Redirect to domain capture page

GitOrigin-RevId: 15d2b8046beb5a40fc4937c337ee9655abaed8fd

services/web/test/unit/src/Institutions/InstitutionsAPITests.js

@@ -2,6 +2,7 @@ const { expect } = require('chai')
 const SandboxedModule = require('sandboxed-module')
 const path = require('path')
 const sinon = require('sinon')
+const { ObjectId } = require('mongodb-legacy')
 const modulePath = path.join(
   __dirname,
   '../../../../app/src/Features/Institutions/InstitutionsAPI'
@@ -160,9 +161,17 @@ describe('InstitutionsAPI', function () {
         },
       ]
       this.request.callsArgWith(1, null, { statusCode: 201 }, responseBody)
-      this.Modules.promises.hooks.fire.resolves([
-        { domainCaptureEnabled: true },
-      ])
+      const groupResponse = {
+        _id: new ObjectId(),
+        managedUsersEnabled: false,
+        domainCaptureEnabled: true,
+      }
+      this.Modules.promises.hooks.fire
+        .withArgs(
+          'getGroupWithDomainCaptureByV1Id',
+          responseBody[0].institution.id
+        )
+        .resolves([groupResponse])
       const body = await this.InstitutionsAPI.promises.getUserAffiliations(
         this.stubbedUser._id
       )
@@ -178,7 +187,12 @@ describe('InstitutionsAPI', function () {
       )
       expect(requestOptions.body).not.to.exist
       expect(body).to.deep.equal([
-        { ...responseBody[0], group: { domainCaptureEnabled: true } },
+        {
+          ...responseBody[0],
+          group: {
+            ...groupResponse,
+          },
+        },
       ])
     })
 

services/web/test/unit/src/Project/ProjectControllerTests.js

@@ -594,6 +594,24 @@ describe('ProjectController', function () {
       this.ProjectController.loadEditor(this.req, this.res)
     })
 
+    it('should redirect to domain capture page', function (done) {
+      this.Features.hasFeature.withArgs('saas').returns(true)
+      this.SplitTestHandler.promises.getAssignment
+        .withArgs(this.req, this.res, 'domain-capture-redirect')
+        .resolves({ variant: 'enabled' })
+      this.Modules.promises.hooks.fire
+        .withArgs(
+          'findDomainCaptureAndManagedUsersGroupUserShouldBePartOf',
+          this.user._id
+        )
+        .resolves([{ _id: new ObjectId() }])
+      this.res.redirect = url => {
+        url.should.equal('/domain-capture')
+        done()
+      }
+      this.ProjectController.loadEditor(this.req, this.res)
+    })
+
     it('should add user', function (done) {
       this.res.render = (pageName, opts) => {
         opts.user.email.should.equal(this.user.email)

services/web/test/unit/src/Project/ProjectListController.test.mjs

@@ -493,6 +493,26 @@ describe('ProjectListController', function () {
       })
     })
 
+    it('should redirect to domain capture page', async function (ctx) {
+      await new Promise(resolve => {
+        ctx.Features.hasFeature.withArgs('saas').returns(true)
+        ctx.SplitTestHandler.promises.getAssignment
+          .withArgs(ctx.req, ctx.res, 'domain-capture-redirect')
+          .resolves({ variant: 'enabled' })
+        ctx.Modules.promises.hooks.fire
+          .withArgs(
+            'findDomainCaptureAndManagedUsersGroupUserShouldBePartOf',
+            ctx.user._id
+          )
+          .resolves([{ _id: new ObjectId() }])
+        ctx.res.redirect = url => {
+          url.should.equal('/domain-capture')
+          resolve()
+        }
+        ctx.ProjectListController.projectListPage(ctx.req, ctx.res)
+      })
+    })
+
     describe('With Institution SSO feature', function () {
       beforeEach(async function (ctx) {
         await new Promise(resolve => {