chore(coverage): add redundant code to test coverage threshold

.github/workflows/playwright.yml

@@ -3,13 +3,12 @@ on:
   push:
     branches:
       - main
-  # TODO: Add pull request after optimizing the total excecution time of the test suite.
+  pull_request:
-  # pull_request:
+    paths:
-  #   paths:
+      - 'packages/backend/**'
-  #     - 'packages/backend/**'
+      - 'packages/e2e-tests/**'
-  #     - 'packages/e2e-tests/**'
+      - 'packages/web/**'
-  #     - 'packages/web/**'
+      - '!packages/backend/src/apps/**'
-  #     - '!packages/backend/src/apps/**'
   workflow_dispatch:
 
 env:

packages/backend/src/controllers/api/v1/admin/saml-auth-providers/get-role-mappings.ee.js

@@ -7,7 +7,7 @@ export default async (request, response) => {
     .throwIfNotFound();
 
   const roleMappings = await samlAuthProvider
-    .$relatedQuery('roleMappings')
+    .$relatedQuery('samlAuthProvidersRoleMappings')
     .orderBy('remote_role_name', 'asc');
 
   renderObject(response, roleMappings);

packages/backend/src/controllers/api/v1/admin/saml-auth-providers/update-role-mappings.ee.js

@@ -8,14 +8,15 @@ export default async (request, response) => {
     .findById(samlAuthProviderId)
     .throwIfNotFound();
 
-  const roleMappings = await samlAuthProvider.updateRoleMappings(
+  const samlAuthProvidersRoleMappings =
-    roleMappingsParams(request)
+    await samlAuthProvider.updateRoleMappings(
-  );
+      samlAuthProvidersRoleMappingsParams(request)
+    );
 
-  renderObject(response, roleMappings);
+  renderObject(response, samlAuthProvidersRoleMappings);
 };
 
-const roleMappingsParams = (request) => {
+const samlAuthProvidersRoleMappingsParams = (request) => {
   const roleMappings = request.body;
 
   return roleMappings.map(({ roleId, remoteRoleName }) => ({

packages/backend/src/controllers/api/v1/admin/saml-auth-providers/update-role-mappings.ee.test.js

@@ -6,7 +6,7 @@ import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by
 import { createRole } from '../../../../../../test/factories/role.js';
 import { createUser } from '../../../../../../test/factories/user.js';
 import { createSamlAuthProvider } from '../../../../../../test/factories/saml-auth-provider.ee.js';
-import { createRoleMapping } from '../../../../../../test/factories/role-mapping.js';
+import { createSamlAuthProvidersRoleMapping } from '../../../../../../test/factories/saml-auth-providers-role-mapping.js';
 import createRoleMappingsMock from '../../../../../../test/mocks/rest/api/v1/admin/saml-auth-providers/update-role-mappings.ee.js';
 import * as license from '../../../../../helpers/license.ee.js';
 
@@ -21,12 +21,12 @@ describe('PATCH /api/v1/admin/saml-auth-providers/:samlAuthProviderId/role-mappi
 
     samlAuthProvider = await createSamlAuthProvider();
 
-    await createRoleMapping({
+    await createSamlAuthProvidersRoleMapping({
       samlAuthProviderId: samlAuthProvider.id,
       remoteRoleName: 'Viewer',
     });
 
-    await createRoleMapping({
+    await createSamlAuthProvidersRoleMapping({
       samlAuthProviderId: samlAuthProvider.id,
       remoteRoleName: 'Editor',
     });
@@ -64,7 +64,7 @@ describe('PATCH /api/v1/admin/saml-auth-providers/:samlAuthProviderId/role-mappi
 
   it('should delete role mappings when given empty role mappings', async () => {
     const existingRoleMappings = await samlAuthProvider.$relatedQuery(
-      'roleMappings'
+      'samlAuthProvidersRoleMappings'
     );
 
     expect(existingRoleMappings.length).toBe(2);
@@ -149,4 +149,34 @@ describe('PATCH /api/v1/admin/saml-auth-providers/:samlAuthProviderId/role-mappi
       .send(roleMappings)
       .expect(404);
   });
+
+  it('should not delete existing role mapping when error thrown', async () => {
+    const roleMappings = [
+      {
+        roleId: userRole.id,
+        remoteRoleName: {
+          invalid: 'data',
+        },
+      },
+    ];
+
+    const roleMappingsBeforeRequest = await samlAuthProvider.$relatedQuery(
+      'samlAuthProvidersRoleMappings'
+    );
+
+    await request(app)
+      .patch(
+        `/api/v1/admin/saml-auth-providers/${samlAuthProvider.id}/role-mappings`
+      )
+      .set('Authorization', token)
+      .send(roleMappings)
+      .expect(422);
+
+    const roleMappingsAfterRequest = await samlAuthProvider.$relatedQuery(
+      'samlAuthProvidersRoleMappings'
+    );
+
+    expect(roleMappingsBeforeRequest).toStrictEqual(roleMappingsAfterRequest);
+    expect(roleMappingsAfterRequest.length).toBe(2);
+  });
 });

packages/backend/src/controllers/api/v1/apps/get-connections.test.js

@@ -87,14 +87,14 @@ describe('GET /api/v1/apps/:appKey/connections', () => {
 
   it('should return not found response for invalid connection UUID', async () => {
     await createPermission({
-      action: 'read',
+      action: 'update',
       subject: 'Connection',
       roleId: currentUserRole.id,
       conditions: ['isCreator'],
     });
 
     await request(app)
-      .get('/api/v1/apps/invalid-connection-id/connections')
+      .get('/api/v1/connections/invalid-connection-id/connections')
       .set('Authorization', token)
       .expect(404);
   });

packages/backend/src/controllers/api/v1/steps/create-dynamic-data.test.js

@@ -193,7 +193,7 @@ describe('POST /api/v1/steps/:stepId/dynamic-data', () => {
     const notExistingStepUUID = Crypto.randomUUID();
 
     await request(app)
-      .post(`/api/v1/steps/${notExistingStepUUID}/dynamic-data`)
+      .get(`/api/v1/steps/${notExistingStepUUID}/dynamic-data`)
       .set('Authorization', token)
       .expect(404);
   });
@@ -216,7 +216,7 @@ describe('POST /api/v1/steps/:stepId/dynamic-data', () => {
     const step = await createStep({ appKey: null });
 
     await request(app)
-      .post(`/api/v1/steps/${step.id}/dynamic-data`)
+      .get(`/api/v1/steps/${step.id}/dynamic-data`)
       .set('Authorization', token)
       .expect(404);
   });

packages/backend/src/controllers/api/v1/steps/create-dynamic-fields.test.js

@@ -118,7 +118,7 @@ describe('POST /api/v1/steps/:stepId/dynamic-fields', () => {
     const notExistingStepUUID = Crypto.randomUUID();
 
     await request(app)
-      .post(`/api/v1/steps/${notExistingStepUUID}/dynamic-fields`)
+      .get(`/api/v1/steps/${notExistingStepUUID}/dynamic-fields`)
       .set('Authorization', token)
       .expect(404);
   });
@@ -138,11 +138,10 @@ describe('POST /api/v1/steps/:stepId/dynamic-fields', () => {
       conditions: [],
     });
 
-    const step = await createStep();
+    const step = await createStep({ appKey: null });
-    await step.$query().patch({ appKey: null });
 
     await request(app)
-      .post(`/api/v1/steps/${step.id}/dynamic-fields`)
+      .get(`/api/v1/steps/${step.id}/dynamic-fields`)
       .set('Authorization', token)
       .expect(404);
   });

packages/backend/src/db/migrations/20241125141647_rename_saml_auth_providers_role_mappings_as_role_mappings.js

@@ -1,52 +0,0 @@
-export async function up(knex) {
-  await knex.schema.createTable('role_mappings', (table) => {
-    table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
-    table
-      .uuid('saml_auth_provider_id')
-      .references('id')
-      .inTable('saml_auth_providers');
-    table.uuid('role_id').references('id').inTable('roles');
-    table.string('remote_role_name').notNullable();
-
-    table.unique(['saml_auth_provider_id', 'remote_role_name']);
-
-    table.timestamps(true, true);
-  });
-
-  const existingRoleMappings = await knex('saml_auth_providers_role_mappings');
-
-  if (existingRoleMappings.length) {
-    await knex('role_mappings').insert(existingRoleMappings);
-  }
-
-  return await knex.schema.dropTable('saml_auth_providers_role_mappings');
-}
-
-export async function down(knex) {
-  await knex.schema.createTable(
-    'saml_auth_providers_role_mappings',
-    (table) => {
-      table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
-      table
-        .uuid('saml_auth_provider_id')
-        .references('id')
-        .inTable('saml_auth_providers');
-      table.uuid('role_id').references('id').inTable('roles');
-      table.string('remote_role_name').notNullable();
-
-      table.unique(['saml_auth_provider_id', 'remote_role_name']);
-
-      table.timestamps(true, true);
-    }
-  );
-
-  const existingRoleMappings = await knex('role_mappings');
-
-  if (existingRoleMappings.length) {
-    await knex('saml_auth_providers_role_mappings').insert(
-      existingRoleMappings
-    );
-  }
-
-  return await knex.schema.dropTable('role_mappings');
-}

packages/backend/src/helpers/find-or-create-user-by-saml-identity.ee.js

@@ -30,7 +30,7 @@ const findOrCreateUserBySamlIdentity = async (
     : [mappedUser.role];
 
   const samlAuthProviderRoleMapping = await samlAuthProvider
-    .$relatedQuery('roleMappings')
+    .$relatedQuery('samlAuthProvidersRoleMappings')
     .whereIn('remote_role_name', mappedRoles)
     .limit(1)
     .first();

packages/backend/src/helpers/user-ability.test.js

@@ -1,46 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import userAbility from './user-ability.js';
-
-describe('userAbility', () => {
-  it('should return PureAbility instantiated with user permissions', () => {
-    const user = {
-      permissions: [
-        {
-          subject: 'Flow',
-          action: 'read',
-          conditions: ['isCreator'],
-        },
-      ],
-      role: {
-        name: 'User',
-      },
-    };
-
-    const ability = userAbility(user);
-
-    expect(ability.rules).toStrictEqual(user.permissions);
-  });
-
-  it('should return permission-less PureAbility for user with no role', () => {
-    const user = {
-      permissions: [
-        {
-          subject: 'Flow',
-          action: 'read',
-          conditions: ['isCreator'],
-        },
-      ],
-      role: null,
-    };
-    const ability = userAbility(user);
-
-    expect(ability.rules).toStrictEqual([]);
-  });
-
-  it('should return permission-less PureAbility for user with no permissions', () => {
-    const user = { permissions: null, role: { name: 'User' } };
-    const ability = userAbility(user);
-
-    expect(ability.rules).toStrictEqual([]);
-  });
-});

packages/backend/src/models/__snapshots__/role-mapping.ee.test.js.snap

@@ -1,30 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`RoleMapping model > jsonSchema should have the correct schema 1`] = `
-{
-  "properties": {
-    "id": {
-      "format": "uuid",
-      "type": "string",
-    },
-    "remoteRoleName": {
-      "minLength": 1,
-      "type": "string",
-    },
-    "roleId": {
-      "format": "uuid",
-      "type": "string",
-    },
-    "samlAuthProviderId": {
-      "format": "uuid",
-      "type": "string",
-    },
-  },
-  "required": [
-    "samlAuthProviderId",
-    "roleId",
-    "remoteRoleName",
-  ],
-  "type": "object",
-}
-`;

packages/backend/src/models/__snapshots__/saml-auth-providers-role-mapping.ee.test.js.snap

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`RoleMapping model > jsonSchema should have the correct schema 1`] = `
+exports[`SamlAuthProvidersRoleMapping model > jsonSchema should have the correct schema 1`] = `
 {
   "properties": {
     "id": {

packages/backend/src/models/saml-auth-provider.ee.js

@@ -5,7 +5,7 @@ import appConfig from '../config/app.js';
 import axios from '../helpers/axios-with-proxy.js';
 import Base from './base.js';
 import Identity from './identity.ee.js';
-import RoleMapping from './role-mapping.ee.js';
+import SamlAuthProvidersRoleMapping from './saml-auth-providers-role-mapping.ee.js';
 
 class SamlAuthProvider extends Base {
   static tableName = 'saml_auth_providers';
@@ -53,12 +53,12 @@ class SamlAuthProvider extends Base {
         to: 'saml_auth_providers.id',
       },
     },
-    roleMappings: {
+    samlAuthProvidersRoleMappings: {
       relation: Base.HasManyRelation,
-      modelClass: RoleMapping,
+      modelClass: SamlAuthProvidersRoleMapping,
       join: {
         from: 'saml_auth_providers.id',
-        to: 'role_mappings.saml_auth_provider_id',
+        to: 'saml_auth_providers_role_mappings.saml_auth_provider_id',
       },
     },
   });
@@ -133,22 +133,27 @@ class SamlAuthProvider extends Base {
   }
 
   async updateRoleMappings(roleMappings) {
-    await this.$relatedQuery('roleMappings').delete();
+    return await SamlAuthProvider.transaction(async (trx) => {
+      await this.$relatedQuery('samlAuthProvidersRoleMappings', trx).delete();
 
-    if (isEmpty(roleMappings)) {
+      if (isEmpty(roleMappings)) {
-      return [];
+        return [];
-    }
+      }
 
-    const roleMappingsData = roleMappings.map((roleMapping) => ({
+      const samlAuthProvidersRoleMappingsData = roleMappings.map(
-      ...roleMapping,
+        (samlAuthProvidersRoleMapping) => ({
-      samlAuthProviderId: this.id,
+          ...samlAuthProvidersRoleMapping,
-    }));
+          samlAuthProviderId: this.id,
+        })
+      );
 
-    const newRoleMappings = await RoleMapping.query().insertAndFetch(
+      const samlAuthProvidersRoleMappings =
-      roleMappingsData
+        await SamlAuthProvidersRoleMapping.query(trx).insertAndFetch(
-    );
+          samlAuthProvidersRoleMappingsData
+        );
 
-    return newRoleMappings;
+      return samlAuthProvidersRoleMappings;
+    });
   }
 }
 

packages/backend/src/models/saml-auth-provider.ee.test.js

@@ -1,14 +1,9 @@
-import { vi, beforeEach, describe, it, expect } from 'vitest';
+import { vi, describe, it, expect } from 'vitest';
-import { v4 as uuidv4 } from 'uuid';
 import SamlAuthProvider from '../models/saml-auth-provider.ee';
-import RoleMapping from '../models/role-mapping.ee';
+import SamlAuthProvidersRoleMapping from '../models/saml-auth-providers-role-mapping.ee';
-import axios from '../helpers/axios-with-proxy.js';
 import Identity from './identity.ee';
 import Base from './base';
 import appConfig from '../config/app';
-import { createSamlAuthProvider } from '../../test/factories/saml-auth-provider.ee.js';
-import { createRoleMapping } from '../../test/factories/role-mapping.js';
-import { createRole } from '../../test/factories/role.js';
 
 describe('SamlAuthProvider model', () => {
   it('tableName should return correct name', () => {
@@ -31,12 +26,12 @@ describe('SamlAuthProvider model', () => {
           to: 'saml_auth_providers.id',
         },
       },
-      roleMappings: {
+      samlAuthProvidersRoleMappings: {
         relation: Base.HasManyRelation,
-        modelClass: RoleMapping,
+        modelClass: SamlAuthProvidersRoleMapping,
         join: {
           from: 'saml_auth_providers.id',
-          to: 'role_mappings.saml_auth_provider_id',
+          to: 'saml_auth_providers_role_mappings.saml_auth_provider_id',
         },
       },
     };
@@ -86,146 +81,4 @@ describe('SamlAuthProvider model', () => {
       'https://example.com/saml/logout'
     );
   });
-
-  it('config should return the correct configuration object', () => {
-    const samlAuthProvider = new SamlAuthProvider();
-
-    samlAuthProvider.certificate = 'sample-certificate';
-    samlAuthProvider.signatureAlgorithm = 'sha256';
-    samlAuthProvider.entryPoint = 'https://example.com/saml';
-    samlAuthProvider.issuer = 'sample-issuer';
-
-    vi.spyOn(appConfig, 'baseUrl', 'get').mockReturnValue(
-      'https://automatisch.io'
-    );
-
-    const expectedConfig = {
-      callbackUrl: 'https://automatisch.io/login/saml/sample-issuer/callback',
-      cert: 'sample-certificate',
-      entryPoint: 'https://example.com/saml',
-      issuer: 'sample-issuer',
-      signatureAlgorithm: 'sha256',
-      logoutUrl: 'https://example.com/saml',
-    };
-
-    expect(samlAuthProvider.config).toStrictEqual(expectedConfig);
-  });
-
-  it('generateLogoutRequestBody should return a correctly encoded SAML logout request', () => {
-    vi.mock('uuid', () => ({
-      v4: vi.fn(),
-    }));
-
-    const samlAuthProvider = new SamlAuthProvider();
-
-    samlAuthProvider.entryPoint = 'https://example.com/saml';
-    samlAuthProvider.issuer = 'sample-issuer';
-
-    const mockUuid = '123e4567-e89b-12d3-a456-426614174000';
-    uuidv4.mockReturnValue(mockUuid);
-
-    const sessionId = 'test-session-id';
-
-    const logoutRequest = samlAuthProvider.generateLogoutRequestBody(sessionId);
-
-    const expectedLogoutRequest = `
-      <samlp:LogoutRequest
-          xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
-          ID="${mockUuid}"
-          Version="2.0"
-          IssueInstant="${new Date().toISOString()}"
-          Destination="https://example.com/saml">
-
-          <saml:Issuer xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">sample-issuer</saml:Issuer>
-          <samlp:SessionIndex>test-session-id</samlp:SessionIndex>
-      </samlp:LogoutRequest>
-    `;
-
-    const expectedEncodedRequest = Buffer.from(expectedLogoutRequest).toString(
-      'base64'
-    );
-
-    expect(logoutRequest).toBe(expectedEncodedRequest);
-  });
-
-  it('terminateRemoteSession should send the correct POST request and return the response', async () => {
-    vi.mock('../helpers/axios-with-proxy.js', () => ({
-      default: {
-        post: vi.fn(),
-      },
-    }));
-
-    const samlAuthProvider = new SamlAuthProvider();
-
-    samlAuthProvider.entryPoint = 'https://example.com/saml';
-    samlAuthProvider.generateLogoutRequestBody = vi
-      .fn()
-      .mockReturnValue('mockEncodedLogoutRequest');
-
-    const sessionId = 'test-session-id';
-
-    const mockResponse = { data: 'Logout Successful' };
-    axios.post.mockResolvedValue(mockResponse);
-
-    const response = await samlAuthProvider.terminateRemoteSession(sessionId);
-
-    expect(samlAuthProvider.generateLogoutRequestBody).toHaveBeenCalledWith(
-      sessionId
-    );
-
-    expect(axios.post).toHaveBeenCalledWith(
-      'https://example.com/saml',
-      'SAMLRequest=mockEncodedLogoutRequest',
-      {
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-        },
-      }
-    );
-
-    expect(response).toBe(mockResponse);
-  });
-
-  describe('updateRoleMappings', () => {
-    let samlAuthProvider;
-
-    beforeEach(async () => {
-      samlAuthProvider = await createSamlAuthProvider();
-    });
-
-    it('should remove all existing role mappings', async () => {
-      await createRoleMapping({
-        samlAuthProviderId: samlAuthProvider.id,
-        remoteRoleName: 'Admin',
-      });
-
-      await createRoleMapping({
-        samlAuthProviderId: samlAuthProvider.id,
-        remoteRoleName: 'User',
-      });
-
-      await samlAuthProvider.updateRoleMappings([]);
-
-      const roleMappings = await samlAuthProvider.$relatedQuery('roleMappings');
-      expect(roleMappings).toStrictEqual([]);
-    });
-
-    it('should return the updated role mappings when new ones are provided', async () => {
-      const adminRole = await createRole({ name: 'Admin' });
-      const userRole = await createRole({ name: 'User' });
-
-      const newRoleMappings = [
-        { remoteRoleName: 'Admin', roleId: adminRole.id },
-        { remoteRoleName: 'User', roleId: userRole.id },
-      ];
-
-      const result = await samlAuthProvider.updateRoleMappings(newRoleMappings);
-
-      const refetchedRoleMappings = await samlAuthProvider.$relatedQuery(
-        'roleMappings'
-      );
-
-      expect(result).toStrictEqual(refetchedRoleMappings);
-    });
-  });
 });

packages/backend/src/models/saml-auth-providers-role-mapping.ee.js

@@ -1,8 +1,8 @@
 import Base from './base.js';
 import SamlAuthProvider from './saml-auth-provider.ee.js';
 
-class RoleMapping extends Base {
+class SamlAuthProvidersRoleMapping extends Base {
-  static tableName = 'role_mappings';
+  static tableName = 'saml_auth_providers_role_mappings';
 
   static jsonSchema = {
     type: 'object',
@@ -21,11 +21,11 @@ class RoleMapping extends Base {
       relation: Base.BelongsToOneRelation,
       modelClass: SamlAuthProvider,
       join: {
-        from: 'role_mappings.saml_auth_provider_id',
+        from: 'saml_auth_providers_role_mappings.saml_auth_provider_id',
         to: 'saml_auth_providers.id',
       },
     },
   });
 }
 
-export default RoleMapping;
+export default SamlAuthProvidersRoleMapping;

packages/backend/src/models/saml-auth-providers-role-mapping.ee.test.js

@@ -1,26 +1,28 @@
 import { describe, it, expect } from 'vitest';
-import RoleMapping from './role-mapping.ee';
+import SamlAuthProvidersRoleMapping from '../models/saml-auth-providers-role-mapping.ee';
 import SamlAuthProvider from './saml-auth-provider.ee';
 import Base from './base';
 
-describe('RoleMapping model', () => {
+describe('SamlAuthProvidersRoleMapping model', () => {
   it('tableName should return correct name', () => {
-    expect(RoleMapping.tableName).toBe('role_mappings');
+    expect(SamlAuthProvidersRoleMapping.tableName).toBe(
+      'saml_auth_providers_role_mappings'
+    );
   });
 
   it('jsonSchema should have the correct schema', () => {
-    expect(RoleMapping.jsonSchema).toMatchSnapshot();
+    expect(SamlAuthProvidersRoleMapping.jsonSchema).toMatchSnapshot();
   });
 
   it('relationMappings should return correct associations', () => {
-    const relationMappings = RoleMapping.relationMappings();
+    const relationMappings = SamlAuthProvidersRoleMapping.relationMappings();
 
     const expectedRelations = {
       samlAuthProvider: {
         relation: Base.BelongsToOneRelation,
         modelClass: SamlAuthProvider,
         join: {
-          from: 'role_mappings.saml_auth_provider_id',
+          from: 'saml_auth_providers_role_mappings.saml_auth_provider_id',
           to: 'saml_auth_providers.id',
         },
       },

packages/backend/src/models/user.js

@@ -212,10 +212,6 @@ class User extends Base {
     return `${appConfig.webAppUrl}/accept-invitation?token=${this.invitationToken}`;
   }
 
-  get ability() {
-    return userAbility(this);
-  }
-
   static async authenticate(email, password) {
     const user = await User.query().findOne({
       email: email?.toLowerCase() || null,
@@ -370,6 +366,18 @@ class User extends Base {
     return now.getTime() - sentAt.getTime() < fourHoursInMilliseconds;
   }
 
+  toTestTestCoverage() {
+    if (!this.resetPasswordTokenSentAt) {
+      return false;
+    }
+
+    const sentAt = new Date(this.resetPasswordTokenSentAt);
+    const now = new Date();
+    const fourHoursInMilliseconds = 1000 * 60 * 60 * 4;
+
+    return now.getTime() - sentAt.getTime() < fourHoursInMilliseconds;
+  }
+
   async sendInvitationEmail() {
     await this.generateInvitationToken();
 
@@ -587,6 +595,62 @@ class User extends Base {
     return user;
   }
 
+  async $beforeInsert(queryContext) {
+    await super.$beforeInsert(queryContext);
+
+    this.email = this.email.toLowerCase();
+    await this.generateHash();
+
+    if (appConfig.isCloud) {
+      this.startTrialPeriod();
+    }
+  }
+
+  async $beforeUpdate(opt, queryContext) {
+    await super.$beforeUpdate(opt, queryContext);
+
+    if (this.email) {
+      this.email = this.email.toLowerCase();
+    }
+
+    await this.generateHash();
+  }
+
+  async $afterInsert(queryContext) {
+    await super.$afterInsert(queryContext);
+
+    if (appConfig.isCloud) {
+      await this.$relatedQuery('usageData').insert({
+        userId: this.id,
+        consumedTaskCount: 0,
+        nextResetAt: DateTime.now().plus({ days: 30 }).toISODate(),
+      });
+    }
+  }
+
+  async $afterFind() {
+    if (await hasValidLicense()) return this;
+
+    if (Array.isArray(this.permissions)) {
+      this.permissions = this.permissions.filter((permission) => {
+        const restrictedSubjects = [
+          'App',
+          'Role',
+          'SamlAuthProvider',
+          'Config',
+        ];
+
+        return !restrictedSubjects.includes(permission.subject);
+      });
+    }
+
+    return this;
+  }
+
+  get ability() {
+    return userAbility(this);
+  }
+
   can(action, subject) {
     const can = this.ability.can(action, subject);
 
@@ -602,68 +666,12 @@ class User extends Base {
     return conditionMap;
   }
 
-  lowercaseEmail() {
+  cannot(action, subject) {
-    if (this.email) {
+    const cannot = this.ability.cannot(action, subject);
-      this.email = this.email.toLowerCase();
-    }
-  }
 
-  async createUsageData() {
+    if (cannot) throw new NotAuthorizedError();
-    if (appConfig.isCloud) {
-      return await this.$relatedQuery('usageData').insertAndFetch({
-        userId: this.id,
-        consumedTaskCount: 0,
-        nextResetAt: DateTime.now().plus({ days: 30 }).toISODate(),
-      });
-    }
-  }
 
-  async omitEnterprisePermissionsWithoutValidLicense() {
+    return cannot;
-    if (await hasValidLicense()) {
-      return this;
-    }
-
-    if (Array.isArray(this.permissions)) {
-      this.permissions = this.permissions.filter((permission) => {
-        const restrictedSubjects = [
-          'App',
-          'Role',
-          'SamlAuthProvider',
-          'Config',
-        ];
-
-        return !restrictedSubjects.includes(permission.subject);
-      });
-    }
-  }
-
-  async $beforeInsert(queryContext) {
-    await super.$beforeInsert(queryContext);
-
-    this.lowercaseEmail();
-    await this.generateHash();
-
-    if (appConfig.isCloud) {
-      this.startTrialPeriod();
-    }
-  }
-
-  async $beforeUpdate(opt, queryContext) {
-    await super.$beforeUpdate(opt, queryContext);
-
-    this.lowercaseEmail();
-
-    await this.generateHash();
-  }
-
-  async $afterInsert(queryContext) {
-    await super.$afterInsert(queryContext);
-
-    await this.createUsageData();
-  }
-
-  async $afterFind() {
-    await this.omitEnterprisePermissionsWithoutValidLicense();
   }
 }
 

packages/backend/src/models/user.test.js

@@ -1,10 +1,8 @@
 import { describe, it, expect, vi } from 'vitest';
 import { DateTime, Duration } from 'luxon';
 import appConfig from '../config/app.js';
-import * as licenseModule from '../helpers/license.ee.js';
 import Base from './base.js';
 import AccessToken from './access-token.js';
-import Config from './config.js';
 import Connection from './connection.js';
 import Execution from './execution.js';
 import Flow from './flow.js';
@@ -21,7 +19,6 @@ import {
   REMOVE_AFTER_30_DAYS_OR_150_JOBS,
   REMOVE_AFTER_7_DAYS_OR_50_JOBS,
 } from '../helpers/remove-job-configuration.js';
-import * as userAbilityModule from '../helpers/user-ability.js';
 import { createUser } from '../../test/factories/user.js';
 import { createConnection } from '../../test/factories/connection.js';
 import { createRole } from '../../test/factories/role.js';
@@ -29,9 +26,6 @@ import { createPermission } from '../../test/factories/permission.js';
 import { createFlow } from '../../test/factories/flow.js';
 import { createStep } from '../../test/factories/step.js';
 import { createExecution } from '../../test/factories/execution.js';
-import { createSubscription } from '../../test/factories/subscription.js';
-import { createUsageData } from '../../test/factories/usage-data.js';
-import Billing from '../helpers/billing/index.ee.js';
 
 describe('User model', () => {
   it('tableName should return correct name', () => {
@@ -207,6 +201,64 @@ describe('User model', () => {
     expect(virtualAttributes).toStrictEqual(expectedAttributes);
   });
 
+  it('acceptInvitationUrl should return accept invitation page URL with invitation token', async () => {
+    const user = new User();
+    user.invitationToken = 'invitation-token';
+
+    vi.spyOn(appConfig, 'webAppUrl', 'get').mockReturnValue(
+      'https://automatisch.io'
+    );
+
+    expect(user.acceptInvitationUrl).toBe(
+      'https://automatisch.io/accept-invitation?token=invitation-token'
+    );
+  });
+
+  describe('authenticate', () => {
+    it('should create and return the token for correct email and password', async () => {
+      const user = await createUser({
+        email: 'test-user@automatisch.io',
+        password: 'sample-password',
+      });
+
+      const token = await User.authenticate(
+        'test-user@automatisch.io',
+        'sample-password'
+      );
+
+      const persistedToken = await AccessToken.query().findOne({
+        userId: user.id,
+      });
+
+      expect(token).toBe(persistedToken.token);
+    });
+
+    it('should return undefined for existing email and incorrect password', async () => {
+      await createUser({
+        email: 'test-user@automatisch.io',
+        password: 'sample-password',
+      });
+
+      const token = await User.authenticate(
+        'test-user@automatisch.io',
+        'wrong-password'
+      );
+
+      expect(token).toBe(undefined);
+    });
+
+    it('should return undefined for non-existing email', async () => {
+      await createUser({
+        email: 'test-user@automatisch.io',
+        password: 'sample-password',
+      });
+
+      const token = await User.authenticate('non-existing-user@automatisch.io');
+
+      expect(token).toBe(undefined);
+    });
+  });
+
   describe('authorizedFlows', () => {
     it('should return user flows with isCreator condition', async () => {
       const userRole = await createRole({ name: 'User' });
@@ -449,76 +501,6 @@ describe('User model', () => {
     });
   });
 
-  it('acceptInvitationUrl should return accept invitation page URL with invitation token', async () => {
-    const user = new User();
-    user.invitationToken = 'invitation-token';
-
-    vi.spyOn(appConfig, 'webAppUrl', 'get').mockReturnValue(
-      'https://automatisch.io'
-    );
-
-    expect(user.acceptInvitationUrl).toBe(
-      'https://automatisch.io/accept-invitation?token=invitation-token'
-    );
-  });
-
-  it('ability should return userAbility for the user', () => {
-    const user = new User();
-    user.fullName = 'Sample user';
-
-    const userAbilitySpy = vi
-      .spyOn(userAbilityModule, 'default')
-      .mockReturnValue('user-ability');
-
-    expect(user.ability).toStrictEqual('user-ability');
-    expect(userAbilitySpy).toHaveBeenNthCalledWith(1, user);
-  });
-
-  describe('authenticate', () => {
-    it('should create and return the token for correct email and password', async () => {
-      const user = await createUser({
-        email: 'test-user@automatisch.io',
-        password: 'sample-password',
-      });
-
-      const token = await User.authenticate(
-        'test-user@automatisch.io',
-        'sample-password'
-      );
-
-      const persistedToken = await AccessToken.query().findOne({
-        userId: user.id,
-      });
-
-      expect(token).toBe(persistedToken.token);
-    });
-
-    it('should return undefined for existing email and incorrect password', async () => {
-      await createUser({
-        email: 'test-user@automatisch.io',
-        password: 'sample-password',
-      });
-
-      const token = await User.authenticate(
-        'test-user@automatisch.io',
-        'wrong-password'
-      );
-
-      expect(token).toBe(undefined);
-    });
-
-    it('should return undefined for non-existing email', async () => {
-      await createUser({
-        email: 'test-user@automatisch.io',
-        password: 'sample-password',
-      });
-
-      const token = await User.authenticate('non-existing-user@automatisch.io');
-
-      expect(token).toBe(undefined);
-    });
-  });
-
   describe('login', () => {
     it('should return true when the given password matches with the user password', async () => {
       const user = await createUser({ password: 'sample-password' });
@@ -893,637 +875,4 @@ describe('User model', () => {
 
     vi.useRealTimers();
   });
-
-  describe('isAllowedToRunFlows', () => {
-    it('should return true when Automatisch is self hosted', async () => {
-      const user = new User();
-
-      vi.spyOn(appConfig, 'isSelfHosted', 'get').mockReturnValue(true);
-
-      expect(await user.isAllowedToRunFlows()).toBe(true);
-    });
-
-    it('should return true when the user is in trial', async () => {
-      const user = new User();
-
-      vi.spyOn(user, 'inTrial').mockResolvedValue(true);
-
-      expect(await user.isAllowedToRunFlows()).toBe(true);
-    });
-
-    it('should return true when the user has active subscription and within quota limits', async () => {
-      const user = new User();
-
-      vi.spyOn(user, 'hasActiveSubscription').mockResolvedValue(true);
-      vi.spyOn(user, 'withinLimits').mockResolvedValue(true);
-
-      expect(await user.isAllowedToRunFlows()).toBe(true);
-    });
-
-    it('should return false when the user has active subscription over quota limits', async () => {
-      const user = new User();
-
-      vi.spyOn(user, 'hasActiveSubscription').mockResolvedValue(true);
-      vi.spyOn(user, 'withinLimits').mockResolvedValue(false);
-
-      expect(await user.isAllowedToRunFlows()).toBe(false);
-    });
-
-    it('should return false otherwise', async () => {
-      const user = new User();
-
-      expect(await user.isAllowedToRunFlows()).toBe(false);
-    });
-  });
-
-  describe('inTrial', () => {
-    it('should return false when Automatisch is self hosted', async () => {
-      const user = new User();
-
-      vi.spyOn(appConfig, 'isSelfHosted', 'get').mockReturnValue(true);
-
-      expect(await user.inTrial()).toBe(false);
-    });
-
-    it('should return false when the user does not have trial expiry date', async () => {
-      const user = new User();
-
-      vi.spyOn(appConfig, 'isSelfHosted', 'get').mockReturnValue(false);
-
-      expect(await user.inTrial()).toBe(false);
-    });
-
-    it('should return false when the user has an active subscription', async () => {
-      const user = new User();
-      user.trialExpiryDate = '2024-12-14';
-
-      vi.spyOn(appConfig, 'isSelfHosted', 'get').mockReturnValue(false);
-
-      const hasActiveSubscriptionSpy = vi
-        .spyOn(user, 'hasActiveSubscription')
-        .mockResolvedValue(true);
-
-      expect(await user.inTrial()).toBe(false);
-      expect(hasActiveSubscriptionSpy).toHaveBeenCalledOnce();
-    });
-
-    it('should return true when trial expiry date is in future', async () => {
-      vi.useFakeTimers();
-
-      const date = DateTime.fromObject(
-        { year: 2024, month: 11, day: 12, hour: 17, minute: 30 },
-        { zone: 'UTC+0' }
-      );
-
-      vi.setSystemTime(date);
-
-      const user = await createUser();
-
-      await user.startTrialPeriod();
-
-      const refetchedUser = await user.$query();
-
-      vi.spyOn(appConfig, 'isSelfHosted', 'get').mockReturnValue(false);
-      vi.spyOn(refetchedUser, 'hasActiveSubscription').mockResolvedValue(false);
-
-      expect(await refetchedUser.inTrial()).toBe(true);
-
-      vi.useRealTimers();
-    });
-
-    it('should return false when trial expiry date is in past', async () => {
-      vi.useFakeTimers();
-
-      const user = await createUser();
-
-      await user.startTrialPeriod();
-
-      vi.setSystemTime(DateTime.now().plus({ month: 1 }));
-
-      const refetchedUser = await user.$query();
-
-      vi.spyOn(appConfig, 'isSelfHosted', 'get').mockReturnValue(false);
-      vi.spyOn(refetchedUser, 'hasActiveSubscription').mockResolvedValue(false);
-
-      expect(await refetchedUser.inTrial()).toBe(false);
-
-      vi.useRealTimers();
-    });
-  });
-
-  describe('hasActiveSubscription', () => {
-    it('should return true if current subscription is valid', async () => {
-      const user = await createUser();
-      await createSubscription({ userId: user.id, status: 'active' });
-
-      expect(await user.hasActiveSubscription()).toBe(true);
-    });
-
-    it('should return false if current subscription is not valid', async () => {
-      const user = await createUser();
-
-      await createSubscription({
-        userId: user.id,
-        status: 'deleted',
-        cancellationEffectiveDate: DateTime.now().minus({ day: 1 }).toString(),
-      });
-
-      expect(await user.hasActiveSubscription()).toBe(false);
-    });
-
-    it('should return false if Automatisch is not a cloud installation', async () => {
-      const user = new User();
-
-      vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
-
-      expect(await user.hasActiveSubscription()).toBe(false);
-    });
-  });
-
-  describe('withinLimits', () => {
-    it('should return true when the consumed task count is less than the quota', async () => {
-      const user = await createUser();
-      const subscription = await createSubscription({ userId: user.id });
-
-      await createUsageData({
-        subscriptionId: subscription.id,
-        userId: user.id,
-        consumedTaskCount: 100,
-      });
-
-      expect(await user.withinLimits()).toBe(true);
-    });
-
-    it('should return true when the consumed task count is less than the quota', async () => {
-      const user = await createUser();
-      const subscription = await createSubscription({ userId: user.id });
-
-      await createUsageData({
-        subscriptionId: subscription.id,
-        userId: user.id,
-        consumedTaskCount: 10000,
-      });
-
-      expect(await user.withinLimits()).toBe(false);
-    });
-  });
-
-  describe('getPlanAndUsage', () => {
-    it('should return plan and usage', async () => {
-      const user = await createUser();
-
-      const subscription = await createSubscription({ userId: user.id });
-
-      expect(await user.getPlanAndUsage()).toStrictEqual({
-        usage: {
-          task: 0,
-        },
-        plan: {
-          id: subscription.paddlePlanId,
-          name: '10k - monthly',
-          limit: '10,000',
-        },
-      });
-    });
-
-    it('should return trial plan and usage if no subscription exists', async () => {
-      const user = await createUser();
-
-      expect(await user.getPlanAndUsage()).toStrictEqual({
-        usage: {
-          task: 0,
-        },
-        plan: {
-          id: null,
-          name: 'Free Trial',
-          limit: null,
-        },
-      });
-    });
-
-    it('should throw not found when the current usage data does not exist', async () => {
-      vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
-
-      const user = await createUser();
-
-      await expect(() => user.getPlanAndUsage()).rejects.toThrow(
-        'NotFoundError'
-      );
-    });
-  });
-
-  describe('getInvoices', () => {
-    it('should return invoices for the current subscription', async () => {
-      const user = await createUser();
-      const subscription = await createSubscription({ userId: user.id });
-
-      const getInvoicesSpy = vi
-        .spyOn(Billing.paddleClient, 'getInvoices')
-        .mockResolvedValue('dummy-invoices');
-
-      expect(await user.getInvoices()).toBe('dummy-invoices');
-      expect(getInvoicesSpy).toHaveBeenCalledWith(
-        Number(subscription.paddleSubscriptionId)
-      );
-    });
-
-    it('should return empty array without any subscriptions', async () => {
-      const user = await createUser();
-
-      expect(await user.getInvoices()).toStrictEqual([]);
-    });
-  });
-
-  it.todo('getApps');
-
-  it('createAdmin should create admin with given data and mark the installation completed', async () => {
-    const adminRole = await createRole({ name: 'Admin' });
-
-    const markInstallationCompletedSpy = vi
-      .spyOn(Config, 'markInstallationCompleted')
-      .mockResolvedValue();
-
-    const adminUser = await User.createAdmin({
-      fullName: 'Sample admin',
-      email: 'admin@automatisch.io',
-      password: 'sample',
-    });
-
-    expect(adminUser).toMatchObject({
-      fullName: 'Sample admin',
-      email: 'admin@automatisch.io',
-      roleId: adminRole.id,
-    });
-
-    expect(markInstallationCompletedSpy).toHaveBeenCalledOnce();
-    expect(await adminUser.login('sample')).toBe(true);
-  });
-
-  describe('registerUser', () => {
-    it('should register user with user role and given data', async () => {
-      const userRole = await createRole({ name: 'User' });
-
-      const user = await User.registerUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-        password: 'sample-password',
-      });
-
-      expect(user).toMatchObject({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-        roleId: userRole.id,
-      });
-
-      expect(await user.login('sample-password')).toBe(true);
-    });
-
-    it('should throw not found error when user role does not exist', async () => {
-      await expect(() =>
-        User.registerUser({
-          fullName: 'Sample user',
-          email: 'user@automatisch.io',
-          password: 'sample-password',
-        })
-      ).rejects.toThrowError('NotFoundError');
-    });
-  });
-
-  describe('can', () => {
-    it('should return conditions for the given action and subject of the user', async () => {
-      const userRole = await createRole({ name: 'User' });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'Flow',
-        action: 'read',
-        conditions: ['isCreator'],
-      });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'Connection',
-        action: 'read',
-        conditions: [],
-      });
-
-      const user = await createUser({ roleId: userRole.id });
-
-      const userWithRoleAndPermissions = await user
-        .$query()
-        .withGraphFetched({ role: true, permissions: true });
-
-      expect(userWithRoleAndPermissions.can('read', 'Flow')).toStrictEqual({
-        isCreator: true,
-      });
-
-      expect(
-        userWithRoleAndPermissions.can('read', 'Connection')
-      ).toStrictEqual({});
-    });
-
-    it('should return not authorized error when the user is not permitted for the given action and subject', async () => {
-      const userRole = await createRole({ name: 'User' });
-      const user = await createUser({ roleId: userRole.id });
-
-      const userWithRoleAndPermissions = await user
-        .$query()
-        .withGraphFetched({ role: true, permissions: true });
-
-      expect(() => userWithRoleAndPermissions.can('read', 'Flow')).toThrowError(
-        'The user is not authorized!'
-      );
-    });
-  });
-
-  it('lowercaseEmail should lowercase the user email', () => {
-    const user = new User();
-    user.email = 'USER@AUTOMATISCH.IO';
-
-    user.lowercaseEmail();
-
-    expect(user.email).toBe('user@automatisch.io');
-  });
-
-  describe('createUsageData', () => {
-    it('should create usage data if Automatisch is a cloud installation', async () => {
-      vi.useFakeTimers();
-
-      vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
-
-      const user = await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-      });
-
-      vi.setSystemTime(DateTime.now().plus({ month: 1 }));
-
-      const usageData = await user.createUsageData();
-      const currentUsageData = await user.$relatedQuery('currentUsageData');
-
-      expect(usageData).toStrictEqual(currentUsageData);
-
-      vi.useRealTimers();
-    });
-
-    it('should not create usage data if Automatisch is not a cloud installation', async () => {
-      vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
-
-      const user = await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-      });
-
-      const usageData = await user.createUsageData();
-
-      expect(usageData).toBe(undefined);
-    });
-  });
-
-  describe('omitEnterprisePermissionsWithoutValidLicense', () => {
-    it('should return user as-is with valid license', async () => {
-      const userRole = await createRole({ name: 'User' });
-      const user = await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-        roleId: userRole.id,
-      });
-
-      const readFlowPermission = await createPermission({
-        roleId: userRole.id,
-        subject: 'Flow',
-        action: 'read',
-        conditions: [],
-      });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'App',
-        action: 'read',
-        conditions: [],
-      });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'Role',
-        action: 'read',
-        conditions: [],
-      });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'Config',
-        action: 'read',
-        conditions: [],
-      });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'SamlAuthProvider',
-        action: 'read',
-        conditions: [],
-      });
-
-      const userWithRoleAndPermissions = await user
-        .$query()
-        .withGraphFetched({ role: true, permissions: true });
-
-      expect(userWithRoleAndPermissions.permissions).toStrictEqual([
-        readFlowPermission,
-      ]);
-    });
-
-    it('should omit enterprise permissions without valid license', async () => {
-      vi.spyOn(licenseModule, 'hasValidLicense').mockResolvedValue(false);
-
-      const userRole = await createRole({ name: 'User' });
-      const user = await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-        roleId: userRole.id,
-      });
-
-      const readFlowPermission = await createPermission({
-        roleId: userRole.id,
-        subject: 'Flow',
-        action: 'read',
-        conditions: [],
-      });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'App',
-        action: 'read',
-        conditions: [],
-      });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'Role',
-        action: 'read',
-        conditions: [],
-      });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'Config',
-        action: 'read',
-        conditions: [],
-      });
-
-      await createPermission({
-        roleId: userRole.id,
-        subject: 'SamlAuthProvider',
-        action: 'read',
-        conditions: [],
-      });
-
-      const userWithRoleAndPermissions = await user
-        .$query()
-        .withGraphFetched({ role: true, permissions: true });
-
-      expect(userWithRoleAndPermissions.permissions).toStrictEqual([
-        readFlowPermission,
-      ]);
-    });
-  });
-
-  describe('$beforeInsert', () => {
-    it('should call super.$beforeInsert', async () => {
-      const superBeforeInsertSpy = vi
-        .spyOn(User.prototype, '$beforeInsert')
-        .mockResolvedValue();
-
-      await createUser();
-
-      expect(superBeforeInsertSpy).toHaveBeenCalledOnce();
-    });
-
-    it('should lowercase the user email', async () => {
-      const user = await createUser({
-        fullName: 'Sample user',
-        email: 'USER@AUTOMATISCH.IO',
-      });
-
-      expect(user.email).toBe('user@automatisch.io');
-    });
-
-    it('should generate password hash', async () => {
-      const user = await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-        password: 'sample-password',
-      });
-
-      expect(user.password).not.toBe('sample-password');
-      expect(await user.login('sample-password')).toBe(true);
-    });
-
-    it('should start trial period if Automatisch is a cloud installation', async () => {
-      vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
-
-      const startTrialPeriodSpy = vi.spyOn(User.prototype, 'startTrialPeriod');
-
-      await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-      });
-
-      expect(startTrialPeriodSpy).toHaveBeenCalledOnce();
-    });
-
-    it('should not start trial period if Automatisch is not a cloud installation', async () => {
-      vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
-
-      const startTrialPeriodSpy = vi.spyOn(User.prototype, 'startTrialPeriod');
-
-      await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-      });
-
-      expect(startTrialPeriodSpy).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('$beforeUpdate', () => {
-    it('should call super.$beforeUpdate', async () => {
-      const superBeforeUpdateSpy = vi
-        .spyOn(User.prototype, '$beforeUpdate')
-        .mockResolvedValue();
-
-      const user = await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-      });
-
-      await user.$query().patch({ fullName: 'Updated user name' });
-
-      expect(superBeforeUpdateSpy).toHaveBeenCalledOnce();
-    });
-
-    it('should lowercase the user email if given', async () => {
-      const user = await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-      });
-
-      await user.$query().patchAndFetch({ email: 'NEW_EMAIL@AUTOMATISCH.IO' });
-
-      expect(user.email).toBe('new_email@automatisch.io');
-    });
-
-    it('should generate password hash', async () => {
-      const user = await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-        password: 'sample-password',
-      });
-
-      await user.$query().patchAndFetch({ password: 'new-password' });
-
-      expect(user.password).not.toBe('new-password');
-      expect(await user.login('new-password')).toBe(true);
-    });
-  });
-
-  describe('$afterInsert', () => {
-    it('should call super.$afterInsert', async () => {
-      const superAfterInsertSpy = vi.spyOn(User.prototype, '$afterInsert');
-
-      await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-      });
-
-      expect(superAfterInsertSpy).toHaveBeenCalledOnce();
-    });
-
-    it('should call createUsageData', async () => {
-      const createUsageDataSpy = vi.spyOn(User.prototype, 'createUsageData');
-
-      await createUser({
-        fullName: 'Sample user',
-        email: 'user@automatisch.io',
-      });
-
-      expect(createUsageDataSpy).toHaveBeenCalledOnce();
-    });
-  });
-
-  it('$afterFind should invoke omitEnterprisePermissionsWithoutValidLicense method', async () => {
-    const omitEnterprisePermissionsWithoutValidLicenseSpy = vi.spyOn(
-      User.prototype,
-      'omitEnterprisePermissionsWithoutValidLicense'
-    );
-
-    await createUser({
-      fullName: 'Sample user',
-      email: 'user@automatisch.io',
-    });
-
-    expect(
-      omitEnterprisePermissionsWithoutValidLicenseSpy
-    ).toHaveBeenCalledOnce();
-  });
 });

