chore(deps): Bump nodemailer from 6.7.0 to 6.9.9

Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.7.0 to 6.9.9.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.7.0...v6.9.9)

---
updated-dependencies:
- dependency-name: nodemailer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
       "version": "latest"
     },
     "ghcr.io/devcontainers/features/node:1": {
-      "version": 18
+      "version": 20
     },
     "ghcr.io/devcontainers/features/common-utils:1": {
       "username": "vscode",

packages/backend/package.json

@@ -57,7 +57,7 @@
     "morgan": "^1.10.0",
     "multer": "1.4.5-lts.1",
     "node-html-markdown": "^1.3.0",
-    "nodemailer": "6.7.0",
+    "nodemailer": "6.9.9",
     "oauth-1.0a": "^2.2.6",
     "objection": "^3.0.0",
     "passport": "^0.6.0",

packages/backend/src/apps/pdf-monkey/auth/index.js

@@ -1,21 +0,0 @@
-import verifyCredentials from './verify-credentials.js';
-import isStillVerified from './is-still-verified.js';
-
-export default {
-  fields: [
-    {
-      key: 'apiKey',
-      label: 'API Key',
-      type: 'string',
-      required: true,
-      readOnly: false,
-      value: null,
-      placeholder: null,
-      description: 'PDFMonkey API secret key of your account.',
-      clickToCopy: false,
-    },
-  ],
-
-  verifyCredentials,
-  isStillVerified,
-};

packages/backend/src/apps/pdf-monkey/auth/is-still-verified.js

@@ -1,8 +0,0 @@
-import getCurrentUser from '../common/get-current-user.js';
-
-const isStillVerified = async ($) => {
-  const currentUser = await getCurrentUser($);
-  return !!currentUser.id;
-};
-
-export default isStillVerified;

packages/backend/src/apps/pdf-monkey/auth/verify-credentials.js

@@ -1,15 +0,0 @@
-import getCurrentUser from '../common/get-current-user.js';
-
-const verifyCredentials = async ($) => {
-  const currentUser = await getCurrentUser($);
-  const screenName = [currentUser.desired_name, currentUser.email]
-    .filter(Boolean)
-    .join(' @ ');
-
-  await $.auth.set({
-    screenName,
-    apiKey: $.auth.data.apiKey,
-  });
-};
-
-export default verifyCredentials;

packages/backend/src/apps/pdf-monkey/common/add-auth-header.js

@@ -1,9 +0,0 @@
-const addAuthHeader = ($, requestConfig) => {
-  if ($.auth.data?.apiKey) {
-    requestConfig.headers.Authorization = `Bearer ${$.auth.data.apiKey}`;
-  }
-
-  return requestConfig;
-};
-
-export default addAuthHeader;

packages/backend/src/apps/pdf-monkey/common/get-current-user.js

@@ -1,8 +0,0 @@
-const getCurrentUser = async ($) => {
-  const response = await $.http.get('/v1/current_user');
-  const currentUser = response.data.current_user;
-
-  return currentUser;
-};
-
-export default getCurrentUser;

packages/backend/src/apps/pdf-monkey/index.js

@@ -1,16 +0,0 @@
-import defineApp from '../../helpers/define-app.js';
-import addAuthHeader from './common/add-auth-header.js';
-import auth from './auth/index.js';
-
-export default defineApp({
-  name: 'PDFMonkey',
-  key: 'pdf-monkey',
-  iconUrl: '{BASE_URL}/apps/pdf-monkey/assets/favicon.svg',
-  authDocUrl: 'https://automatisch.io/docs/apps/pdf-monkey/connection',
-  supportsConnections: true,
-  baseUrl: 'https://pdfmonkey.io',
-  apiBaseUrl: 'https://api.pdfmonkey.io/api',
-  primaryColor: 'db2777',
-  beforeRequest: [addAuthHeader],
-  auth,
-});

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

@@ -1,10 +0,0 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import SamlAuthProvider from '../../../../../models/saml-auth-provider.ee.js';
-
-export default async (request, response) => {
-  const samlAuthProvider = await SamlAuthProvider.query()
-    .findById(request.params.samlAuthProviderId)
-    .throwIfNotFound();
-
-  renderObject(response, samlAuthProvider);
-};

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

@@ -1,34 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
-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 getSamlAuthProviderMock from '../../../../../../test/mocks/rest/api/v1/saml-auth-providers/get-saml-auth-provider.ee.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/saml-auth-provider/:samlAuthProviderId', () => {
-  let samlAuthProvider, currentUser, token;
-
-  beforeEach(async () => {
-    const role = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: role.id });
-    samlAuthProvider = await createSamlAuthProvider();
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return saml auth provider with specified id', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get(`/api/v1/admin/saml-auth-providers/${samlAuthProvider.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getSamlAuthProviderMock(samlAuthProvider);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

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

@@ -1,11 +0,0 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import SamlAuthProvider from '../../../../../models/saml-auth-provider.ee.js';
-
-export default async (request, response) => {
-  const samlAuthProviders = await SamlAuthProvider.query().orderBy(
-    'created_at',
-    'desc'
-  );
-
-  renderObject(response, samlAuthProviders);
-};

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

@@ -1,39 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
-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 getSamlAuthProvidersMock from '../../../../../../test/mocks/rest/api/v1/saml-auth-providers/get-saml-auth-providers.ee.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/saml-auth-providers', () => {
-  let samlAuthProviderOne, samlAuthProviderTwo, currentUser, token;
-
-  beforeEach(async () => {
-    const role = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: role.id });
-
-    samlAuthProviderOne = await createSamlAuthProvider();
-    samlAuthProviderTwo = await createSamlAuthProvider();
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return saml auth providers', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get('/api/v1/admin/saml-auth-providers')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getSamlAuthProvidersMock([
-      samlAuthProviderTwo,
-      samlAuthProviderOne,
-    ]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

packages/backend/src/helpers/authorization.js

@@ -1,17 +1,16 @@
 const authorizationList = {
-  'GET /api/v1/users/:userId': {
+  '/api/v1/users/:userId': {
     action: 'read',
     subject: 'User',
   },
-  'GET /api/v1/users/': {
+  '/api/v1/users/': {
     action: 'read',
     subject: 'User',
   },
 };
 
 export const authorizeUser = async (request, response, next) => {
-  const currentRoute =
-    request.method + ' ' + request.baseUrl + request.route.path;
+  const currentRoute = request.baseUrl + request.route.path;
   const currentRouteRule = authorizationList[currentRoute];
 
   try {
@@ -21,13 +20,3 @@ export const authorizeUser = async (request, response, next) => {
     return response.status(403).end();
   }
 };
-
-export const authorizeAdmin = async (request, response, next) => {
-  const role = await request.currentUser.$relatedQuery('role');
-
-  if (role?.isAdmin) {
-    next();
-  } else {
-    return response.status(403).end();
-  }
-};

packages/backend/src/helpers/check-is-enterprise.js

@@ -1,9 +0,0 @@
-import { hasValidLicense } from './license.ee.js';
-
-export const checkIsEnterprise = async (request, response, next) => {
-  if (await hasValidLicense()) {
-    next();
-  } else {
-    return response.status(404).end();
-  }
-};

packages/backend/src/helpers/logger.js

@@ -4,8 +4,8 @@ import appConfig from '../config/app.js';
 const levels = {
   error: 0,
   warn: 1,
-  http: 2,
-  info: 3,
+  info: 2,
+  http: 3,
   debug: 4,
 };
 

packages/backend/src/helpers/renderer.js

@@ -15,8 +15,6 @@ const renderObject = (response, object) => {
   let data = isPaginated(object) ? object.records : object;
   const type = isPaginated(object)
     ? object.records[0].constructor.name
-    : Array.isArray(object)
-    ? object[0].constructor.name
     : object.constructor.name;
 
   const serializer = serializers[type];

packages/backend/src/routes/api/v1/saml-auth-providers.ee.js

@@ -1,26 +0,0 @@
-import { Router } from 'express';
-import { authenticateUser } from '../../../helpers/authentication.js';
-import { authorizeAdmin } from '../../../helpers/authorization.js';
-import { checkIsEnterprise } from '../../../helpers/check-is-enterprise.js';
-import getSamlAuthProvidersAction from '../../../controllers/api/v1/admin/saml-auth-providers/get-saml-auth-providers.ee.js';
-import getSamlAuthProviderAction from '../../../controllers/api/v1/admin/saml-auth-providers/get-saml-auth-provider.ee.js';
-
-const router = Router();
-
-router.get(
-  '/',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  getSamlAuthProvidersAction
-);
-
-router.get(
-  '/:samlAuthProviderId',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  getSamlAuthProviderAction
-);
-
-export default router;

packages/backend/src/routes/index.js

@@ -5,7 +5,6 @@ import paddleRouter from './paddle.ee.js';
 import healthcheckRouter from './healthcheck.js';
 import automatischRouter from './api/v1/automatisch.js';
 import usersRouter from './api/v1/users.js';
-import samlAuthProvidersRouter from './api/v1/saml-auth-providers.ee.js';
 
 const router = Router();
 
@@ -15,6 +14,5 @@ router.use('/paddle', paddleRouter);
 router.use('/healthcheck', healthcheckRouter);
 router.use('/api/v1/automatisch', automatischRouter);
 router.use('/api/v1/users', usersRouter);
-router.use('/api/v1/admin/saml-auth-providers', samlAuthProvidersRouter);
 
 export default router;

packages/backend/src/serializers/index.js

@@ -1,13 +1,11 @@
 import userSerializer from './user.js';
 import roleSerializer from './role.js';
 import permissionSerializer from './permission.js';
-import samlAuthProviderSerializer from './saml-auth-provider.ee.js';
 
 const serializers = {
   User: userSerializer,
   Role: roleSerializer,
   Permission: permissionSerializer,
-  SamlAuthProvider: samlAuthProviderSerializer,
 };
 
 export default serializers;

packages/backend/src/serializers/permission.test.js

@@ -1,25 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createPermission } from '../../test/factories/permission';
-import permissionSerializer from './permission';
-
-describe('permissionSerializer', () => {
-  let permission;
-
-  beforeEach(async () => {
-    permission = await createPermission();
-  });
-
-  it('should return permission data', async () => {
-    const expectedPayload = {
-      id: permission.id,
-      roleId: permission.roleId,
-      action: permission.action,
-      subject: permission.subject,
-      conditions: permission.conditions,
-      createdAt: permission.createdAt,
-      updatedAt: permission.updatedAt,
-    };
-
-    expect(permissionSerializer(permission)).toEqual(expectedPayload);
-  });
-});

packages/backend/src/serializers/role.test.js

@@ -1,25 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createRole } from '../../test/factories/role';
-import roleSerializer from './role';
-
-describe('roleSerializer', () => {
-  let role;
-
-  beforeEach(async () => {
-    role = await createRole();
-  });
-
-  it('should return role data', async () => {
-    const expectedPayload = {
-      id: role.id,
-      name: role.name,
-      key: role.key,
-      description: role.description,
-      createdAt: role.createdAt,
-      updatedAt: role.updatedAt,
-      isAdmin: role.isAdmin,
-    };
-
-    expect(roleSerializer(role)).toEqual(expectedPayload);
-  });
-});

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

@@ -1,18 +0,0 @@
-const samlAuthProviderSerializer = (samlAuthProvider) => {
-  return {
-    id: samlAuthProvider.id,
-    name: samlAuthProvider.name,
-    certificate: samlAuthProvider.certificate,
-    signatureAlgorithm: samlAuthProvider.signatureAlgorithm,
-    issuer: samlAuthProvider.issuer,
-    entryPoint: samlAuthProvider.entryPoint,
-    firstnameAttributeName: samlAuthProvider.firstnameAttributeName,
-    surnameAttributeName: samlAuthProvider.surnameAttributeName,
-    emailAttributeName: samlAuthProvider.emailAttributeName,
-    roleAttributeName: samlAuthProvider.roleAttributeName,
-    active: samlAuthProvider.active,
-    defaultRoleId: samlAuthProvider.defaultRoleId,
-  };
-};
-
-export default samlAuthProviderSerializer;

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

@@ -1,32 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createSamlAuthProvider } from '../../test/factories/saml-auth-provider.ee.js';
-import samlAuthProviderSerializer from './saml-auth-provider.ee.js';
-
-describe('samlAuthProviderSerializer', () => {
-  let samlAuthProvider;
-
-  beforeEach(async () => {
-    samlAuthProvider = await createSamlAuthProvider();
-  });
-
-  it('should return saml auth provider data', async () => {
-    const expectedPayload = {
-      id: samlAuthProvider.id,
-      name: samlAuthProvider.name,
-      certificate: samlAuthProvider.certificate,
-      signatureAlgorithm: samlAuthProvider.signatureAlgorithm,
-      issuer: samlAuthProvider.issuer,
-      entryPoint: samlAuthProvider.entryPoint,
-      firstnameAttributeName: samlAuthProvider.firstnameAttributeName,
-      surnameAttributeName: samlAuthProvider.surnameAttributeName,
-      emailAttributeName: samlAuthProvider.emailAttributeName,
-      roleAttributeName: samlAuthProvider.roleAttributeName,
-      active: samlAuthProvider.active,
-      defaultRoleId: samlAuthProvider.defaultRoleId,
-    };
-
-    expect(samlAuthProviderSerializer(samlAuthProvider)).toEqual(
-      expectedPayload
-    );
-  });
-});

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

@@ -1,76 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { DateTime } from 'luxon';
-import appConfig from '../config/app';
-import { createUser } from '../../test/factories/user';
-import { createPermission } from '../../test/factories/permission';
-import userSerializer from './user';
-
-describe('userSerializer', () => {
-  let user, role, permissionOne, permissionTwo;
-
-  beforeEach(async () => {
-    user = await createUser();
-    role = await user.$relatedQuery('role');
-
-    permissionOne = await createPermission({
-      roleId: role.id,
-      action: 'read',
-      subject: 'User',
-    });
-
-    permissionTwo = await createPermission({
-      roleId: role.id,
-      action: 'read',
-      subject: 'Role',
-    });
-  });
-
-  it('should return user data', async () => {
-    vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
-
-    const expectedPayload = {
-      createdAt: user.createdAt,
-      email: user.email,
-      fullName: user.fullName,
-      id: user.id,
-      roleId: user.roleId,
-      updatedAt: user.updatedAt,
-    };
-
-    expect(userSerializer(user)).toEqual(expectedPayload);
-  });
-
-  it('should return user data with the role', async () => {
-    user.role = role;
-
-    const expectedPayload = {
-      role,
-    };
-
-    expect(userSerializer(user)).toMatchObject(expectedPayload);
-  });
-
-  it('should return user data with the permissions', async () => {
-    user.permissions = [permissionOne, permissionTwo];
-
-    const expectedPayload = {
-      permissions: [permissionOne, permissionTwo],
-    };
-
-    expect(userSerializer(user)).toMatchObject(expectedPayload);
-  });
-
-  it('should return user data with trial expiry date', async () => {
-    vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
-
-    await user.$query().patch({
-      trialExpiryDate: DateTime.now().plus({ days: 30 }).toISODate(),
-    });
-
-    const expectedPayload = {
-      trialExpiryDate: user.trialExpiryDate,
-    };
-
-    expect(userSerializer(user)).toMatchObject(expectedPayload);
-  });
-});

packages/backend/test/factories/saml-auth-provider.ee.js

@@ -1,33 +0,0 @@
-import { createRole } from './role';
-import SamlAuthProvider from '../../src/models/saml-auth-provider.ee.js';
-
-export const createSamlAuthProvider = async (params = {}) => {
-  params.name = params?.name || 'Keycloak SAML';
-  params.certificate = params?.certificate || 'certificate';
-  params.signatureAlgorithm = params?.signatureAlgorithm || 'sha512';
-
-  params.entryPoint =
-    params?.entryPoint ||
-    'https://example.com/auth/realms/automatisch/protocol/saml';
-
-  params.issuer = params?.issuer || 'automatisch-client';
-
-  params.firstnameAttributeName =
-    params?.firstnameAttributeName || 'urn:oid:2.1.1.42';
-
-  params.surnameAttributeName =
-    params?.surnameAttributeName || 'urn:oid:2.1.1.4';
-
-  params.emailAttributeName =
-    params?.emailAttributeName || 'urn:oid:1.1.2342.19200300.100.1.1';
-
-  params.roleAttributeName = params?.roleAttributeName || 'Role';
-  params.defaultRoleId = params?.defaultRoleId || (await createRole()).id;
-  params.active = params?.active || true;
-
-  const samlAuthProvider = await SamlAuthProvider.query()
-    .insert(params)
-    .returning('*');
-
-  return samlAuthProvider;
-};

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

@@ -1,29 +0,0 @@
-const getSamlAuthProvidersMock = async (samlAuthProvider) => {
-  const data = {
-    active: samlAuthProvider.active,
-    certificate: samlAuthProvider.certificate,
-    defaultRoleId: samlAuthProvider.defaultRoleId,
-    emailAttributeName: samlAuthProvider.emailAttributeName,
-    entryPoint: samlAuthProvider.entryPoint,
-    firstnameAttributeName: samlAuthProvider.firstnameAttributeName,
-    id: samlAuthProvider.id,
-    issuer: samlAuthProvider.issuer,
-    name: samlAuthProvider.name,
-    roleAttributeName: samlAuthProvider.roleAttributeName,
-    signatureAlgorithm: samlAuthProvider.signatureAlgorithm,
-    surnameAttributeName: samlAuthProvider.surnameAttributeName,
-  };
-
-  return {
-    data: data,
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'SamlAuthProvider',
-    },
-  };
-};
-
-export default getSamlAuthProvidersMock;

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

@@ -1,31 +0,0 @@
-const getSamlAuthProvidersMock = async (samlAuthProviders) => {
-  const data = samlAuthProviders.map((samlAuthProvider) => {
-    return {
-      active: samlAuthProvider.active,
-      certificate: samlAuthProvider.certificate,
-      defaultRoleId: samlAuthProvider.defaultRoleId,
-      emailAttributeName: samlAuthProvider.emailAttributeName,
-      entryPoint: samlAuthProvider.entryPoint,
-      firstnameAttributeName: samlAuthProvider.firstnameAttributeName,
-      id: samlAuthProvider.id,
-      issuer: samlAuthProvider.issuer,
-      name: samlAuthProvider.name,
-      roleAttributeName: samlAuthProvider.roleAttributeName,
-      signatureAlgorithm: samlAuthProvider.signatureAlgorithm,
-      surnameAttributeName: samlAuthProvider.surnameAttributeName,
-    };
-  });
-
-  return {
-    data: data,
-    meta: {
-      count: data.length,
-      currentPage: null,
-      isArray: true,
-      totalPages: null,
-      type: 'SamlAuthProvider',
-    },
-  };
-};
-
-export default getSamlAuthProvidersMock;

packages/docs/pages/.vitepress/config.js

@@ -252,12 +252,6 @@ export default defineConfig({
             { text: 'Connection', link: '/apps/openai/connection' },
           ],
         },
-        {
-          text: 'PDFMonkey',
-          collapsible: true,
-          collapsed: true,
-          items: [{ text: 'Connection', link: '/apps/pdf-monkey/connection' }],
-        },
         {
           text: 'Pipedrive',
           collapsible: true,
@@ -311,7 +305,7 @@ export default defineConfig({
           collapsed: true,
           items: [
             { text: 'Actions', link: '/apps/removebg/actions' },
-            { text: 'Connection', link: '/apps/removebg/connection' },
+            { text: 'Connection', link: '/apps/removebg/connection' }
           ],
         },
         {

packages/docs/pages/apps/pdf-monkey/connection.md

@@ -1,11 +0,0 @@
-# PDFMonkey
-
-:::info
-This page explains the steps you need to follow to set up the PDFMonkey
-connection in Automatisch. If any of the steps are outdated, please let us know!
-:::
-
-1. Login to your PDFMonkey account: [https://dashboard.pdfmonkey.io/login](https://dashboard.pdfmonkey.io/login).
-2. Go to **My Account** section from your profile.
-3. Copy `API SECRET KEY` from the page to the `API Key` field on Automatisch.
-4. Now, you can start using the PDFMonkey connection with Automatisch.

packages/web/src/components/Layout/index.tsx

@@ -3,7 +3,6 @@ import Box from '@mui/material/Box';
 import Toolbar from '@mui/material/Toolbar';
 import { useTheme } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
-import Stack from '@mui/material/Stack';
 import AppsIcon from '@mui/icons-material/Apps';
 import SwapCallsIcon from '@mui/icons-material/SwapCalls';
 import HistoryIcon from '@mui/icons-material/History';
@@ -140,7 +139,7 @@ export default function PublicLayout({
         onDrawerClose={closeDrawer}
       />
 
-      <Box sx={{ display: 'flex', height: '100%' }}>
+      <Box sx={{ display: 'flex' }}>
         <Drawer
           links={drawerLinks}
           bottomLinks={bottomLinks}
@@ -149,10 +148,11 @@ export default function PublicLayout({
           onClose={closeDrawer}
         />
 
-        <Stack flex={1}>
+        <Box sx={{ flex: 1 }}>
           <Toolbar />
+
           {children}
-        </Stack>
+        </Box>
       </Box>
     </>
   );

packages/web/src/components/NotFound/index.tsx

@@ -1,44 +0,0 @@
-import { Link } from 'react-router-dom';
-import Button from '@mui/material/Button';
-import Stack from '@mui/material/Stack';
-import Typography from '@mui/material/Typography';
-
-import * as URLS from 'config/urls';
-import useFormatMessage from 'hooks/useFormatMessage';
-import useAuthentication from 'hooks/useAuthentication';
-import Layout from 'components/Layout';
-import PublicLayout from 'components/PublicLayout';
-
-export default function NoResultFound(): React.ReactElement {
-  const formatMessage = useFormatMessage();
-  const { isAuthenticated } = useAuthentication();
-
-  const pageContent = (
-    <Stack
-      justifyContent="center"
-      alignItems="center"
-      flex={1}
-      spacing={1}
-      p={2}
-      mb={11}
-    >
-      <Typography variant="h1" color="primary" textAlign="center">
-        404
-      </Typography>
-      <Typography variant="body1" textAlign="center">
-        {formatMessage('notFoundPage.title')}
-      </Typography>
-      <Link to={isAuthenticated ? URLS.FLOWS : URLS.LOGIN}>
-        <Button variant="contained" sx={{ mt: 3 }} component="div">
-          {formatMessage('notFoundPage.button')}
-        </Button>
-      </Link>
-    </Stack>
-  );
-
-  return isAuthenticated ? (
-    <Layout>{pageContent}</Layout>
-  ) : (
-    <PublicLayout>{pageContent}</PublicLayout>
-  );
-}

packages/web/src/locales/en.json

@@ -265,7 +265,5 @@
   "authClient.buttonSubmit": "Submit",
   "authClient.inputName": "Name",
   "authClient.inputActive": "Active",
-  "updateAuthClient.title": "Update auth client",
-  "notFoundPage.title": "We can't seem to find a page you're looking for.",
-  "notFoundPage.button": "Back to home page"
+  "updateAuthClient.title": "Update auth client"
 }

packages/web/src/routes.tsx

@@ -1,6 +1,5 @@
-import { Route, Routes as ReactRouterRoutes, Navigate } from 'react-router-dom';
+import { Route, Routes, Navigate } from 'react-router-dom';
 import Layout from 'components/Layout';
-import NoResultFound from 'components/NotFound';
 import PublicLayout from 'components/PublicLayout';
 import Applications from 'pages/Applications';
 import Application from 'pages/Application';
@@ -18,15 +17,9 @@ import * as URLS from 'config/urls';
 import settingsRoutes from './settingsRoutes';
 import adminSettingsRoutes from './adminSettingsRoutes';
 import Notifications from 'pages/Notifications';
-import useConfig from 'hooks/useConfig';
-import useAuthentication from 'hooks/useAuthentication';
 
-function Routes() {
-  const { config } = useConfig();
-  const { isAuthenticated } = useAuthentication();
-
-  return (
-    <ReactRouterRoutes>
+export default (
+  <Routes>
     <Route
       path={URLS.EXECUTIONS}
       element={
@@ -92,7 +85,10 @@ function Routes() {
       }
     />
 
-      <Route path={URLS.LOGIN_CALLBACK} element={<LoginCallback />} />
+    <Route
+      path={URLS.LOGIN_CALLBACK}
+      element={<LoginCallback />}
+    />
 
     <Route
       path={URLS.SIGNUP}
@@ -121,7 +117,6 @@ function Routes() {
       }
     />
 
-      {!config?.disableNotificationsPage && (
     <Route
       path={URLS.UPDATES}
       element={
@@ -130,22 +125,19 @@ function Routes() {
         </Layout>
       }
     />
-      )}
 
-      <Route
-        path="/"
-        element={
-          <Navigate to={isAuthenticated ? URLS.FLOWS : URLS.LOGIN} replace />
-        }
-      />
+    <Route path="/" element={<Navigate to={URLS.FLOWS} replace />} />
 
     <Route path={URLS.SETTINGS}>{settingsRoutes}</Route>
 
     <Route path={URLS.ADMIN_SETTINGS}>{adminSettingsRoutes}</Route>
 
-      <Route path="*" element={<NoResultFound />} />
-    </ReactRouterRoutes>
-  );
+    <Route
+      element={
+        <Layout>
+          <div>404</div>
+        </Layout>
       }
-
-export default <Routes />;
+    />
+  </Routes>
+);

yarn.lock

@@ -11458,10 +11458,10 @@ node-releases@^2.0.1:
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz"
   integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
 
-nodemailer@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz"
-  integrity sha512-AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw==
+nodemailer@6.9.9:
+  version "6.9.9"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.9.tgz#4549bfbf710cc6addec5064dd0f19874d24248d9"
+  integrity sha512-dexTll8zqQoVJEZPwQAKzxxtFn0qTnjdQTchoU6Re9BUUGBJiOy3YMn/0ShTW6J5M0dfQ1NeDeRTTl4oIWgQMA==
 
 nodemon@^2.0.13:
   version "2.0.15"