feat: allow usernames without @ when UserMustBeDomain false (#4852)

* feat: allow usernames without @ when UserMustBeDomain false

* e2e

* test(e2e): table driven tests for humans and machines

* cleanup

* fix(e2e): ensure there are no username conflicts

* e2e: make awaitDesired async

* rm settings mapping

* e2e: make awaitDesired async

* e2e: parse sequence as int

* e2e: ensure test fails if awaitDesired fails

Co-authored-by: Max Peintner <max@caos.ch>

e2e/cypress/support/api/ensure.ts

@@ -56,7 +56,6 @@ export function ensureSetting(
     'PUT',
     body,
     (entity) => !!entity,
-    (body) => body?.settings?.id,
   );
 }
 
@@ -66,14 +65,15 @@ function awaitDesired(
   search: () => Cypress.Chainable<SearchResult>,
   initialSequence?: number,
 ) {
-  search().then((resp) => {
+  return search().then((resp) => {
     const foundExpectedEntity = expectEntity(resp.entity);
     const foundExpectedSequence = !initialSequence || resp.sequence >= initialSequence;
 
-    if (!foundExpectedEntity || !foundExpectedSequence) {
+    const check = !foundExpectedEntity || !foundExpectedSequence;
+    if (check) {
       expect(trials, `trying ${trials} more times`).to.be.greaterThan(0);
       cy.wait(1000);
-      awaitDesired(trials - 1, expectEntity, search, initialSequence);
+      return awaitDesired(trials - 1, expectEntity, search, initialSequence);
     }
   });
 }
@@ -117,7 +117,8 @@ export function ensureSomething(
         });
     })
     .then((data) => {
-      awaitDesired(90, expectEntity, search, data.sequence);
-      return cy.wrap<number>(data.id);
+      return awaitDesired(90, expectEntity, search, data.sequence).then(() => {
+        return cy.wrap<number>(data.id);
+      });
     });
 }

e2e/cypress/support/api/orgs.ts

@@ -12,7 +12,7 @@ export function ensureOrgExists(api: API, name: string): Cypress.Chainable<numbe
         encodeURI(`${api.mgmtBaseURL}/global/orgs/_by_domain?domain=${name}.${host(Cypress.config('baseUrl'))}`),
         'GET',
         (res) => {
-          return { entity: res.org, id: res.org?.id, sequence: res.org?.details?.sequence };
+          return { entity: res.org, id: res.org?.id, sequence: parseInt(<string>res.org?.details?.sequence) };
         },
       ),
     () => `${api.mgmtBaseURL}/orgs`,
@@ -25,6 +25,6 @@ export function ensureOrgExists(api: API, name: string): Cypress.Chainable<numbe
 
 export function getOrgUnderTest(api: API): Cypress.Chainable<number> {
   return searchSomething(api, `${api.mgmtBaseURL}/orgs/me`, 'GET', (res) => {
-    return { entity: res.org, id: res.org.id, sequence: res.org.details.sequence };
+    return { entity: res.org, id: res.org.id, sequence: parseInt(<string>res.org.details.sequence) };
   }).then((res) => res.entity.id);
 }

e2e/cypress/support/api/policies.ts

@@ -1,5 +1,6 @@
 import { requestHeaders } from './apiauth';
 import { API } from './types';
+import { ensureSetting } from './ensure';
 
 export enum Policy {
   Label = 'label',
@@ -15,3 +16,38 @@ export function resetPolicy(api: API, policy: Policy) {
     return null;
   });
 }
+
+export function ensureDomainPolicy(
+  api: API,
+  userLoginMustBeDomain: boolean,
+  validateOrgDomains: boolean,
+  smtpSenderAddressMatchesInstanceDomain: boolean,
+): Cypress.Chainable<number> {
+  return ensureSetting(
+    api,
+    `${api.adminBaseURL}/policies/domain`,
+    (body: any) => {
+      const result = {
+        sequence: parseInt(<string>body.policy?.details?.sequence),
+        id: body.policy?.details?.resourceOwner,
+        entity: null,
+      };
+      if (
+        body.policy &&
+        (body.policy.userLoginMustBeDomain ? body.policy.userLoginMustBeDomain : false) == userLoginMustBeDomain &&
+        (body.policy.validateOrgDomains ? body.policy.validateOrgDomains : false) == validateOrgDomains &&
+        (body.policy.smtpSenderAddressMatchesInstanceDomain ? body.policy.smtpSenderAddressMatchesInstanceDomain : false) ==
+          smtpSenderAddressMatchesInstanceDomain
+      ) {
+        return { ...result, entity: body.policy };
+      }
+      return result;
+    },
+    `${api.adminBaseURL}/policies/domain`,
+    {
+      userLoginMustBeDomain: userLoginMustBeDomain,
+      validateOrgDomains: validateOrgDomains,
+      smtpSenderAddressMatchesInstanceDomain: smtpSenderAddressMatchesInstanceDomain,
+    },
+  );
+}