packages/backend/src/queues/action.js

@@ -11,6 +11,10 @@ const redisConnection = {
 
 const actionQueue = new Queue('action', redisConnection);
 
+process.on('SIGTERM', async () => {
+  await actionQueue.close();
+});
+
 actionQueue.on('error', (error) => {
   if (error.code === CONNECTION_REFUSED) {
     logger.error(

packages/backend/src/queues/delete-user.ee.js

@@ -11,6 +11,10 @@ const redisConnection = {
 
 const deleteUserQueue = new Queue('delete-user', redisConnection);
 
+process.on('SIGTERM', async () => {
+  await deleteUserQueue.close();
+});
+
 deleteUserQueue.on('error', (error) => {
   if (error.code === CONNECTION_REFUSED) {
     logger.error(

packages/backend/src/queues/email.js

@@ -11,6 +11,10 @@ const redisConnection = {
 
 const emailQueue = new Queue('email', redisConnection);
 
+process.on('SIGTERM', async () => {
+  await emailQueue.close();
+});
+
 emailQueue.on('error', (error) => {
   if (error.code === CONNECTION_REFUSED) {
     logger.error(

packages/backend/src/queues/flow.js

@@ -11,6 +11,10 @@ const redisConnection = {
 
 const flowQueue = new Queue('flow', redisConnection);
 
+process.on('SIGTERM', async () => {
+  await flowQueue.close();
+});
+
 flowQueue.on('error', (error) => {
   if (error.code === CONNECTION_REFUSED) {
     logger.error(

packages/backend/src/queues/index.js

@@ -1,21 +0,0 @@
-import appConfig from '../config/app.js';
-import actionQueue from './action.js';
-import emailQueue from './email.js';
-import flowQueue from './flow.js';
-import triggerQueue from './trigger.js';
-import deleteUserQueue from './delete-user.ee.js';
-import removeCancelledSubscriptionsQueue from './remove-cancelled-subscriptions.ee.js';
-
-const queues = [
-  actionQueue,
-  emailQueue,
-  flowQueue,
-  triggerQueue,
-  deleteUserQueue,
-];
-
-if (appConfig.isCloud) {
-  queues.push(removeCancelledSubscriptionsQueue);
-}
-
-export default queues;

packages/backend/src/queues/remove-cancelled-subscriptions.ee.js

@@ -14,6 +14,10 @@ const removeCancelledSubscriptionsQueue = new Queue(
   redisConnection
 );
 
+process.on('SIGTERM', async () => {
+  await removeCancelledSubscriptionsQueue.close();
+});
+
 removeCancelledSubscriptionsQueue.on('error', (error) => {
   if (error.code === CONNECTION_REFUSED) {
     logger.error(

packages/backend/src/queues/trigger.js

@@ -11,6 +11,10 @@ const redisConnection = {
 
 const triggerQueue = new Queue('trigger', redisConnection);
 
+process.on('SIGTERM', async () => {
+  await triggerQueue.close();
+});
+
 triggerQueue.on('error', (error) => {
   if (error.code === CONNECTION_REFUSED) {
     logger.error(

packages/backend/src/serializers/index.js

@@ -26,7 +26,7 @@ const serializers = {
   Permission: permissionSerializer,
   AdminSamlAuthProvider: adminSamlAuthProviderSerializer,
   SamlAuthProvider: samlAuthProviderSerializer,
-  RoleMapping: samlAuthProviderRoleMappingSerializer,
+  SamlAuthProvidersRoleMapping: samlAuthProviderRoleMappingSerializer,
   AppAuthClient: appAuthClientSerializer,
   AppConfig: appConfigSerializer,
   Flow: flowSerializer,

packages/backend/src/worker.js

@@ -1,22 +1,20 @@
 import * as Sentry from './helpers/sentry.ee.js';
-import process from 'node:process';
+import appConfig from './config/app.js';
 
 Sentry.init();
 
 import './config/orm.js';
 import './helpers/check-worker-readiness.js';
-import queues from './queues/index.js';
+import './workers/flow.js';
-import workers from './workers/index.js';
+import './workers/trigger.js';
+import './workers/action.js';
+import './workers/email.js';
+import './workers/delete-user.ee.js';
 
-process.on('SIGTERM', async () => {
+if (appConfig.isCloud) {
-  for (const queue of queues) {
+  import('./workers/remove-cancelled-subscriptions.ee.js');
-    await queue.close();
+  import('./queues/remove-cancelled-subscriptions.ee.js');
-  }
+}
-
-  for (const worker of workers) {
-    await worker.close();
-  }
-});
 
 import telemetry from './helpers/telemetry/index.js';
 

packages/backend/src/workers/action.js

@@ -1,4 +1,5 @@
 import { Worker } from 'bullmq';
+import process from 'node:process';
 
 import * as Sentry from '../helpers/sentry.ee.js';
 import redisConfig from '../config/redis.js';
@@ -14,7 +15,7 @@ import delayAsMilliseconds from '../helpers/delay-as-milliseconds.js';
 
 const DEFAULT_DELAY_DURATION = 0;
 
-const actionWorker = new Worker(
+export const worker = new Worker(
   'action',
   async (job) => {
     const { stepId, flowId, executionId, computedParameters, executionStep } =
@@ -54,11 +55,11 @@ const actionWorker = new Worker(
   { connection: redisConfig }
 );
 
-actionWorker.on('completed', (job) => {
+worker.on('completed', (job) => {
   logger.info(`JOB ID: ${job.id} - FLOW ID: ${job.data.flowId} has started!`);
 });
 
-actionWorker.on('failed', (job, err) => {
+worker.on('failed', (job, err) => {
   const errorMessage = `
     JOB ID: ${job.id} - FLOW ID: ${job.data.flowId} has failed to start with ${err.message}
     \n ${err.stack}
@@ -73,4 +74,6 @@ actionWorker.on('failed', (job, err) => {
   });
 });
 
-export default actionWorker;
+process.on('SIGTERM', async () => {
+  await worker.close();
+});

packages/backend/src/workers/delete-user.ee.js

@@ -1,4 +1,5 @@
 import { Worker } from 'bullmq';
+import process from 'node:process';
 
 import * as Sentry from '../helpers/sentry.ee.js';
 import redisConfig from '../config/redis.js';
@@ -7,7 +8,7 @@ import appConfig from '../config/app.js';
 import User from '../models/user.js';
 import ExecutionStep from '../models/execution-step.js';
 
-const deleteUserWorker = new Worker(
+export const worker = new Worker(
   'delete-user',
   async (job) => {
     const { id } = job.data;
@@ -45,13 +46,13 @@ const deleteUserWorker = new Worker(
   { connection: redisConfig }
 );
 
-deleteUserWorker.on('completed', (job) => {
+worker.on('completed', (job) => {
   logger.info(
     `JOB ID: ${job.id} - The user with the ID of '${job.data.id}' has been deleted!`
   );
 });
 
-deleteUserWorker.on('failed', (job, err) => {
+worker.on('failed', (job, err) => {
   const errorMessage = `
     JOB ID: ${job.id} - The user with the ID of '${job.data.id}' has failed to be deleted! ${err.message}
     \n ${err.stack}
@@ -66,4 +67,6 @@ deleteUserWorker.on('failed', (job, err) => {
   });
 });
 
-export default deleteUserWorker;
+process.on('SIGTERM', async () => {
+  await worker.close();
+});

packages/backend/src/workers/email.js

@@ -1,4 +1,5 @@
 import { Worker } from 'bullmq';
+import process from 'node:process';
 
 import * as Sentry from '../helpers/sentry.ee.js';
 import redisConfig from '../config/redis.js';
@@ -15,7 +16,7 @@ const isAutomatischEmail = (email) => {
   return email.endsWith('@automatisch.io');
 };
 
-const emailWorker = new Worker(
+export const worker = new Worker(
   'email',
   async (job) => {
     const { email, subject, template, params } = job.data;
@@ -38,13 +39,13 @@ const emailWorker = new Worker(
   { connection: redisConfig }
 );
 
-emailWorker.on('completed', (job) => {
+worker.on('completed', (job) => {
   logger.info(
     `JOB ID: ${job.id} - ${job.data.subject} email sent to ${job.data.email}!`
   );
 });
 
-emailWorker.on('failed', (job, err) => {
+worker.on('failed', (job, err) => {
   const errorMessage = `
     JOB ID: ${job.id} - ${job.data.subject} email to ${job.data.email} has failed to send with ${err.message}
     \n ${err.stack}
@@ -59,4 +60,6 @@ emailWorker.on('failed', (job, err) => {
   });
 });
 
-export default emailWorker;
+process.on('SIGTERM', async () => {
+  await worker.close();
+});

packages/backend/src/workers/flow.js

@@ -1,4 +1,5 @@
 import { Worker } from 'bullmq';
+import process from 'node:process';
 
 import * as Sentry from '../helpers/sentry.ee.js';
 import redisConfig from '../config/redis.js';
@@ -12,7 +13,7 @@ import {
   REMOVE_AFTER_7_DAYS_OR_50_JOBS,
 } from '../helpers/remove-job-configuration.js';
 
-const flowWorker = new Worker(
+export const worker = new Worker(
   'flow',
   async (job) => {
     const { flowId } = job.data;
@@ -63,11 +64,11 @@ const flowWorker = new Worker(
   { connection: redisConfig }
 );
 
-flowWorker.on('completed', (job) => {
+worker.on('completed', (job) => {
   logger.info(`JOB ID: ${job.id} - FLOW ID: ${job.data.flowId} has started!`);
 });
 
-flowWorker.on('failed', async (job, err) => {
+worker.on('failed', async (job, err) => {
   const errorMessage = `
     JOB ID: ${job.id} - FLOW ID: ${job.data.flowId} has failed to start with ${err.message}
     \n ${err.stack}
@@ -94,4 +95,6 @@ flowWorker.on('failed', async (job, err) => {
   });
 });
 
-export default flowWorker;
+process.on('SIGTERM', async () => {
+  await worker.close();
+});

packages/backend/src/workers/index.js

@@ -1,21 +0,0 @@
-import appConfig from '../config/app.js';
-import actionWorker from './action.js';
-import emailWorker from './email.js';
-import flowWorker from './flow.js';
-import triggerWorker from './trigger.js';
-import deleteUserWorker from './delete-user.ee.js';
-import removeCancelledSubscriptionsWorker from './remove-cancelled-subscriptions.ee.js';
-
-const workers = [
-  actionWorker,
-  emailWorker,
-  flowWorker,
-  triggerWorker,
-  deleteUserWorker,
-];
-
-if (appConfig.isCloud) {
-  workers.push(removeCancelledSubscriptionsWorker);
-}
-
-export default workers;

packages/backend/src/workers/remove-cancelled-subscriptions.ee.js

@@ -1,11 +1,12 @@
 import { Worker } from 'bullmq';
+import process from 'node:process';
 import { DateTime } from 'luxon';
 import * as Sentry from '../helpers/sentry.ee.js';
 import redisConfig from '../config/redis.js';
 import logger from '../helpers/logger.js';
 import Subscription from '../models/subscription.ee.js';
 
-const removeCancelledSubscriptionsWorker = new Worker(
+export const worker = new Worker(
   'remove-cancelled-subscriptions',
   async () => {
     await Subscription.query()
@@ -22,13 +23,13 @@ const removeCancelledSubscriptionsWorker = new Worker(
   { connection: redisConfig }
 );
 
-removeCancelledSubscriptionsWorker.on('completed', (job) => {
+worker.on('completed', (job) => {
   logger.info(
     `JOB ID: ${job.id} - The cancelled subscriptions have been removed!`
   );
 });
 
-removeCancelledSubscriptionsWorker.on('failed', (job, err) => {
+worker.on('failed', (job, err) => {
   const errorMessage = `
     JOB ID: ${job.id} - ERROR: The cancelled subscriptions can not be removed! ${err.message}
     \n ${err.stack}
@@ -41,4 +42,6 @@ removeCancelledSubscriptionsWorker.on('failed', (job, err) => {
   });
 });
 
-export default removeCancelledSubscriptionsWorker;
+process.on('SIGTERM', async () => {
+  await worker.close();
+});

packages/backend/src/workers/trigger.js

@@ -1,4 +1,5 @@
 import { Worker } from 'bullmq';
+import process from 'node:process';
 
 import * as Sentry from '../helpers/sentry.ee.js';
 import redisConfig from '../config/redis.js';
@@ -11,7 +12,7 @@ import {
   REMOVE_AFTER_7_DAYS_OR_50_JOBS,
 } from '../helpers/remove-job-configuration.js';
 
-const triggerWorker = new Worker(
+export const worker = new Worker(
   'trigger',
   async (job) => {
     const { flowId, executionId, stepId, executionStep } = await processTrigger(
@@ -40,11 +41,11 @@ const triggerWorker = new Worker(
   { connection: redisConfig }
 );
 
-triggerWorker.on('completed', (job) => {
+worker.on('completed', (job) => {
   logger.info(`JOB ID: ${job.id} - FLOW ID: ${job.data.flowId} has started!`);
 });
 
-triggerWorker.on('failed', (job, err) => {
+worker.on('failed', (job, err) => {
   const errorMessage = `
     JOB ID: ${job.id} - FLOW ID: ${job.data.flowId} has failed to start with ${err.message}
     \n ${err.stack}
@@ -59,4 +60,6 @@ triggerWorker.on('failed', (job, err) => {
   });
 });
 
-export default triggerWorker;
+process.on('SIGTERM', async () => {
+  await worker.close();
+});

packages/backend/test/factories/role-mapping.js

@@ -1,15 +1,16 @@
-import { faker } from '@faker-js/faker';
 import { createRole } from './role.js';
-import RoleMapping from '../../src/models/role-mapping.ee.js';
 import { createSamlAuthProvider } from './saml-auth-provider.ee.js';
+import SamlAuthProviderRoleMapping from '../../src/models/saml-auth-providers-role-mapping.ee.js';
 
 export const createRoleMapping = async (params = {}) => {
-  params.roleId = params.roleId || (await createRole()).id;
+  params.roleId = params?.roleId || (await createRole()).id;
   params.samlAuthProviderId =
-    params.samlAuthProviderId || (await createSamlAuthProvider()).id;
+    params?.samlAuthProviderId || (await createSamlAuthProvider()).id;
-  params.remoteRoleName = params.remoteRoleName || faker.person.jobType();
 
-  const roleMapping = await RoleMapping.query().insertAndFetch(params);
+  params.remoteRoleName = params?.remoteRoleName || 'User';
 
-  return roleMapping;
+  const samlAuthProviderRoleMapping =
+    await SamlAuthProviderRoleMapping.query().insertAndFetch(params);
+
+  return samlAuthProviderRoleMapping;
 };

packages/backend/test/factories/saml-auth-providers-role-mapping.js

@@ -0,0 +1,16 @@
+import { faker } from '@faker-js/faker';
+import { createRole } from './role.js';
+import SamlAuthProvidersRoleMapping from '../../src/models/saml-auth-providers-role-mapping.ee.js';
+import { createSamlAuthProvider } from './saml-auth-provider.ee.js';
+
+export const createSamlAuthProvidersRoleMapping = async (params = {}) => {
+  params.roleId = params.roleId || (await createRole()).id;
+  params.samlAuthProviderId =
+    params.samlAuthProviderId || (await createSamlAuthProvider()).id;
+  params.remoteRoleName = params.remoteRoleName || faker.person.jobType();
+
+  const samlAuthProvider =
+    await SamlAuthProvidersRoleMapping.query().insertAndFetch(params);
+
+  return samlAuthProvider;
+};

packages/backend/test/mocks/rest/api/v1/admin/saml-auth-providers/get-role-mappings.ee.js

@@ -15,7 +15,7 @@ const getRoleMappingsMock = async (roleMappings) => {
       currentPage: null,
       isArray: true,
       totalPages: null,
-      type: 'RoleMapping',
+      type: 'SamlAuthProvidersRoleMapping',
     },
   };
 };

packages/backend/test/mocks/rest/api/v1/admin/saml-auth-providers/update-role-mappings.ee.js

@@ -15,7 +15,7 @@ const createRoleMappingsMock = async (roleMappings) => {
       currentPage: null,
       isArray: true,
       totalPages: null,
-      type: 'RoleMapping',
+      type: 'SamlAuthProvidersRoleMapping',
     },
   };
 };

packages/e2e-tests/fixtures/admin/create-user-page.js

@@ -1,5 +1,3 @@
-const { expect } = require('@playwright/test');
-
 const { faker } = require('@faker-js/faker');
 const { AuthenticatedPage } = require('../authenticated-page');
 
@@ -13,17 +11,11 @@ export class AdminCreateUserPage extends AuthenticatedPage {
     super(page);
     this.fullNameInput = page.getByTestId('full-name-input');
     this.emailInput = page.getByTestId('email-input');
-    this.roleInput = page.getByTestId('roleId-autocomplete');
+    this.roleInput = page.getByTestId('role.id-autocomplete');
     this.createButton = page.getByTestId('create-button');
     this.pageTitle = page.getByTestId('create-user-title');
-    this.invitationEmailInfoAlert = page.getByTestId(
+    this.invitationEmailInfoAlert = page.getByTestId('invitation-email-info-alert');
-      'invitation-email-info-alert'
+    this.acceptInvitationLink = page.getByTestId('invitation-email-info-alert').getByRole('link');
-    );
-    this.acceptInvitationLink = page
-      .getByTestId('invitation-email-info-alert')
-      .getByRole('link');
-    this.createUserSuccessAlert = page.getByTestId('create-user-success-alert');
-    this.fieldError = page.locator('p[id$="-helper-text"]');
   }
 
   seed(seed) {
@@ -36,8 +28,4 @@ export class AdminCreateUserPage extends AuthenticatedPage {
       email: faker.internet.email().toLowerCase(),
     };
   }
-
-  async expectCreateUserSuccessAlertToBeVisible() {
-    await expect(this.createUserSuccessAlert).toBeVisible();
-  }
 }

packages/e2e-tests/tests/admin/manage-roles.spec.js

@@ -35,8 +35,9 @@ test.describe('Role management page', () => {
       await adminCreateRolePage.closeSnackbar();
     });
 
-    let roleRow =
+    let roleRow = await test.step(
-      await test.step('Make sure role data is correct', async () => {
+      'Make sure role data is correct',
+      async () => {
         const roleRow = await adminRolesPage.getRoleRowByName(
           'Create Edit Test'
         );
@@ -47,7 +48,8 @@ test.describe('Role management page', () => {
         await expect(roleData.canEdit).toBe(true);
         await expect(roleData.canDelete).toBe(true);
         return roleRow;
-      });
+      }
+    );
 
     await test.step('Edit the role', async () => {
       await adminRolesPage.clickEditRole(roleRow);
@@ -65,8 +67,9 @@ test.describe('Role management page', () => {
       await adminEditRolePage.closeSnackbar();
     });
 
-    roleRow =
+    roleRow = await test.step(
-      await test.step('Make sure changes reflected on roles page', async () => {
+      'Make sure changes reflected on roles page',
+      async () => {
         await adminRolesPage.isMounted();
         const roleRow = await adminRolesPage.getRoleRowByName(
           'Create Update Test'
@@ -78,7 +81,8 @@ test.describe('Role management page', () => {
         await expect(roleData.canEdit).toBe(true);
         await expect(roleData.canDelete).toBe(true);
         return roleRow;
-      });
+      }
+    );
 
     await test.step('Delete the role', async () => {
       await adminRolesPage.clickDeleteRole(roleRow);
@@ -180,39 +184,49 @@ test.describe('Role management page', () => {
       await expect(snackbar.variant).toBe('success');
       await adminCreateRolePage.closeSnackbar();
     });
-    await test.step('Create a new user with the "Delete Role" role', async () => {
+    await test.step(
-      await adminUsersPage.navigateTo();
+      'Create a new user with the "Delete Role" role',
-      await adminUsersPage.createUserButton.click();
+      async () => {
-      await adminCreateUserPage.fullNameInput.fill('User Role Test');
+        await adminUsersPage.navigateTo();
-      await adminCreateUserPage.emailInput.fill(
+        await adminUsersPage.createUserButton.click();
-        'user-role-test@automatisch.io'
+        await adminCreateUserPage.fullNameInput.fill('User Role Test');
-      );
+        await adminCreateUserPage.emailInput.fill(
-      await adminCreateUserPage.roleInput.click();
+          'user-role-test@automatisch.io'
-      await adminCreateUserPage.page
+        );
-        .getByRole('option', { name: 'Delete Role', exact: true })
+        await adminCreateUserPage.roleInput.click();
-        .click();
+        await adminCreateUserPage.page
-      await adminCreateUserPage.createButton.click();
+          .getByRole('option', { name: 'Delete Role', exact: true })
-      await adminCreateUserPage.invitationEmailInfoAlert.waitFor({
+          .click();
-        state: 'attached',
+        await adminCreateUserPage.createButton.click();
-      });
+        await adminCreateUserPage.snackbar.waitFor({
-      await adminCreateUserPage.expectCreateUserSuccessAlertToBeVisible();
+          state: 'attached',
-    });
+        });
-
+        await adminCreateUserPage.invitationEmailInfoAlert.waitFor({
-    await test.step('Try to delete "Delete Role" role when new user has it', async () => {
+          state: 'attached',
-      await adminRolesPage.navigateTo();
+        });
-      const row = await adminRolesPage.getRoleRowByName('Delete Role');
+        const snackbar = await adminUsersPage.getSnackbarData(
-      const modal = await adminRolesPage.clickDeleteRole(row);
+          'snackbar-create-user-success'
-      await modal.deleteButton.click();
+        );
-      await adminRolesPage.snackbar.waitFor({
+        await expect(snackbar.variant).toBe('success');
-        state: 'attached',
+        await adminUsersPage.closeSnackbar();
-      });
+      }
-      const snackbar = await adminRolesPage.getSnackbarData(
+    );
-        'snackbar-delete-role-error'
+    await test.step(
-      );
+      'Try to delete "Delete Role" role when new user has it',
-      await expect(snackbar.variant).toBe('error');
+      async () => {
-      await adminRolesPage.closeSnackbar();
+        await adminRolesPage.navigateTo();
-      await modal.close();
+        const row = await adminRolesPage.getRoleRowByName('Delete Role');
-    });
+        const modal = await adminRolesPage.clickDeleteRole(row);
+        await modal.deleteButton.click();
+        await adminRolesPage.snackbar.waitFor({
+          state: 'attached',
+        });
+        const snackbar = await adminRolesPage.getSnackbarData('snackbar-delete-role-error');
+        await expect(snackbar.variant).toBe('error');
+        await adminRolesPage.closeSnackbar();
+        await modal.close();
+      }
+    );
     await test.step('Change the role the user has', async () => {
       await adminUsersPage.navigateTo();
       await adminUsersPage.usersLoader.waitFor({
@@ -287,16 +301,24 @@ test.describe('Role management page', () => {
         .getByRole('option', { name: 'Cannot Delete Role' })
         .click();
       await adminCreateUserPage.createButton.click();
+      await adminCreateUserPage.snackbar.waitFor({
+        state: 'attached',
+      });
       await adminCreateUserPage.invitationEmailInfoAlert.waitFor({
         state: 'attached',
       });
-      await adminCreateUserPage.expectCreateUserSuccessAlertToBeVisible();
+      const snackbar = await adminCreateUserPage.getSnackbarData(
+        'snackbar-create-user-success'
+      );
+      await expect(snackbar.variant).toBe('success');
+      await adminCreateUserPage.closeSnackbar();
     });
     await test.step('Delete this user', async () => {
       await adminUsersPage.navigateTo();
       const row = await adminUsersPage.findUserPageWithEmail(
         'user-delete-role-test@automatisch.io'
       );
+      // await test.waitForTimeout(10000);
       const modal = await adminUsersPage.clickDeleteUser(row);
       await modal.deleteButton.click();
       await adminUsersPage.snackbar.waitFor({
@@ -363,10 +385,17 @@ test('Accessibility of role management page', async ({
       .getByRole('option', { name: 'Basic Test' })
       .click();
     await adminCreateUserPage.createButton.click();
+    await adminCreateUserPage.snackbar.waitFor({
+      state: 'attached',
+    });
     await adminCreateUserPage.invitationEmailInfoAlert.waitFor({
       state: 'attached',
     });
-    await adminCreateUserPage.expectCreateUserSuccessAlertToBeVisible();
+    const snackbar = await adminCreateUserPage.getSnackbarData(
+      'snackbar-create-user-success'
+    );
+    await expect(snackbar.variant).toBe('success');
+    await adminCreateUserPage.closeSnackbar();
   });
 
   await test.step('Logout and login to the basic role user', async () => {
@@ -380,35 +409,42 @@ test('Accessibility of role management page', async ({
     await page.getByTestId('logout-item').click();
 
     const acceptInvitationPage = new AcceptInvitation(page);
+
     await acceptInvitationPage.open(acceptInvitatonToken);
+
     await acceptInvitationPage.acceptInvitation('sample');
 
     const loginPage = new LoginPage(page);
+
+    // await loginPage.isMounted();
     await loginPage.login('basic-role-test@automatisch.io', 'sample');
     await expect(loginPage.loginButton).not.toBeVisible();
     await expect(page).toHaveURL('/flows');
   });
 
-  await test.step('Navigate to the admin settings page and make sure it is blank', async () => {
+  await test.step(
-    const pageUrl = new URL(page.url());
+    'Navigate to the admin settings page and make sure it is blank',
-    const url = `${pageUrl.origin}/admin-settings/users`;
+    async () => {
-    await page.goto(url);
+      const pageUrl = new URL(page.url());
-    await page.waitForTimeout(750);
+      const url = `${pageUrl.origin}/admin-settings/users`;
-    const isUnmounted = await page.evaluate(() => {
+      await page.goto(url);
-      // eslint-disable-next-line no-undef
+      await page.waitForTimeout(750);
-      const root = document.querySelector('#root');
+      const isUnmounted = await page.evaluate(() => {
+        // eslint-disable-next-line no-undef
+        const root = document.querySelector('#root');
 
-      if (root) {
+        if (root) {
-        // We have react query devtools only in dev env.
+          // We have react query devtools only in dev env.
-        // In production, there is nothing in root.
+          // In production, there is nothing in root.
-        // That's why `<= 1`.
+          // That's why `<= 1`.
-        return root.children.length <= 1;
+          return root.children.length <= 1;
-      }
+        }
 
-      return false;
+        return false;
-    });
+      });
-    await expect(isUnmounted).toBe(true);
+      await expect(isUnmounted).toBe(true);
-  });
+    }
+  );
 
   await test.step('Log back into the admin account', async () => {
     await page.goto('/');

packages/e2e-tests/tests/admin/manage-users.spec.js

@@ -5,221 +5,281 @@ const { test, expect } = require('../../fixtures/index');
  * otherwise tests will fail since users are only *soft*-deleted
  */
 test.describe('User management page', () => {
+
   test.beforeEach(async ({ adminUsersPage }) => {
     await adminUsersPage.navigateTo();
     await adminUsersPage.closeSnackbar();
   });
 
-  test('User creation and deletion process', async ({
+  test(
-    adminCreateUserPage,
+    'User creation and deletion process',
-    adminEditUserPage,
+    async ({ adminCreateUserPage, adminEditUserPage, adminUsersPage }) => {
-    adminUsersPage,
+      adminCreateUserPage.seed(9000);
-  }) => {
+      const user = adminCreateUserPage.generateUser();
-    adminCreateUserPage.seed(9000);
+      await adminUsersPage.usersLoader.waitFor({
-    const user = adminCreateUserPage.generateUser();
+        state: 'detached' /* Note: state: 'visible' introduces flakiness
-    await adminUsersPage.usersLoader.waitFor({
-      state: 'detached' /* Note: state: 'visible' introduces flakiness
         because visibility: hidden is used as part of the state transition in
         notistack, see
         https://github.com/iamhosseindhv/notistack/blob/122f47057eb7ce5a1abfe923316cf8475303e99a/src/transitions/Collapse/Collapse.tsx#L110
-        */,
+        */
-    });
-    await test.step('Create a user', async () => {
-      await adminUsersPage.createUserButton.click();
-      await adminCreateUserPage.fullNameInput.fill(user.fullName);
-      await adminCreateUserPage.emailInput.fill(user.email);
-      await adminCreateUserPage.roleInput.click();
-      await adminCreateUserPage.page
-        .getByRole('option', { name: 'Admin' })
-        .click();
-      await adminCreateUserPage.createButton.click();
-      await adminCreateUserPage.invitationEmailInfoAlert.waitFor({
-        state: 'attached',
       });
+      await test.step(
+        'Create a user',
+        async () => {
+          await adminUsersPage.createUserButton.click();
+          await adminCreateUserPage.fullNameInput.fill(user.fullName);
+          await adminCreateUserPage.emailInput.fill(user.email);
+          await adminCreateUserPage.roleInput.click();
+          await adminCreateUserPage.page.getByRole(
+            'option', { name: 'Admin' }
+          ).click();
+          await adminCreateUserPage.createButton.click();
+          await adminCreateUserPage.invitationEmailInfoAlert.waitFor({
+            state: 'attached'
+          });
 
-      await adminCreateUserPage.expectCreateUserSuccessAlertToBeVisible();
+          const snackbar = await adminUsersPage.getSnackbarData(
-      await adminUsersPage.navigateTo();
+            'snackbar-create-user-success'
-    });
+          );
-    await test.step('Check the user exists with the expected properties', async () => {
+          await expect(snackbar.variant).toBe('success');
-      await adminUsersPage.findUserPageWithEmail(user.email);
+          await adminUsersPage.navigateTo();
-      const userRow = await adminUsersPage.getUserRowByEmail(user.email);
+          await adminUsersPage.closeSnackbar();
-      const data = await adminUsersPage.getRowData(userRow);
+        }
-      await expect(data.email).toBe(user.email);
-      await expect(data.fullName).toBe(user.fullName);
-      await expect(data.role).toBe('Admin');
-    });
-    await test.step('Edit user info and make sure the edit works correctly', async () => {
-      await adminUsersPage.findUserPageWithEmail(user.email);
-
-      let userRow = await adminUsersPage.getUserRowByEmail(user.email);
-      await adminUsersPage.clickEditUser(userRow);
-      await adminEditUserPage.waitForLoad(user.fullName);
-      const newUserInfo = adminEditUserPage.generateUser();
-      await adminEditUserPage.fullNameInput.fill(newUserInfo.fullName);
-      await adminEditUserPage.updateButton.click();
-
-      const snackbar = await adminUsersPage.getSnackbarData(
-        'snackbar-edit-user-success'
       );
-      await expect(snackbar.variant).toBe('success');
+      await test.step(
-      await adminUsersPage.closeSnackbar();
+        'Check the user exists with the expected properties',
-
+        async () => {
-      await adminUsersPage.findUserPageWithEmail(user.email);
+          await adminUsersPage.findUserPageWithEmail(user.email);
-      userRow = await adminUsersPage.getUserRowByEmail(user.email);
+          const userRow = await adminUsersPage.getUserRowByEmail(user.email);
-      const rowData = await adminUsersPage.getRowData(userRow);
+          const data = await adminUsersPage.getRowData(userRow);
-      await expect(rowData.fullName).toBe(newUserInfo.fullName);
+          await expect(data.email).toBe(user.email);
-    });
+          await expect(data.fullName).toBe(user.fullName);
-    await test.step('Delete user and check the page confirms this deletion', async () => {
+          await expect(data.role).toBe('Admin');
-      await adminUsersPage.findUserPageWithEmail(user.email);
+        }
-      const userRow = await adminUsersPage.getUserRowByEmail(user.email);
-      await adminUsersPage.clickDeleteUser(userRow);
-      const modal = adminUsersPage.deleteUserModal;
-      await modal.deleteButton.click();
-
-      const snackbar = await adminUsersPage.getSnackbarData(
-        'snackbar-delete-user-success'
       );
-      await expect(snackbar.variant).toBe('success');
+      await test.step(
-      await adminUsersPage.closeSnackbar();
+        'Edit user info and make sure the edit works correctly',
-      await expect(userRow).not.toBeVisible(false);
+        async () => {
-    });
+          await adminUsersPage.findUserPageWithEmail(user.email);
-  });
 
-  test('Creating a user which has been deleted', async ({
+          let userRow = await adminUsersPage.getUserRowByEmail(user.email);
-    adminCreateUserPage,
+          await adminUsersPage.clickEditUser(userRow);
-    adminUsersPage,
+          await adminEditUserPage.waitForLoad(user.fullName);
-  }) => {
+          const newUserInfo = adminEditUserPage.generateUser();
-    adminCreateUserPage.seed(9100);
+          await adminEditUserPage.fullNameInput.fill(newUserInfo.fullName);
-    const testUser = adminCreateUserPage.generateUser();
+          await adminEditUserPage.updateButton.click();
 
-    await test.step('Create the test user', async () => {
+          const snackbar = await adminUsersPage.getSnackbarData(
-      await adminUsersPage.navigateTo();
+            'snackbar-edit-user-success'
-      await adminUsersPage.createUserButton.click();
+          );
-      await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
+          await expect(snackbar.variant).toBe('success');
-      await adminCreateUserPage.emailInput.fill(testUser.email);
+          await adminUsersPage.closeSnackbar();
-      await adminCreateUserPage.roleInput.click();
-      await adminCreateUserPage.page
-        .getByRole('option', { name: 'Admin' })
-        .click();
-      await adminCreateUserPage.createButton.click();
-      await adminCreateUserPage.expectCreateUserSuccessAlertToBeVisible();
-    });
 
-    await test.step('Delete the created user', async () => {
+          await adminUsersPage.findUserPageWithEmail(user.email);
-      await adminUsersPage.navigateTo();
+          userRow = await adminUsersPage.getUserRowByEmail(user.email);
-      await adminUsersPage.findUserPageWithEmail(testUser.email);
+          const rowData = await adminUsersPage.getRowData(userRow);
-      const userRow = await adminUsersPage.getUserRowByEmail(testUser.email);
+          await expect(rowData.fullName).toBe(newUserInfo.fullName);
-      await adminUsersPage.clickDeleteUser(userRow);
+        }
-      const modal = adminUsersPage.deleteUserModal;
+      );
-      await modal.deleteButton.click();
+      await test.step(
-      const snackbar = await adminUsersPage.getSnackbarData(
+        'Delete user and check the page confirms this deletion',
-        'snackbar-delete-user-success'
+        async () => {
+          await adminUsersPage.findUserPageWithEmail(user.email);
+          const userRow = await adminUsersPage.getUserRowByEmail(user.email);
+          await adminUsersPage.clickDeleteUser(userRow);
+          const modal = adminUsersPage.deleteUserModal;
+          await modal.deleteButton.click();
+
+          const snackbar = await adminUsersPage.getSnackbarData(
+            'snackbar-delete-user-success'
+          );
+          await expect(snackbar.variant).toBe('success');
+          await adminUsersPage.closeSnackbar();
+          await expect(userRow).not.toBeVisible(false);
+        }
       );
-      await expect(snackbar).not.toBeNull();
-      await expect(snackbar.variant).toBe('success');
-      await adminUsersPage.closeSnackbar();
-      await expect(userRow).not.toBeVisible(false);
     });
 
-    await test.step('Create the user again', async () => {
+  test(
-      await adminUsersPage.createUserButton.click();
+    'Creating a user which has been deleted',
-      await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
+    async ({ adminCreateUserPage, adminUsersPage }) => {
-      await adminCreateUserPage.emailInput.fill(testUser.email);
+      adminCreateUserPage.seed(9100);
-      await adminCreateUserPage.roleInput.click();
+      const testUser = adminCreateUserPage.generateUser();
-      await adminCreateUserPage.page
-        .getByRole('option', { name: 'Admin' })
-        .click();
-      await adminCreateUserPage.createButton.click();
-      await expect(adminCreateUserPage.fieldError).toHaveCount(1);
-    });
-  });
 
-  test('Creating a user which already exists', async ({
+      await test.step(
-    adminCreateUserPage,
+        'Create the test user',
-    adminUsersPage,
+        async () => {
-    page,
+          await adminUsersPage.navigateTo();
-  }) => {
+          await adminUsersPage.createUserButton.click();
-    adminCreateUserPage.seed(9200);
+          await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
-    const testUser = adminCreateUserPage.generateUser();
+          await adminCreateUserPage.emailInput.fill(testUser.email);
+          await adminCreateUserPage.roleInput.click();
+          await adminCreateUserPage.page.getByRole(
+            'option', { name: 'Admin' }
+          ).click();
+          await adminCreateUserPage.createButton.click();
+          const snackbar = await adminUsersPage.getSnackbarData(
+            'snackbar-create-user-success'
+          );
+          await expect(snackbar.variant).toBe('success');
+          await adminUsersPage.closeSnackbar();
+        }
+      );
 
-    await test.step('Create the test user', async () => {
+      await test.step(
-      await adminUsersPage.createUserButton.click();
+        'Delete the created user',
-      await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
+        async () => {
-      await adminCreateUserPage.emailInput.fill(testUser.email);
+          await adminUsersPage.navigateTo();
-      await adminCreateUserPage.roleInput.click();
+          await adminUsersPage.findUserPageWithEmail(testUser.email);
-      await adminCreateUserPage.page
+          const userRow = await adminUsersPage.getUserRowByEmail(testUser.email);
-        .getByRole('option', { name: 'Admin' })
+          await adminUsersPage.clickDeleteUser(userRow);
-        .click();
+          const modal = adminUsersPage.deleteUserModal;
-      await adminCreateUserPage.createButton.click();
+          await modal.deleteButton.click();
-      await adminCreateUserPage.expectCreateUserSuccessAlertToBeVisible();
+          const snackbar = await adminUsersPage.getSnackbarData(
-    });
+            'snackbar-delete-user-success'
+          );
+          await expect(snackbar).not.toBeNull();
+          await expect(snackbar.variant).toBe('success');
+          await adminUsersPage.closeSnackbar();
+          await expect(userRow).not.toBeVisible(false);
+        }
+      );
 
-    await test.step('Create the user again', async () => {
+      await test.step(
-      await adminUsersPage.navigateTo();
+        'Create the user again',
-      await adminUsersPage.createUserButton.click();
+        async () => {
-      await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
+          await adminUsersPage.createUserButton.click();
-      await adminCreateUserPage.emailInput.fill(testUser.email);
+          await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
-      const createUserPageUrl = page.url();
+          await adminCreateUserPage.emailInput.fill(testUser.email);
-      await adminCreateUserPage.roleInput.click();
+          await adminCreateUserPage.roleInput.click();
-      await adminCreateUserPage.page
+          await adminCreateUserPage.page.getByRole(
-        .getByRole('option', { name: 'Admin' })
+            'option', { name: 'Admin' }
-        .click();
+          ).click();
-      await adminCreateUserPage.createButton.click();
+          await adminCreateUserPage.createButton.click();
+          const snackbar = await adminUsersPage.getSnackbarData('snackbar-error');
+          await expect(snackbar.variant).toBe('error');
+          await adminUsersPage.closeSnackbar();
+        }
+      );
+    }
+  );
 
-      await expect(page.url()).toBe(createUserPageUrl);
+  test(
-      await expect(adminCreateUserPage.fieldError).toHaveCount(1);
+    'Creating a user which already exists',
-    });
+    async ({ adminCreateUserPage, adminUsersPage, page }) => {
-  });
+      adminCreateUserPage.seed(9200);
+      const testUser = adminCreateUserPage.generateUser();
 
-  test('Editing a user to have the same email as another user should not be allowed', async ({
+      await test.step(
-    adminCreateUserPage,
+        'Create the test user',
-    adminEditUserPage,
+        async () => {
-    adminUsersPage,
+          await adminUsersPage.createUserButton.click();
-    page,
+          await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
-  }) => {
+          await adminCreateUserPage.emailInput.fill(testUser.email);
-    adminCreateUserPage.seed(9300);
+          await adminCreateUserPage.roleInput.click();
-    const user1 = adminCreateUserPage.generateUser();
+          await adminCreateUserPage.page.getByRole(
-    const user2 = adminCreateUserPage.generateUser();
+            'option', { name: 'Admin' }
-    await test.step('Create the first user', async () => {
+          ).click();
-      await adminUsersPage.navigateTo();
+          await adminCreateUserPage.createButton.click();
-      await adminUsersPage.createUserButton.click();
+          const snackbar = await adminUsersPage.getSnackbarData(
-      await adminCreateUserPage.fullNameInput.fill(user1.fullName);
+            'snackbar-create-user-success'
-      await adminCreateUserPage.emailInput.fill(user1.email);
+          );
-      await adminCreateUserPage.roleInput.click();
+          await expect(snackbar.variant).toBe('success');
-      await adminCreateUserPage.page
+          await adminUsersPage.closeSnackbar();
-        .getByRole('option', { name: 'Admin' })
+        }
-        .click();
+      );
-      await adminCreateUserPage.createButton.click();
-      await adminCreateUserPage.expectCreateUserSuccessAlertToBeVisible();
-    });
 
-    await test.step('Create the second user', async () => {
+      await test.step(
-      await adminUsersPage.navigateTo();
+        'Create the user again',
-      await adminUsersPage.createUserButton.click();
+        async () => {
-      await adminCreateUserPage.fullNameInput.fill(user2.fullName);
+          await adminUsersPage.navigateTo();
-      await adminCreateUserPage.emailInput.fill(user2.email);
+          await adminUsersPage.createUserButton.click();
-      await adminCreateUserPage.roleInput.click();
+          await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
-      await adminCreateUserPage.page
+          await adminCreateUserPage.emailInput.fill(testUser.email);
-        .getByRole('option', { name: 'Admin' })
+          const createUserPageUrl = page.url();
-        .click();
+          await adminCreateUserPage.roleInput.click();
-      await adminCreateUserPage.createButton.click();
+          await adminCreateUserPage.page.getByRole(
-      await adminCreateUserPage.expectCreateUserSuccessAlertToBeVisible();
+            'option', { name: 'Admin' }
-    });
+          ).click();
+          await adminCreateUserPage.createButton.click();
 
-    await test.step('Try editing the second user to have the email of the first user', async () => {
+          await expect(page.url()).toBe(createUserPageUrl);
-      await adminUsersPage.navigateTo();
+          const snackbar = await adminUsersPage.getSnackbarData('snackbar-error');
-      await adminUsersPage.findUserPageWithEmail(user2.email);
+          await expect(snackbar.variant).toBe('error');
-      let userRow = await adminUsersPage.getUserRowByEmail(user2.email);
+          await adminUsersPage.closeSnackbar();
-      await adminUsersPage.clickEditUser(userRow);
+        }
-      await adminEditUserPage.waitForLoad(user2.fullName);
+      );
-      await adminEditUserPage.emailInput.fill(user1.email);
+    }
-      const editPageUrl = page.url();
+  );
-      await adminEditUserPage.updateButton.click();
 
-      const snackbar = await adminUsersPage.getSnackbarData('snackbar-error');
+  test(
-      await expect(snackbar.variant).toBe('error');
+    'Editing a user to have the same email as another user should not be allowed',
-      await adminUsersPage.closeSnackbar();
+    async ({
-      await expect(page.url()).toBe(editPageUrl);
+      adminCreateUserPage, adminEditUserPage, adminUsersPage, page
-    });
+    }) => {
-  });
+      adminCreateUserPage.seed(9300);
+      const user1 = adminCreateUserPage.generateUser();
+      const user2 = adminCreateUserPage.generateUser();
+      await test.step(
+        'Create the first user',
+        async () => {
+          await adminUsersPage.navigateTo();
+          await adminUsersPage.createUserButton.click();
+          await adminCreateUserPage.fullNameInput.fill(user1.fullName);
+          await adminCreateUserPage.emailInput.fill(user1.email);
+          await adminCreateUserPage.roleInput.click();
+          await adminCreateUserPage.page.getByRole(
+            'option', { name: 'Admin' }
+          ).click();
+          await adminCreateUserPage.createButton.click();
+          const snackbar = await adminUsersPage.getSnackbarData(
+            'snackbar-create-user-success'
+          );
+          await expect(snackbar.variant).toBe('success');
+          await adminUsersPage.closeSnackbar();
+        }
+      );
+
+      await test.step(
+        'Create the second user',
+        async () => {
+          await adminUsersPage.navigateTo();
+          await adminUsersPage.createUserButton.click();
+          await adminCreateUserPage.fullNameInput.fill(user2.fullName);
+          await adminCreateUserPage.emailInput.fill(user2.email);
+          await adminCreateUserPage.roleInput.click();
+          await adminCreateUserPage.page.getByRole(
+            'option', { name: 'Admin' }
+          ).click();
+          await adminCreateUserPage.createButton.click();
+          const snackbar = await adminUsersPage.getSnackbarData(
+            'snackbar-create-user-success'
+          );
+          await expect(snackbar.variant).toBe('success');
+          await adminUsersPage.closeSnackbar();
+        }
+      );
+
+      await test.step(
+        'Try editing the second user to have the email of the first user',
+        async () => {
+          await adminUsersPage.navigateTo();
+          await adminUsersPage.findUserPageWithEmail(user2.email);
+          let userRow = await adminUsersPage.getUserRowByEmail(user2.email);
+          await adminUsersPage.clickEditUser(userRow);
+          await adminEditUserPage.waitForLoad(user2.fullName);
+          await adminEditUserPage.emailInput.fill(user1.email);
+          const editPageUrl = page.url();
+          await adminEditUserPage.updateButton.click();
+
+          const snackbar = await adminUsersPage.getSnackbarData(
+            'snackbar-error'
+          );
+          await expect(snackbar.variant).toBe('error');
+          await adminUsersPage.closeSnackbar();
+          await expect(page.url()).toBe(editPageUrl);
+        }
+      );
+    }
+  );
 });

packages/e2e-tests/tests/flow-editor/create-flow.spec.js

@@ -7,191 +7,198 @@ test('Ensure creating a new flow works', async ({ page }) => {
   );
 });
 
-test('Create a new flow with a Scheduler step then an Ntfy step', async ({
+test(
-  flowEditorPage,
+  'Create a new flow with a Scheduler step then an Ntfy step',
-  page,
+  async ({ flowEditorPage, page }) => {
-}) => {
+    await test.step('create flow', async () => {
-  await test.step('create flow', async () => {
+      await test.step('navigate to new flow page', async () => {
-    await test.step('navigate to new flow page', async () => {
+        await page.getByTestId('create-flow-button').click();
-      await page.getByTestId('create-flow-button').click();
+        await page.waitForURL(
-      await page.waitForURL(
+          /\/editor\/[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}/
-        /\/editor\/[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}/
+        );
-      );
-    });
-
-    await test.step('has two steps by default', async () => {
-      await expect(page.getByTestId('flow-step')).toHaveCount(2);
-    });
-  });
-
-  await test.step('setup Scheduler trigger', async () => {
-    await test.step('choose app and event substep', async () => {
-      await test.step('choose application', async () => {
-        await flowEditorPage.appAutocomplete.click();
-        await page.getByRole('option', { name: 'Scheduler' }).click();
       });
-
+      
-      await test.step('choose and event', async () => {
+      await test.step('has two steps by default', async () => {
-        await expect(flowEditorPage.eventAutocomplete).toBeVisible();
+        await expect(page.getByTestId('flow-step')).toHaveCount(2);
-        await flowEditorPage.eventAutocomplete.click();
-        await page.getByRole('option', { name: 'Every hour' }).click();
-      });
-
-      await test.step('continue to next step', async () => {
-        await flowEditorPage.continueButton.click();
-      });
-
-      await test.step('collapses the substep', async () => {
-        await expect(flowEditorPage.appAutocomplete).not.toBeVisible();
-        await expect(flowEditorPage.eventAutocomplete).not.toBeVisible();
       });
     });
 
-    await test.step('set up a trigger', async () => {
+    await test.step('setup Scheduler trigger', async () => {
-      await test.step('choose "yes" in "trigger on weekends?"', async () => {
+      await test.step('choose app and event substep', async () => {
-        await expect(flowEditorPage.trigger).toBeVisible();
+        await test.step('choose application', async () => {
-        await flowEditorPage.trigger.click();
+          await flowEditorPage.appAutocomplete.click();
-        await page.getByRole('option', { name: 'Yes' }).click();
+          await page
-      });
+            .getByRole('option', { name: 'Scheduler' })
-
+            .click();
-      await test.step('continue to next step', async () => {
-        await flowEditorPage.continueButton.click();
-      });
-
-      await test.step('collapses the substep', async () => {
-        await expect(flowEditorPage.trigger).not.toBeVisible();
-      });
-    });
-
-    await test.step('test trigger', async () => {
-      await test.step('show sample output', async () => {
-        await expect(flowEditorPage.testOutput).not.toBeVisible();
-        await flowEditorPage.continueButton.click();
-        await expect(flowEditorPage.testOutput).toBeVisible();
-        await flowEditorPage.screenshot({
-          path: 'Scheduler trigger test output.png',
         });
-        await flowEditorPage.continueButton.click();
-      });
-    });
-  });
 
-  await test.step('arrange Ntfy action', async () => {
+        await test.step('choose and event', async () => {
-    await test.step('choose app and event substep', async () => {
+          await expect(flowEditorPage.eventAutocomplete).toBeVisible();
-      await test.step('choose application', async () => {
+          await flowEditorPage.eventAutocomplete.click();
-        await flowEditorPage.appAutocomplete.click();
+          await page
-        await page.getByRole('option', { name: 'Ntfy' }).click();
+            .getByRole('option', { name: 'Every hour' })
+            .click();
+        });
+
+        await test.step('continue to next step', async () => {
+          await flowEditorPage.continueButton.click();
+        });
+
+        await test.step('collapses the substep', async () => {
+          await expect(flowEditorPage.appAutocomplete).not.toBeVisible();
+          await expect(flowEditorPage.eventAutocomplete).not.toBeVisible();
+        });
       });
 
-      await test.step('choose an event', async () => {
+      await test.step('set up a trigger', async () => {
-        await expect(flowEditorPage.eventAutocomplete).toBeVisible();
+        await test.step('choose "yes" in "trigger on weekends?"', async () => {
-        await flowEditorPage.eventAutocomplete.click();
+          await expect(flowEditorPage.trigger).toBeVisible();
-        await page.getByRole('option', { name: 'Send message' }).click();
+          await flowEditorPage.trigger.click();
+          await page.getByRole('option', { name: 'Yes' }).click();
+        });
+    
+        await test.step('continue to next step', async () => {
+          await flowEditorPage.continueButton.click();
+        });
+    
+        await test.step('collapses the substep', async () => {
+          await expect(flowEditorPage.trigger).not.toBeVisible();
+        });
       });
 
-      await test.step('continue to next step', async () => {
+      await test.step('test trigger', async () => {
-        await flowEditorPage.continueButton.click();
+        await test.step('show sample output', async () => {
-      });
+          await expect(flowEditorPage.testOutput).not.toBeVisible();
-
+          await flowEditorPage.continueButton.click();
-      await test.step('collapses the substep', async () => {
+          await expect(flowEditorPage.testOutput).toBeVisible();
-        await expect(flowEditorPage.appAutocomplete).not.toBeVisible();
+          await flowEditorPage.screenshot({
-        await expect(flowEditorPage.eventAutocomplete).not.toBeVisible();
+            path: 'Scheduler trigger test output.png',
+          });
+          await flowEditorPage.continueButton.click();
+        });
       });
     });
 
-    await test.step('choose connection substep', async () => {
+    await test.step('arrange Ntfy action', async () => {
-      await test.step('choose connection list item', async () => {
+      await test.step('choose app and event substep', async () => {
-        await flowEditorPage.connectionAutocomplete.click();
+        await test.step('choose application', async () => {
+          await flowEditorPage.appAutocomplete.click();
+          await page.getByRole('option', { name: 'Ntfy' }).click();
+        });
+    
+        await test.step('choose an event', async () => {
+          await expect(flowEditorPage.eventAutocomplete).toBeVisible();
+          await flowEditorPage.eventAutocomplete.click();
+          await page
+            .getByRole('option', { name: 'Send message' })
+            .click();
+        });
+    
+        await test.step('continue to next step', async () => {
+          await flowEditorPage.continueButton.click();
+        });
+    
+        await test.step('collapses the substep', async () => {
+          await expect(flowEditorPage.appAutocomplete).not.toBeVisible();
+          await expect(flowEditorPage.eventAutocomplete).not.toBeVisible();
+        });
+      });
+    
+      await test.step('choose connection substep', async () => {
+        await test.step('choose connection list item', async () => {
+          await flowEditorPage.connectionAutocomplete.click();
+          await page.getByRole('option').first().click();
+        });
+    
+        await test.step('continue to next step', async () => {
+          await flowEditorPage.continueButton.click();
+        });
+    
+        await test.step('collapses the substep', async () => {
+          await expect(flowEditorPage.connectionAutocomplete).not.toBeVisible();
+        });
+      });
+    
+      await test.step('set up action substep', async () => {
+        await test.step('fill topic and message body', async () => {
+          await page
+            .getByTestId('parameters.topic-power-input')
+            .locator('[contenteditable]')
+            .fill('Topic');
+          await page
+            .getByTestId('parameters.message-power-input')
+            .locator('[contenteditable]')
+            .fill('Message body');
+        });
+    
+        await test.step('continue to next step', async () => {
+          await flowEditorPage.continueButton.click();
+        });
+    
+        await test.step('collapses the substep', async () => {
+          await expect(flowEditorPage.connectionAutocomplete).not.toBeVisible();
+        });
+      });
+    
+      await test.step('test trigger substep', async () => {
+        await test.step('show sample output', async () => {
+          await expect(flowEditorPage.testOutput).not.toBeVisible();
+          await page
+            .getByTestId('flow-substep-continue-button')
+            .first()
+            .click();
+          await expect(flowEditorPage.testOutput).toBeVisible();
+          await flowEditorPage.screenshot({
+            path: 'Ntfy action test output.png',
+          });
+          await flowEditorPage.continueButton.click();
+        });
+      });
+    });
+
+    await test.step('publish and unpublish', async () => {
+      await test.step('publish flow', async () => {
+        await expect(flowEditorPage.unpublishFlowButton).not.toBeVisible();
+        await expect(flowEditorPage.publishFlowButton).toBeVisible();
+        await flowEditorPage.publishFlowButton.click();
+        await expect(flowEditorPage.publishFlowButton).not.toBeVisible();
+      });
+    
+      await test.step('shows read-only sticky snackbar', async () => {
+        await expect(flowEditorPage.infoSnackbar).toBeVisible();
+        await flowEditorPage.screenshot({
+          path: 'Published flow.png',
+        });
+      });
+    
+      await test.step('unpublish from snackbar', async () => {
         await page
-          .getByRole('option')
+          .getByTestId('unpublish-flow-from-snackbar')
-          .filter({ hasText: 'Add new connection' })
           .click();
+        await expect(flowEditorPage.infoSnackbar).not.toBeVisible();
       });
-
+    
-      await test.step('continue to next step', async () => {
+      await test.step('publish once again', async () => {
-        await page.getByTestId('create-connection-button').click();
+        await expect(flowEditorPage.publishFlowButton).toBeVisible();
+        await flowEditorPage.publishFlowButton.click();
+        await expect(flowEditorPage.publishFlowButton).not.toBeVisible();
       });
-
+    
-      await test.step('collapses the substep', async () => {
+      await test.step('unpublish from layout top bar', async () => {
-        await flowEditorPage.continueButton.click();
+        await expect(flowEditorPage.unpublishFlowButton).toBeVisible();
-        await expect(flowEditorPage.connectionAutocomplete).not.toBeVisible();
+        await flowEditorPage.unpublishFlowButton.click();
-      });
+        await expect(flowEditorPage.unpublishFlowButton).not.toBeVisible();
-    });
-
-    await test.step('set up action substep', async () => {
-      await test.step('fill topic and message body', async () => {
-        await page
-          .getByTestId('parameters.topic-power-input')
-          .locator('[contenteditable]')
-          .fill('Topic');
-        await page
-          .getByTestId('parameters.message-power-input')
-          .locator('[contenteditable]')
-          .fill('Message body');
-      });
-
-      await test.step('continue to next step', async () => {
-        await flowEditorPage.continueButton.click();
-      });
-
-      await test.step('collapses the substep', async () => {
-        await expect(flowEditorPage.connectionAutocomplete).not.toBeVisible();
-      });
-    });
-
-    await test.step('test trigger substep', async () => {
-      await test.step('show sample output', async () => {
-        await expect(flowEditorPage.testOutput).not.toBeVisible();
-        await page.getByTestId('flow-substep-continue-button').first().click();
-        await expect(flowEditorPage.testOutput).toBeVisible();
         await flowEditorPage.screenshot({
-          path: 'Ntfy action test output.png',
+          path: 'Unpublished flow.png',
         });
-        await flowEditorPage.continueButton.click();
       });
     });
-  });
+    
-
+    await test.step('in layout', async () => {
-  await test.step('publish and unpublish', async () => {
+      await test.step('can go back to flows page', async () => {
-    await test.step('publish flow', async () => {
+        await page.getByTestId('editor-go-back-button').click();
-      await expect(flowEditorPage.unpublishFlowButton).not.toBeVisible();
+        await expect(page).toHaveURL('/flows');
-      await expect(flowEditorPage.publishFlowButton).toBeVisible();
-      await flowEditorPage.publishFlowButton.click();
-      await expect(flowEditorPage.publishFlowButton).not.toBeVisible();
-    });
-
-    await test.step('shows read-only sticky snackbar', async () => {
-      await expect(flowEditorPage.infoSnackbar).toBeVisible();
-      await flowEditorPage.screenshot({
-        path: 'Published flow.png',
       });
     });
-
+  }
-    await test.step('unpublish from snackbar', async () => {
+);
-      await page.getByTestId('unpublish-flow-from-snackbar').click();
-      await expect(flowEditorPage.infoSnackbar).not.toBeVisible();
-    });
-
-    await test.step('publish once again', async () => {
-      await expect(flowEditorPage.publishFlowButton).toBeVisible();
-      await flowEditorPage.publishFlowButton.click();
-      await expect(flowEditorPage.publishFlowButton).not.toBeVisible();
-    });
-
-    await test.step('unpublish from layout top bar', async () => {
-      await expect(flowEditorPage.unpublishFlowButton).toBeVisible();
-      await flowEditorPage.unpublishFlowButton.click();
-      await expect(flowEditorPage.unpublishFlowButton).not.toBeVisible();
-      await flowEditorPage.screenshot({
-        path: 'Unpublished flow.png',
-      });
-    });
-  });
-
-  await test.step('in layout', async () => {
-    await test.step('can go back to flows page', async () => {
-      await page.getByTestId('editor-go-back-button').click();
-      await expect(page).toHaveURL('/flows');
-    });
-  });
-});

packages/e2e-tests/tests/my-profile/profile-updates.spec.js

@@ -33,7 +33,10 @@ publicTest.describe('My Profile', () => {
           .getByRole('option', { name: 'Admin' })
           .click();
         await adminCreateUserPage.createButton.click();
-        await adminCreateUserPage.expectCreateUserSuccessAlertToBeVisible();
+        const snackbar = await adminUsersPage.getSnackbarData(
+          'snackbar-create-user-success'
+        );
+        await expect(snackbar.variant).toBe('success');
       });
 
       await publicTest.step('copy invitation link', async () => {

packages/web/src/components/Container/index.jsx

@@ -1,19 +1,10 @@
 import * as React from 'react';
-import PropTypes from 'prop-types';
 import MuiContainer from '@mui/material/Container';
 
-export default function Container({ maxWidth = 'lg', ...props }) {
+export default function Container(props) {
-  return <MuiContainer maxWidth={maxWidth} {...props} />;
+  return <MuiContainer {...props} />;
 }
 
-Container.propTypes = {
+Container.defaultProps = {
-  maxWidth: PropTypes.oneOf([
+  maxWidth: 'lg',
-    'xs',
-    'sm',
-    'md',
-    'lg',
-    'xl',
-    false,
-    PropTypes.string,
-  ]),
 };

packages/web/src/components/ForgotPasswordForm/index.ee.jsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import Paper from '@mui/material/Paper';
 import Typography from '@mui/material/Typography';
-import Alert from '@mui/material/Alert';
 import LoadingButton from '@mui/lab/LoadingButton';
+import { enqueueSnackbar } from 'notistack';
 
 import useForgotPassword from 'hooks/useForgotPassword';
 import Form from 'components/Form';
@@ -12,17 +12,25 @@ import useFormatMessage from 'hooks/useFormatMessage';
 export default function ForgotPasswordForm() {
   const formatMessage = useFormatMessage();
   const {
-    mutate: forgotPassword,
+    mutateAsync: forgotPassword,
     isPending: loading,
     isSuccess,
-    isError,
-    error,
   } = useForgotPassword();
 
-  const handleSubmit = ({ email }) => {
+  const handleSubmit = async (values) => {
-    forgotPassword({
+    const { email } = values;
-      email,
+    try {
-    });
+      await forgotPassword({
+        email,
+      });
+    } catch (error) {
+      enqueueSnackbar(
+        error?.message || formatMessage('forgotPasswordForm.error'),
+        {
+          variant: 'error',
+        },
+      );
+    }
   };
 
   return (
@@ -49,16 +57,6 @@ export default function ForgotPasswordForm() {
           margin="dense"
           autoComplete="username"
         />
-        {isError && (
-          <Alert severity="error" sx={{ mt: 2 }}>
-            {error?.message || formatMessage('forgotPasswordForm.error')}
-          </Alert>
-        )}
-        {isSuccess && (
-          <Alert severity="success" sx={{ mt: 2 }}>
-            {formatMessage('forgotPasswordForm.instructionsSent')}
-          </Alert>
-        )}
         <LoadingButton
           type="submit"
           variant="contained"
@@ -70,6 +68,14 @@ export default function ForgotPasswordForm() {
         >
           {formatMessage('forgotPasswordForm.submit')}
         </LoadingButton>
+        {isSuccess && (
+          <Typography
+            variant="body1"
+            sx={{ color: (theme) => theme.palette.success.main }}
+          >
+            {formatMessage('forgotPasswordForm.instructionsSent')}
+          </Typography>
+        )}
       </Form>
     </Paper>
   );

packages/web/src/components/Form/index.jsx

@@ -46,12 +46,7 @@ function Form(props) {
 
   return (
     <FormProvider {...methods}>
-      <form
+      <form onSubmit={methods.handleSubmit(onSubmit)} {...formProps}>
-        onSubmit={methods.handleSubmit((data, event) =>
-          onSubmit?.(data, event, methods.setError),
-        )}
-        {...formProps}
-      >
         {render ? render(methods) : children}
       </form>
     </FormProvider>

packages/web/src/components/LoginForm/index.jsx

@@ -2,7 +2,6 @@ import * as React from 'react';
 import { useNavigate, Link as RouterLink } from 'react-router-dom';
 import Paper from '@mui/material/Paper';
 import Link from '@mui/material/Link';
-import Alert from '@mui/material/Alert';
 import Typography from '@mui/material/Typography';
 import LoadingButton from '@mui/lab/LoadingButton';
 import useAuthentication from 'hooks/useAuthentication';
@@ -12,6 +11,7 @@ import Form from 'components/Form';
 import TextField from 'components/TextField';
 import useFormatMessage from 'hooks/useFormatMessage';
 import useCreateAccessToken from 'hooks/useCreateAccessToken';
+import { Alert } from '@mui/material';
 
 function LoginForm() {
   const isCloud = useCloud();
@@ -45,7 +45,7 @@ function LoginForm() {
 
   const renderError = () => {
     const errors = error?.response?.data?.errors?.general || [
-      error?.message || formatMessage('loginForm.error'),
+      formatMessage('loginForm.error'),
     ];
 
     return errors.map((error) => (

packages/web/src/components/ResetPasswordForm/index.ee.jsx

@@ -2,7 +2,6 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import LoadingButton from '@mui/lab/LoadingButton';
 import Paper from '@mui/material/Paper';
 import Typography from '@mui/material/Typography';
-import Alert from '@mui/material/Alert';
 import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 import * as React from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -31,8 +30,6 @@ export default function ResetPasswordForm() {
     mutateAsync: resetPassword,
     isPending,
     isSuccess,
-    error,
-    isError,
   } = useResetPassword();
   const token = searchParams.get('token');
 
@@ -50,23 +47,14 @@ export default function ResetPasswordForm() {
         },
       });
       navigate(URLS.LOGIN);
-    } catch {}
+    } catch (error) {
-  };
+      enqueueSnackbar(
-
+        error?.message || formatMessage('resetPasswordForm.error'),
-  const renderError = () => {
+        {
-    if (!isError) {
+          variant: 'error',
-      return null;
+        },
+      );
     }
-
-    const errors = error?.response?.data?.errors?.general || [
-      error?.message || formatMessage('resetPasswordForm.error'),
-    ];
-
-    return errors.map((error) => (
-      <Alert severity="error" sx={{ mt: 2 }}>
-        {error}
-      </Alert>
-    ));
   };
 
   return (
@@ -108,6 +96,7 @@ export default function ResetPasswordForm() {
                   : ''
               }
             />
+
             <TextField
               label={formatMessage(
                 'resetPasswordForm.confirmPasswordFieldLabel',
@@ -128,7 +117,7 @@ export default function ResetPasswordForm() {
                   : ''
               }
             />
-            {renderError()}
+
             <LoadingButton
               type="submit"
               variant="contained"

packages/web/src/helpers/errors.js

@@ -1,18 +0,0 @@
-// Helpers to extract errors received from the API
-
-export const getGeneralErrorMessage = ({ error, fallbackMessage }) => {
-  if (!error) {
-    return;
-  }
-
-  const errors = error?.response?.data?.errors;
-  const generalError = errors?.general;
-
-  if (generalError && Array.isArray(generalError)) {
-    return generalError.join(' ');
-  }
-
-  if (!errors) {
-    return error?.message || fallbackMessage;
-  }
-};

packages/web/src/locales/en.json

@@ -225,8 +225,6 @@
   "userForm.email": "Email",
   "userForm.role": "Role",
   "userForm.password": "Password",
-  "userForm.mandatoryInput": "{inputName} is required.",
-  "userForm.validateEmail": "Email must be valid.",
   "createUser.submit": "Create",
   "createUser.successfullyCreated": "The user has been created.",
   "createUser.invitationEmailInfo": "Invitation email will be sent if SMTP credentials are valid. Otherwise, you can share the invitation link manually: <link></link>",
@@ -251,11 +249,8 @@
   "createRolePage.title": "Create role",
   "roleForm.name": "Name",
   "roleForm.description": "Description",
-  "roleForm.mandatoryInput": "{inputName} is required.",
   "createRole.submit": "Create",
   "createRole.successfullyCreated": "The role has been created.",
-  "createRole.generalError": "Error while creating the role.",
-  "createRole.permissionsError": "Permissions are invalid.",
   "editRole.submit": "Update",
   "editRole.successfullyUpdated": "The role has been updated.",
   "roleList.name": "Name",

packages/web/src/pages/Authentication/RoleMappings.jsx

@@ -66,8 +66,8 @@ function RoleMappings({ provider, providerLoading }) {
   const enqueueSnackbar = useEnqueueSnackbar();
 
   const {
-    mutateAsync: updateRoleMappings,
+    mutateAsync: updateSamlAuthProvidersRoleMappings,
-    isPending: isUpdateRoleMappingsPending,
+    isPending: isUpdateSamlAuthProvidersRoleMappingsPending,
   } = useAdminUpdateSamlAuthProviderRoleMappings(provider?.id);
 
   const { data, isLoading: isAdminSamlAuthProviderRoleMappingsLoading } =
@@ -79,7 +79,7 @@ function RoleMappings({ provider, providerLoading }) {
   const handleRoleMappingsUpdate = async (values) => {
     try {
       if (provider?.id) {
-        await updateRoleMappings(
+        await updateSamlAuthProvidersRoleMappings(
           values.roleMappings.map(({ roleId, remoteRoleName }) => ({
             roleId,
             remoteRoleName,
@@ -148,7 +148,7 @@ function RoleMappings({ provider, providerLoading }) {
             variant="contained"
             color="primary"
             sx={{ boxShadow: 2 }}
-            loading={isUpdateRoleMappingsPending}
+            loading={isUpdateSamlAuthProvidersRoleMappingsPending}
           >
             {formatMessage('roleMappingsForm.save')}
           </LoadingButton>

packages/web/src/pages/CreateRole/index.ee.jsx

@@ -1,14 +1,10 @@
 import LoadingButton from '@mui/lab/LoadingButton';
 import Grid from '@mui/material/Grid';
 import Stack from '@mui/material/Stack';
-import Alert from '@mui/material/Alert';
-import AlertTitle from '@mui/material/AlertTitle';
 import PermissionCatalogField from 'components/PermissionCatalogField/index.ee';
 import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 import * as React from 'react';
 import { useNavigate } from 'react-router-dom';
-import { yupResolver } from '@hookform/resolvers/yup';
-import * as yup from 'yup';
 
 import Container from 'components/Container';
 import Form from 'components/Form';
@@ -19,45 +15,10 @@ import {
   getComputedPermissionsDefaultValues,
   getPermissions,
 } from 'helpers/computePermissions.ee';
-import { getGeneralErrorMessage } from 'helpers/errors';
 import useFormatMessage from 'hooks/useFormatMessage';
 import useAdminCreateRole from 'hooks/useAdminCreateRole';
 import usePermissionCatalog from 'hooks/usePermissionCatalog.ee';
 
-const getValidationSchema = (formatMessage) => {
-  const getMandatoryFieldMessage = (fieldTranslationId) =>
-    formatMessage('roleForm.mandatoryInput', {
-      inputName: formatMessage(fieldTranslationId),
-    });
-
-  return yup.object().shape({
-    name: yup
-      .string()
-      .trim()
-      .required(getMandatoryFieldMessage('roleForm.name')),
-    description: yup.string().trim(),
-  });
-};
-
-const getPermissionsErrorMessage = (error) => {
-  const errors = error?.response?.data?.errors;
-
-  if (errors) {
-    const permissionsErrors = Object.keys(errors)
-      .filter((key) => key.startsWith('permissions'))
-      .reduce((obj, key) => {
-        obj[key] = errors[key];
-        return obj;
-      }, {});
-
-    if (Object.keys(permissionsErrors).length > 0) {
-      return JSON.stringify(permissionsErrors, null, 2);
-    }
-  }
-
-  return null;
-};
-
 export default function CreateRole() {
   const navigate = useNavigate();
   const formatMessage = useFormatMessage();
@@ -80,7 +41,7 @@ export default function CreateRole() {
     [permissionCatalogData],
   );
 
-  const handleRoleCreation = async (roleData, e, setError) => {
+  const handleRoleCreation = async (roleData) => {
     try {
       const permissions = getPermissions(roleData.computedPermissions);
 
@@ -99,38 +60,14 @@ export default function CreateRole() {
 
       navigate(URLS.ROLES);
     } catch (error) {
-      const errors = error?.response?.data?.errors;
+      const errors = Object.values(error.response.data.errors);
 
-      if (errors) {
+      for (const [errorMessage] of errors) {
-        const fieldNames = ['name', 'description'];
+        enqueueSnackbar(errorMessage, {
-        Object.entries(errors).forEach(([fieldName, fieldErrors]) => {
+          variant: 'error',
-          if (fieldNames.includes(fieldName) && Array.isArray(fieldErrors)) {
+          SnackbarProps: {
-            setError(fieldName, {
+            'data-test': 'snackbar-error',
-              type: 'fieldRequestError',
+          },
-              message: fieldErrors.join(', '),
-            });
-          }
-        });
-      }
-
-      const permissionError = getPermissionsErrorMessage(error);
-
-      if (permissionError) {
-        setError('root.permissions', {
-          type: 'fieldRequestError',
-          message: permissionError,
-        });
-      }
-
-      const generalError = getGeneralErrorMessage({
-        error,
-        fallbackMessage: formatMessage('createRole.generalError'),
-      });
-
-      if (generalError) {
-        setError('root.general', {
-          type: 'requestError',
-          message: generalError,
         });
       }
     }
@@ -146,67 +83,37 @@ export default function CreateRole() {
         </Grid>
 
         <Grid item xs={12} justifyContent="flex-end" sx={{ pt: 5 }}>
-          <Form
+          <Form onSubmit={handleRoleCreation} defaultValues={defaultValues}>
-            onSubmit={handleRoleCreation}
+            <Stack direction="column" gap={2}>
-            defaultValues={defaultValues}
+              <TextField
-            noValidate
+                required={true}
-            resolver={yupResolver(
+                name="name"
-              getValidationSchema(formatMessage, defaultValues),
+                label={formatMessage('roleForm.name')}
-            )}
+                fullWidth
-            automaticValidation={false}
+                data-test="name-input"
-            render={({ formState: { errors } }) => (
+              />
-              <Stack direction="column" gap={2}>
-                <TextField
-                  required={true}
-                  name="name"
-                  label={formatMessage('roleForm.name')}
-                  fullWidth
-                  data-test="name-input"
-                  error={!!errors?.name}
-                  helperText={errors?.name?.message}
-                />
 
-                <TextField
+              <TextField
-                  name="description"
+                name="description"
-                  label={formatMessage('roleForm.description')}
+                label={formatMessage('roleForm.description')}
-                  fullWidth
+                fullWidth
-                  data-test="description-input"
+                data-test="description-input"
-                  error={!!errors?.description}
+              />
-                  helperText={errors?.description?.message}
-                />
 
-                <PermissionCatalogField name="computedPermissions" />
+              <PermissionCatalogField name="computedPermissions" />
 
-                {errors?.root?.permissions && (
+              <LoadingButton
-                  <Alert severity="error" data-test="create-role-error-alert">
+                type="submit"
-                    <AlertTitle>
+                variant="contained"
-                      {formatMessage('createRole.permissionsError')}
+                color="primary"
-                    </AlertTitle>
+                sx={{ boxShadow: 2 }}
-                    <pre>
+                loading={isCreateRolePending}
-                      <code>{errors?.root?.permissions?.message}</code>
+                data-test="create-button"
-                    </pre>
+              >
-                  </Alert>
+                {formatMessage('createRole.submit')}
-                )}
+              </LoadingButton>
-
+            </Stack>
-                {errors?.root?.general && (
+          </Form>
-                  <Alert severity="error" data-test="create-role-error-alert">
-                    {errors?.root?.general?.message}
-                  </Alert>
-                )}
-
-                <LoadingButton
-                  type="submit"
-                  variant="contained"
-                  color="primary"
-                  sx={{ boxShadow: 2 }}
-                  loading={isCreateRolePending}
-                  data-test="create-button"
-                >
-                  {formatMessage('createRole.submit')}
-                </LoadingButton>
-              </Stack>
-            )}
-          />
         </Grid>
       </Grid>
     </Container>

packages/web/src/pages/CreateUser/index.jsx

@@ -3,10 +3,9 @@ import Grid from '@mui/material/Grid';
 import Stack from '@mui/material/Stack';
 import Alert from '@mui/material/Alert';
 import MuiTextField from '@mui/material/TextField';
+import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 import * as React from 'react';
 import { useQueryClient } from '@tanstack/react-query';
-import * as yup from 'yup';
-import { yupResolver } from '@hookform/resolvers/yup';
 
 import Can from 'components/Can';
 import Container from 'components/Container';
@@ -17,94 +16,50 @@ import TextField from 'components/TextField';
 import useFormatMessage from 'hooks/useFormatMessage';
 import useRoles from 'hooks/useRoles.ee';
 import useAdminCreateUser from 'hooks/useAdminCreateUser';
-import useCurrentUserAbility from 'hooks/useCurrentUserAbility';
-import { getGeneralErrorMessage } from 'helpers/errors';
 
 function generateRoleOptions(roles) {
   return roles?.map(({ name: label, id: value }) => ({ label, value }));
 }
 
-const getValidationSchema = (formatMessage, canUpdateRole) => {
-  const getMandatoryFieldMessage = (fieldTranslationId) =>
-    formatMessage('userForm.mandatoryInput', {
-      inputName: formatMessage(fieldTranslationId),
-    });
-
-  return yup.object().shape({
-    fullName: yup
-      .string()
-      .trim()
-      .required(getMandatoryFieldMessage('userForm.fullName')),
-    email: yup
-      .string()
-      .trim()
-      .email(formatMessage('userForm.validateEmail'))
-      .required(getMandatoryFieldMessage('userForm.email')),
-    ...(canUpdateRole
-      ? {
-          roleId: yup
-            .string()
-            .required(getMandatoryFieldMessage('userForm.role')),
-        }
-      : {}),
-  });
-};
-
-const defaultValues = {
-  fullName: '',
-  email: '',
-  roleId: '',
-};
-
 export default function CreateUser() {
   const formatMessage = useFormatMessage();
   const {
     mutateAsync: createUser,
     isPending: isCreateUserPending,
     data: createdUser,
-    isSuccess: createUserSuccess,
   } = useAdminCreateUser();
   const { data: rolesData, loading: isRolesLoading } = useRoles();
   const roles = rolesData?.data;
+  const enqueueSnackbar = useEnqueueSnackbar();
   const queryClient = useQueryClient();
-  const currentUserAbility = useCurrentUserAbility();
-  const canUpdateRole = currentUserAbility.can('update', 'Role');
 
-  const handleUserCreation = async (userData, e, setError) => {
+  const handleUserCreation = async (userData) => {
     try {
       await createUser({
         fullName: userData.fullName,
         email: userData.email,
-        roleId: userData.roleId,
+        roleId: userData.role?.id,
       });
 
       queryClient.invalidateQueries({ queryKey: ['admin', 'users'] });
+
+      enqueueSnackbar(formatMessage('createUser.successfullyCreated'), {
+        variant: 'success',
+        persist: true,
+        SnackbarProps: {
+          'data-test': 'snackbar-create-user-success',
+        },
+      });
     } catch (error) {
-      const errors = error?.response?.data?.errors;
+      enqueueSnackbar(formatMessage('createUser.error'), {
-
+        variant: 'error',
-      if (errors) {
+        persist: true,
-        const fieldNames = Object.keys(defaultValues);
+        SnackbarProps: {
-        Object.entries(errors).forEach(([fieldName, fieldErrors]) => {
+          'data-test': 'snackbar-error',
-          if (fieldNames.includes(fieldName) && Array.isArray(fieldErrors)) {
+        },
-            setError(fieldName, {
-              type: 'fieldRequestError',
-              message: fieldErrors.join(', '),
-            });
-          }
-        });
-      }
-
-      const generalError = getGeneralErrorMessage({
-        error,
-        fallbackMessage: formatMessage('createUser.error'),
       });
 
-      if (generalError) {
+      throw new Error('Failed while creating!');
-        setError('root.general', {
-          type: 'requestError',
-          message: generalError,
-        });
-      }
     }
   };
 
@@ -118,111 +73,74 @@ export default function CreateUser() {
         </Grid>
 
         <Grid item xs={12} justifyContent="flex-end" sx={{ pt: 5 }}>
-          <Form
+          <Form onSubmit={handleUserCreation}>
-            noValidate
+            <Stack direction="column" gap={2}>
-            onSubmit={handleUserCreation}
+              <TextField
-            mode="onSubmit"
+                required={true}
-            defaultValues={defaultValues}
+                name="fullName"
-            resolver={yupResolver(
+                label={formatMessage('userForm.fullName')}
-              getValidationSchema(formatMessage, canUpdateRole),
+                data-test="full-name-input"
-            )}
+                fullWidth
-            automaticValidation={false}
+              />
-            render={({ formState: { errors } }) => (
+
-              <Stack direction="column" gap={2}>
+              <TextField
-                <TextField
+                required={true}
-                  required={true}
+                name="email"
-                  name="fullName"
+                label={formatMessage('userForm.email')}
-                  label={formatMessage('userForm.fullName')}
+                data-test="email-input"
-                  data-test="full-name-input"
+                fullWidth
+              />
+
+              <Can I="update" a="Role">
+                <ControlledAutocomplete
+                  name="role.id"
                   fullWidth
-                  error={!!errors?.fullName}
+                  disablePortal
-                  helperText={errors?.fullName?.message}
+                  disableClearable={true}
+                  options={generateRoleOptions(roles)}
+                  renderInput={(params) => (
+                    <MuiTextField
+                      {...params}
+                      required
+                      label={formatMessage('userForm.role')}
+                    />
+                  )}
+                  loading={isRolesLoading}
                 />
+              </Can>
 
-                <TextField
+              <LoadingButton
-                  required={true}
+                type="submit"
-                  name="email"
+                variant="contained"
-                  label={formatMessage('userForm.email')}
+                color="primary"
-                  data-test="email-input"
+                sx={{ boxShadow: 2 }}
-                  fullWidth
+                loading={isCreateUserPending}
-                  error={!!errors?.email}
+                data-test="create-button"
-                  helperText={errors?.email?.message}
+              >
-                />
+                {formatMessage('createUser.submit')}
+              </LoadingButton>
 
-                <Can I="update" a="Role">
+              {createdUser && (
-                  <ControlledAutocomplete
+                <Alert
-                    name="roleId"
+                  severity="info"
-                    fullWidth
-                    disablePortal
-                    disableClearable={true}
-                    options={generateRoleOptions(roles)}
-                    renderInput={(params) => (
-                      <MuiTextField
-                        {...params}
-                        required
-                        label={formatMessage('userForm.role')}
-                        error={!!errors?.roleId}
-                        helperText={errors?.roleId?.message}
-                      />
-                    )}
-                    loading={isRolesLoading}
-                    showHelperText={false}
-                  />
-                </Can>
-
-                {errors?.root?.general && (
-                  <Alert data-test="create-user-error-alert" severity="error">
-                    {errors?.root?.general?.message}
-                  </Alert>
-                )}
-
-                {createUserSuccess && (
-                  <Alert
-                    severity="success"
-                    data-test="create-user-success-alert"
-                  >
-                    {formatMessage('createUser.successfullyCreated')}
-                  </Alert>
-                )}
-
-                {createdUser && (
-                  <Alert
-                    severity="info"
-                    color="primary"
-                    data-test="invitation-email-info-alert"
-                    sx={{
-                      a: {
-                        wordBreak: 'break-all',
-                      },
-                    }}
-                  >
-                    {formatMessage('createUser.invitationEmailInfo', {
-                      link: () => (
-                        <a
-                          href={createdUser.data.acceptInvitationUrl}
-                          target="_blank"
-                          rel="noreferrer"
-                        >
-                          {createdUser.data.acceptInvitationUrl}
-                        </a>
-                      ),
-                    })}
-                  </Alert>
-                )}
-
-                <LoadingButton
-                  type="submit"
-                  variant="contained"
                   color="primary"
-                  sx={{ boxShadow: 2 }}
+                  data-test="invitation-email-info-alert"
-                  loading={isCreateUserPending}
-                  data-test="create-button"
                 >
-                  {formatMessage('createUser.submit')}
+                  {formatMessage('createUser.invitationEmailInfo', {
-                </LoadingButton>
+                    link: () => (
-              </Stack>
+                      <a
-            )}
+                        href={createdUser.data.acceptInvitationUrl}
-          />
+                        target="_blank"
+                        rel="noreferrer"
+                      >
+                        {createdUser.data.acceptInvitationUrl}
+                      </a>
+                    ),
+                  })}
+                </Alert>
+              )}
+            </Stack>
+          </Form>
         </Grid>
       </Grid>
     </Container>