diff --git a/packages/backend/package.json b/packages/backend/package.json index 1c77872c..949f0f4b 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -5,7 +5,7 @@ "description": "The open source Zapier alternative. Build workflow automation without spending time and money.", "type": "module", "scripts": { - "dev": "ts-node-dev --watch 'src/graphql/schema.graphql' --exit-child src/server.ts", + "dev": "nodemon --watch 'src/**/*.js' --exec 'node' src/server.js", "worker": "nodemon --watch 'src/**/*.js' --exec 'node' src/worker.js", "build": "tsc && yarn copy-statics", "build:watch": "nodemon --watch 'src/**/*.js' --watch 'bin/**/*.ts' --exec yarn build --ext ts", diff --git a/packages/backend/src/app.js b/packages/backend/src/app.js index aef7ea6b..170439ba 100644 --- a/packages/backend/src/app.js +++ b/packages/backend/src/app.js @@ -2,21 +2,21 @@ import createError from 'http-errors'; import express from 'express'; import cors from 'cors'; -import appConfig from './config/app'; -import corsOptions from './config/cors-options'; -import morgan from './helpers/morgan'; -import * as Sentry from './helpers/sentry.ee'; -import appAssetsHandler from './helpers/app-assets-handler'; -import webUIHandler from './helpers/web-ui-handler'; -import errorHandler from './helpers/error-handler'; -import './config/orm'; +import appConfig from './config/app.js'; +import corsOptions from './config/cors-options.js'; +import morgan from './helpers/morgan.js'; +import * as Sentry from './helpers/sentry.ee.js'; +import appAssetsHandler from './helpers/app-assets-handler.js'; +import webUIHandler from './helpers/web-ui-handler.js'; +import errorHandler from './helpers/error-handler.js'; +import './config/orm.js'; import { createBullBoardHandler, serverAdapter, -} from './helpers/create-bull-board-handler'; -import injectBullBoardHandler from './helpers/inject-bull-board-handler'; -import router from './routes'; -import configurePassport from './helpers/passport'; +} from './helpers/create-bull-board-handler.js'; +import injectBullBoardHandler from './helpers/inject-bull-board-handler.js'; +import router from './routes/index.js'; +import configurePassport from './helpers/passport.js'; createBullBoardHandler(serverAdapter); diff --git a/packages/backend/src/config/cors-options.js b/packages/backend/src/config/cors-options.js index bff4b542..c96a2d4a 100644 --- a/packages/backend/src/config/cors-options.js +++ b/packages/backend/src/config/cors-options.js @@ -1,4 +1,4 @@ -import appConfig from './app'; +import appConfig from './app.js'; const corsOptions = { origin: appConfig.webAppUrl, diff --git a/packages/backend/src/controllers/paddle/webhooks.ee.js b/packages/backend/src/controllers/paddle/webhooks.ee.js index 62c27d23..b2d3e509 100644 --- a/packages/backend/src/controllers/paddle/webhooks.ee.js +++ b/packages/backend/src/controllers/paddle/webhooks.ee.js @@ -1,7 +1,7 @@ import crypto from 'crypto'; import { serialize } from 'php-serialize'; -import Billing from '../../helpers/billing/index.ee'; -import appConfig from '../../config/app'; +import Billing from '../../helpers/billing/index.ee.js'; +import appConfig from '../../config/app.js'; export default async (request, response) => { if (!verifyWebhook(request)) { diff --git a/packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.js b/packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.js index 3e21bb03..2f5c611f 100644 --- a/packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.js +++ b/packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.js @@ -1,8 +1,8 @@ import path from 'node:path'; -import Connection from '../../models/connection'; -import logger from '../../helpers/logger'; -import handler from '../../helpers/webhook-handler'; +import Connection from '../../models/connection.js'; +import logger from '../../helpers/logger.js'; +import handler from '../../helpers/webhook-handler.js'; export default async (request, response) => { const computedRequestPayload = { diff --git a/packages/backend/src/controllers/webhooks/handler-by-flow-id.js b/packages/backend/src/controllers/webhooks/handler-by-flow-id.js index c262c857..5ed0fd67 100644 --- a/packages/backend/src/controllers/webhooks/handler-by-flow-id.js +++ b/packages/backend/src/controllers/webhooks/handler-by-flow-id.js @@ -1,6 +1,6 @@ -import Flow from '../../models/flow'; -import logger from '../../helpers/logger'; -import handler from '../../helpers/webhook-handler'; +import Flow from '../../models/flow.js'; +import logger from '../../helpers/logger.js'; +import handler from '../../helpers/webhook-handler.js'; export default async (request, response) => { const computedRequestPayload = { diff --git a/packages/backend/src/errors/quote-exceeded.js b/packages/backend/src/errors/quote-exceeded.js index 6a3239d0..7ca48d3c 100644 --- a/packages/backend/src/errors/quote-exceeded.js +++ b/packages/backend/src/errors/quote-exceeded.js @@ -1,4 +1,4 @@ -import BaseError from './base'; +import BaseError from './base.js'; export default class QuotaExceededError extends BaseError { constructor(error = 'The allowed task quota has been exhausted!') { diff --git a/packages/backend/src/graphql/mutation-resolvers.js b/packages/backend/src/graphql/mutation-resolvers.js index 1dc619e5..5d90f137 100644 --- a/packages/backend/src/graphql/mutation-resolvers.js +++ b/packages/backend/src/graphql/mutation-resolvers.js @@ -1,37 +1,37 @@ -import createAppAuthClient from './mutations/create-app-auth-client.ee'; -import createAppConfig from './mutations/create-app-config.ee'; -import createConnection from './mutations/create-connection'; -import createFlow from './mutations/create-flow'; -import createRole from './mutations/create-role.ee'; -import createStep from './mutations/create-step'; -import createUser from './mutations/create-user.ee'; -import deleteConnection from './mutations/delete-connection'; -import deleteCurrentUser from './mutations/delete-current-user.ee'; -import deleteFlow from './mutations/delete-flow'; -import deleteRole from './mutations/delete-role.ee'; -import deleteStep from './mutations/delete-step'; -import deleteUser from './mutations/delete-user.ee'; -import duplicateFlow from './mutations/duplicate-flow'; -import executeFlow from './mutations/execute-flow'; -import forgotPassword from './mutations/forgot-password.ee'; -import generateAuthUrl from './mutations/generate-auth-url'; -import login from './mutations/login'; -import registerUser from './mutations/register-user.ee'; -import resetConnection from './mutations/reset-connection'; -import resetPassword from './mutations/reset-password.ee'; -import updateAppAuthClient from './mutations/update-app-auth-client.ee'; -import updateAppConfig from './mutations/update-app-config.ee'; -import updateConfig from './mutations/update-config.ee'; -import updateConnection from './mutations/update-connection'; -import updateCurrentUser from './mutations/update-current-user'; -import updateFlow from './mutations/update-flow'; -import updateFlowStatus from './mutations/update-flow-status'; -import updateRole from './mutations/update-role.ee'; -import updateStep from './mutations/update-step'; -import updateUser from './mutations/update-user.ee'; -import upsertSamlAuthProvider from './mutations/upsert-saml-auth-provider.ee'; -import upsertSamlAuthProvidersRoleMappings from './mutations/upsert-saml-auth-providers-role-mappings.ee'; -import verifyConnection from './mutations/verify-connection'; +import createAppAuthClient from './mutations/create-app-auth-client.ee.js'; +import createAppConfig from './mutations/create-app-config.ee.js'; +import createConnection from './mutations/create-connection.js'; +import createFlow from './mutations/create-flow.js'; +import createRole from './mutations/create-role.ee.js'; +import createStep from './mutations/create-step.js'; +import createUser from './mutations/create-user.ee.js'; +import deleteConnection from './mutations/delete-connection.js'; +import deleteCurrentUser from './mutations/delete-current-user.ee.js'; +import deleteFlow from './mutations/delete-flow.js'; +import deleteRole from './mutations/delete-role.ee.js'; +import deleteStep from './mutations/delete-step.js'; +import deleteUser from './mutations/delete-user.ee.js'; +import duplicateFlow from './mutations/duplicate-flow.js'; +import executeFlow from './mutations/execute-flow.js'; +import forgotPassword from './mutations/forgot-password.ee.js'; +import generateAuthUrl from './mutations/generate-auth-url.js'; +import login from './mutations/login.js'; +import registerUser from './mutations/register-user.ee.js'; +import resetConnection from './mutations/reset-connection.js'; +import resetPassword from './mutations/reset-password.ee.js'; +import updateAppAuthClient from './mutations/update-app-auth-client.ee.js'; +import updateAppConfig from './mutations/update-app-config.ee.js'; +import updateConfig from './mutations/update-config.ee.js'; +import updateConnection from './mutations/update-connection.js'; +import updateCurrentUser from './mutations/update-current-user.js'; +import updateFlow from './mutations/update-flow.js'; +import updateFlowStatus from './mutations/update-flow-status.js'; +import updateRole from './mutations/update-role.ee.js'; +import updateStep from './mutations/update-step.js'; +import updateUser from './mutations/update-user.ee.js'; +import upsertSamlAuthProvider from './mutations/upsert-saml-auth-provider.ee.js'; +import upsertSamlAuthProvidersRoleMappings from './mutations/upsert-saml-auth-providers-role-mappings.ee.js'; +import verifyConnection from './mutations/verify-connection.js'; const mutationResolvers = { createAppAuthClient, diff --git a/packages/backend/src/graphql/mutations/create-app-auth-client.ee.js b/packages/backend/src/graphql/mutations/create-app-auth-client.ee.js index d0536cc1..6af40984 100644 --- a/packages/backend/src/graphql/mutations/create-app-auth-client.ee.js +++ b/packages/backend/src/graphql/mutations/create-app-auth-client.ee.js @@ -1,4 +1,4 @@ -import AppConfig from '../../models/app-config'; +import AppConfig from '../../models/app-config.js'; const createAppAuthClient = async (_parent, params, context) => { context.currentUser.can('update', 'App'); diff --git a/packages/backend/src/graphql/mutations/create-app-config.ee.js b/packages/backend/src/graphql/mutations/create-app-config.ee.js index 4a699b25..32b1debc 100644 --- a/packages/backend/src/graphql/mutations/create-app-config.ee.js +++ b/packages/backend/src/graphql/mutations/create-app-config.ee.js @@ -1,5 +1,5 @@ -import App from '../../models/app'; -import AppConfig from '../../models/app-config'; +import App from '../../models/app.js'; +import AppConfig from '../../models/app-config.js'; const createAppConfig = async (_parent, params, context) => { context.currentUser.can('update', 'App'); diff --git a/packages/backend/src/graphql/mutations/create-connection.js b/packages/backend/src/graphql/mutations/create-connection.js index f2498e91..2378a0eb 100644 --- a/packages/backend/src/graphql/mutations/create-connection.js +++ b/packages/backend/src/graphql/mutations/create-connection.js @@ -1,5 +1,5 @@ -import App from '../../models/app'; -import AppConfig from '../../models/app-config'; +import App from '../../models/app.js'; +import AppConfig from '../../models/app-config.js'; const createConnection = async (_parent, params, context) => { context.currentUser.can('create', 'Connection'); diff --git a/packages/backend/src/graphql/mutations/create-flow.js b/packages/backend/src/graphql/mutations/create-flow.js index 3cd11aa1..c16166d9 100644 --- a/packages/backend/src/graphql/mutations/create-flow.js +++ b/packages/backend/src/graphql/mutations/create-flow.js @@ -1,5 +1,5 @@ -import App from '../../models/app'; -import Step from '../../models/step'; +import App from '../../models/app.js'; +import Step from '../../models/step.js'; const createFlow = async (_parent, params, context) => { context.currentUser.can('create', 'Flow'); diff --git a/packages/backend/src/graphql/mutations/create-role.ee.js b/packages/backend/src/graphql/mutations/create-role.ee.js index 1a0b08c0..7e85207b 100644 --- a/packages/backend/src/graphql/mutations/create-role.ee.js +++ b/packages/backend/src/graphql/mutations/create-role.ee.js @@ -1,5 +1,5 @@ -import kebabCase from 'lodash/kebabCase'; -import Role from '../../models/role'; +import kebabCase from 'lodash/kebabCase.js'; +import Role from '../../models/role.js'; const createRole = async (_parent, params, context) => { context.currentUser.can('create', 'Role'); diff --git a/packages/backend/src/graphql/mutations/create-step.js b/packages/backend/src/graphql/mutations/create-step.js index d037e8fc..05b8d364 100644 --- a/packages/backend/src/graphql/mutations/create-step.js +++ b/packages/backend/src/graphql/mutations/create-step.js @@ -1,5 +1,5 @@ -import App from '../../models/app'; -import Flow from '../../models/flow'; +import App from '../../models/app.js'; +import Flow from '../../models/flow.js'; const createStep = async (_parent, params, context) => { const conditions = context.currentUser.can('update', 'Flow'); diff --git a/packages/backend/src/graphql/mutations/create-user.ee.js b/packages/backend/src/graphql/mutations/create-user.ee.js index 2f7d616f..2bd732a1 100644 --- a/packages/backend/src/graphql/mutations/create-user.ee.js +++ b/packages/backend/src/graphql/mutations/create-user.ee.js @@ -1,5 +1,5 @@ -import User from '../../models/user'; -import Role from '../../models/role'; +import User from '../../models/user.js'; +import Role from '../../models/role.js'; const createUser = async (_parent, params, context) => { context.currentUser.can('create', 'User'); diff --git a/packages/backend/src/graphql/mutations/delete-current-user.ee.js b/packages/backend/src/graphql/mutations/delete-current-user.ee.js index 8483d407..273b4ce2 100644 --- a/packages/backend/src/graphql/mutations/delete-current-user.ee.js +++ b/packages/backend/src/graphql/mutations/delete-current-user.ee.js @@ -1,9 +1,9 @@ import { Duration } from 'luxon'; -import deleteUserQueue from '../../queues/delete-user.ee'; -import flowQueue from '../../queues/flow'; -import Flow from '../../models/flow'; -import ExecutionStep from '../../models/execution-step'; -import appConfig from '../../config/app'; +import deleteUserQueue from '../../queues/delete-user.ee.js'; +import flowQueue from '../../queues/flow.js'; +import Flow from '../../models/flow.js'; +import ExecutionStep from '../../models/execution-step.js'; +import appConfig from '../../config/app.js'; const deleteCurrentUser = async (_parent, params, context) => { const id = context.currentUser.id; diff --git a/packages/backend/src/graphql/mutations/delete-flow.js b/packages/backend/src/graphql/mutations/delete-flow.js index 1a122df7..484e09c9 100644 --- a/packages/backend/src/graphql/mutations/delete-flow.js +++ b/packages/backend/src/graphql/mutations/delete-flow.js @@ -1,7 +1,7 @@ -import Flow from '../../models/flow'; -import ExecutionStep from '../../models/execution-step'; -import globalVariable from '../../helpers/global-variable'; -import logger from '../../helpers/logger'; +import Flow from '../../models/flow.js'; +import ExecutionStep from '../../models/execution-step.js'; +import globalVariable from '../../helpers/global-variable.js'; +import logger from '../../helpers/logger.js'; const deleteFlow = async (_parent, params, context) => { const conditions = context.currentUser.can('delete', 'Flow'); diff --git a/packages/backend/src/graphql/mutations/delete-role.ee.js b/packages/backend/src/graphql/mutations/delete-role.ee.js index f653df43..9b0249a2 100644 --- a/packages/backend/src/graphql/mutations/delete-role.ee.js +++ b/packages/backend/src/graphql/mutations/delete-role.ee.js @@ -1,5 +1,5 @@ -import Role from '../../models/role'; -import SamlAuthProvider from '../../models/saml-auth-provider.ee'; +import Role from '../../models/role.js'; +import SamlAuthProvider from '../../models/saml-auth-provider.ee.js'; const deleteRole = async (_parent, params, context) => { context.currentUser.can('delete', 'Role'); diff --git a/packages/backend/src/graphql/mutations/delete-user.ee.js b/packages/backend/src/graphql/mutations/delete-user.ee.js index cd83eacb..7b66dd05 100644 --- a/packages/backend/src/graphql/mutations/delete-user.ee.js +++ b/packages/backend/src/graphql/mutations/delete-user.ee.js @@ -1,6 +1,6 @@ import { Duration } from 'luxon'; -import User from '../../models/user'; -import deleteUserQueue from '../../queues/delete-user.ee'; +import User from '../../models/user.js'; +import deleteUserQueue from '../../queues/delete-user.ee.js'; const deleteUser = async (_parent, params, context) => { context.currentUser.can('delete', 'User'); diff --git a/packages/backend/src/graphql/mutations/execute-flow.js b/packages/backend/src/graphql/mutations/execute-flow.js index a7d9c327..501b723b 100644 --- a/packages/backend/src/graphql/mutations/execute-flow.js +++ b/packages/backend/src/graphql/mutations/execute-flow.js @@ -1,5 +1,5 @@ -import testRun from '../../services/test-run'; -import Step from '../../models/step'; +import testRun from '../../services/test-run.js'; +import Step from '../../models/step.js'; const executeFlow = async (_parent, params, context) => { const conditions = context.currentUser.can('update', 'Flow'); diff --git a/packages/backend/src/graphql/mutations/forgot-password.ee.js b/packages/backend/src/graphql/mutations/forgot-password.ee.js index 94e6b5ee..da5446d9 100644 --- a/packages/backend/src/graphql/mutations/forgot-password.ee.js +++ b/packages/backend/src/graphql/mutations/forgot-password.ee.js @@ -1,10 +1,10 @@ -import appConfig from '../../config/app'; -import User from '../../models/user'; -import emailQueue from '../../queues/email'; +import appConfig from '../../config/app.js'; +import User from '../../models/user.js'; +import emailQueue from '../../queues/email.js'; import { REMOVE_AFTER_30_DAYS_OR_150_JOBS, REMOVE_AFTER_7_DAYS_OR_50_JOBS, -} from '../../helpers/remove-job-configuration'; +} from '../../helpers/remove-job-configuration.js'; const forgotPassword = async (_parent, params) => { const { email } = params.input; diff --git a/packages/backend/src/graphql/mutations/generate-auth-url.js b/packages/backend/src/graphql/mutations/generate-auth-url.js index 60d0581c..c3fe5594 100644 --- a/packages/backend/src/graphql/mutations/generate-auth-url.js +++ b/packages/backend/src/graphql/mutations/generate-auth-url.js @@ -1,5 +1,5 @@ -import globalVariable from '../../helpers/global-variable'; -import App from '../../models/app'; +import globalVariable from '../../helpers/global-variable.js'; +import App from '../../models/app.js'; const generateAuthUrl = async (_parent, params, context) => { context.currentUser.can('create', 'Connection'); diff --git a/packages/backend/src/graphql/mutations/login.js b/packages/backend/src/graphql/mutations/login.js index a00d5af8..de9d036d 100644 --- a/packages/backend/src/graphql/mutations/login.js +++ b/packages/backend/src/graphql/mutations/login.js @@ -1,5 +1,5 @@ -import User from '../../models/user'; -import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id'; +import User from '../../models/user.js'; +import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id.js'; const login = async (_parent, params) => { const user = await User.query().findOne({ diff --git a/packages/backend/src/graphql/mutations/register-user.ee.js b/packages/backend/src/graphql/mutations/register-user.ee.js index 860258f0..c24d1922 100644 --- a/packages/backend/src/graphql/mutations/register-user.ee.js +++ b/packages/backend/src/graphql/mutations/register-user.ee.js @@ -1,5 +1,5 @@ -import User from '../../models/user'; -import Role from '../../models/role'; +import User from '../../models/user.js'; +import Role from '../../models/role.js'; const registerUser = async (_parent, params) => { const { fullName, email, password } = params.input; diff --git a/packages/backend/src/graphql/mutations/reset-password.ee.js b/packages/backend/src/graphql/mutations/reset-password.ee.js index 15177b17..309b006a 100644 --- a/packages/backend/src/graphql/mutations/reset-password.ee.js +++ b/packages/backend/src/graphql/mutations/reset-password.ee.js @@ -1,4 +1,4 @@ -import User from '../../models/user'; +import User from '../../models/user.js'; const resetPassword = async (_parent, params) => { const { token, password } = params.input; diff --git a/packages/backend/src/graphql/mutations/update-app-auth-client.ee.js b/packages/backend/src/graphql/mutations/update-app-auth-client.ee.js index b373a282..bbd0380c 100644 --- a/packages/backend/src/graphql/mutations/update-app-auth-client.ee.js +++ b/packages/backend/src/graphql/mutations/update-app-auth-client.ee.js @@ -1,4 +1,4 @@ -import AppAuthClient from '../../models/app-auth-client'; +import AppAuthClient from '../../models/app-auth-client.js'; const updateAppAuthClient = async (_parent, params, context) => { context.currentUser.can('update', 'App'); diff --git a/packages/backend/src/graphql/mutations/update-app-config.ee.js b/packages/backend/src/graphql/mutations/update-app-config.ee.js index ce95cc5d..1187aee7 100644 --- a/packages/backend/src/graphql/mutations/update-app-config.ee.js +++ b/packages/backend/src/graphql/mutations/update-app-config.ee.js @@ -1,4 +1,4 @@ -import AppConfig from '../../models/app-config'; +import AppConfig from '../../models/app-config.js'; const updateAppConfig = async (_parent, params, context) => { context.currentUser.can('update', 'App'); diff --git a/packages/backend/src/graphql/mutations/update-config.ee.js b/packages/backend/src/graphql/mutations/update-config.ee.js index 02371f89..ad216d64 100644 --- a/packages/backend/src/graphql/mutations/update-config.ee.js +++ b/packages/backend/src/graphql/mutations/update-config.ee.js @@ -1,4 +1,4 @@ -import Config from '../../models/config'; +import Config from '../../models/config.js'; const updateConfig = async (_parent, params, context) => { context.currentUser.can('update', 'Config'); diff --git a/packages/backend/src/graphql/mutations/update-connection.js b/packages/backend/src/graphql/mutations/update-connection.js index 49e81f05..bc8cdc58 100644 --- a/packages/backend/src/graphql/mutations/update-connection.js +++ b/packages/backend/src/graphql/mutations/update-connection.js @@ -1,4 +1,4 @@ -import AppAuthClient from '../../models/app-auth-client'; +import AppAuthClient from '../../models/app-auth-client.js'; const updateConnection = async (_parent, params, context) => { context.currentUser.can('create', 'Connection'); diff --git a/packages/backend/src/graphql/mutations/update-flow-status.js b/packages/backend/src/graphql/mutations/update-flow-status.js index f94fca0b..169996f2 100644 --- a/packages/backend/src/graphql/mutations/update-flow-status.js +++ b/packages/backend/src/graphql/mutations/update-flow-status.js @@ -1,10 +1,10 @@ -import Flow from '../../models/flow'; -import flowQueue from '../../queues/flow'; +import Flow from '../../models/flow.js'; +import flowQueue from '../../queues/flow.js'; import { REMOVE_AFTER_30_DAYS_OR_150_JOBS, REMOVE_AFTER_7_DAYS_OR_50_JOBS, -} from '../../helpers/remove-job-configuration'; -import globalVariable from '../../helpers/global-variable'; +} from '../../helpers/remove-job-configuration.js'; +import globalVariable from '../../helpers/global-variable.js'; const JOB_NAME = 'flow'; const EVERY_15_MINUTES_CRON = '*/15 * * * *'; diff --git a/packages/backend/src/graphql/mutations/update-role.ee.js b/packages/backend/src/graphql/mutations/update-role.ee.js index 5d00456a..2566dc40 100644 --- a/packages/backend/src/graphql/mutations/update-role.ee.js +++ b/packages/backend/src/graphql/mutations/update-role.ee.js @@ -1,6 +1,6 @@ -import Role from '../../models/role'; -import Permission from '../../models/permission'; -import permissionCatalog from '../../helpers/permission-catalog.ee'; +import Role from '../../models/role.js'; +import Permission from '../../models/permission.js'; +import permissionCatalog from '../../helpers/permission-catalog.ee.js'; const updateRole = async (_parent, params, context) => { context.currentUser.can('update', 'Role'); diff --git a/packages/backend/src/graphql/mutations/update-step.js b/packages/backend/src/graphql/mutations/update-step.js index 061ffebf..3d87bb53 100644 --- a/packages/backend/src/graphql/mutations/update-step.js +++ b/packages/backend/src/graphql/mutations/update-step.js @@ -1,6 +1,6 @@ -import App from '../../models/app'; -import Step from '../../models/step'; -import Connection from '../../models/connection'; +import App from '../../models/app.js'; +import Step from '../../models/step.js'; +import Connection from '../../models/connection.js'; const updateStep = async (_parent, params, context) => { const { isCreator } = context.currentUser.can('update', 'Flow'); diff --git a/packages/backend/src/graphql/mutations/update-user.ee.js b/packages/backend/src/graphql/mutations/update-user.ee.js index a2417a7c..0e27eedb 100644 --- a/packages/backend/src/graphql/mutations/update-user.ee.js +++ b/packages/backend/src/graphql/mutations/update-user.ee.js @@ -1,4 +1,4 @@ -import User from '../../models/user'; +import User from '../../models/user.js'; const updateUser = async (_parent, params, context) => { context.currentUser.can('update', 'User'); diff --git a/packages/backend/src/graphql/mutations/upsert-saml-auth-provider.ee.js b/packages/backend/src/graphql/mutations/upsert-saml-auth-provider.ee.js index 0d2b3a69..382945b4 100644 --- a/packages/backend/src/graphql/mutations/upsert-saml-auth-provider.ee.js +++ b/packages/backend/src/graphql/mutations/upsert-saml-auth-provider.ee.js @@ -1,4 +1,4 @@ -import SamlAuthProvider from '../../models/saml-auth-provider.ee'; +import SamlAuthProvider from '../../models/saml-auth-provider.ee.js'; const upsertSamlAuthProvider = async (_parent, params, context) => { context.currentUser.can('create', 'SamlAuthProvider'); diff --git a/packages/backend/src/graphql/mutations/upsert-saml-auth-providers-role-mappings.ee.js b/packages/backend/src/graphql/mutations/upsert-saml-auth-providers-role-mappings.ee.js index 18030dda..0040d48e 100644 --- a/packages/backend/src/graphql/mutations/upsert-saml-auth-providers-role-mappings.ee.js +++ b/packages/backend/src/graphql/mutations/upsert-saml-auth-providers-role-mappings.ee.js @@ -1,6 +1,6 @@ -import SamlAuthProvider from '../../models/saml-auth-provider.ee'; -import SamlAuthProvidersRoleMapping from '../../models/saml-auth-providers-role-mapping.ee'; -import isEmpty from 'lodash/isEmpty'; +import SamlAuthProvider from '../../models/saml-auth-provider.ee.js'; +import SamlAuthProvidersRoleMapping from '../../models/saml-auth-providers-role-mapping.ee.js'; +import isEmpty from 'lodash/isEmpty.js'; const upsertSamlAuthProvidersRoleMappings = async ( _parent, diff --git a/packages/backend/src/graphql/mutations/verify-connection.js b/packages/backend/src/graphql/mutations/verify-connection.js index f15e1844..fdd95764 100644 --- a/packages/backend/src/graphql/mutations/verify-connection.js +++ b/packages/backend/src/graphql/mutations/verify-connection.js @@ -1,5 +1,5 @@ -import App from '../../models/app'; -import globalVariable from '../../helpers/global-variable'; +import App from '../../models/app.js'; +import globalVariable from '../../helpers/global-variable.js'; const verifyConnection = async (_parent, params, context) => { context.currentUser.can('create', 'Connection'); diff --git a/packages/backend/src/graphql/queries/get-app-auth-client.ee.js b/packages/backend/src/graphql/queries/get-app-auth-client.ee.js index b88fd782..7ddf6328 100644 --- a/packages/backend/src/graphql/queries/get-app-auth-client.ee.js +++ b/packages/backend/src/graphql/queries/get-app-auth-client.ee.js @@ -1,4 +1,4 @@ -import AppAuthClient from '../../models/app-auth-client'; +import AppAuthClient from '../../models/app-auth-client.js'; const getAppAuthClient = async (_parent, params, context) => { let canSeeAllClients = false; diff --git a/packages/backend/src/graphql/queries/get-app-auth-clients.ee.js b/packages/backend/src/graphql/queries/get-app-auth-clients.ee.js index a9123fbf..544aaa7e 100644 --- a/packages/backend/src/graphql/queries/get-app-auth-clients.ee.js +++ b/packages/backend/src/graphql/queries/get-app-auth-clients.ee.js @@ -1,4 +1,4 @@ -import AppConfig from '../../models/app-config'; +import AppConfig from '../../models/app-config.js'; const getAppAuthClients = async (_parent, params, context) => { let canSeeAllClients = false; diff --git a/packages/backend/src/graphql/queries/get-app-config.ee.js b/packages/backend/src/graphql/queries/get-app-config.ee.js index b759ae8b..513191f5 100644 --- a/packages/backend/src/graphql/queries/get-app-config.ee.js +++ b/packages/backend/src/graphql/queries/get-app-config.ee.js @@ -1,4 +1,4 @@ -import AppConfig from '../../models/app-config'; +import AppConfig from '../../models/app-config.js'; const getAppConfig = async (_parent, params, context) => { context.currentUser.can('create', 'Connection'); diff --git a/packages/backend/src/graphql/queries/get-app.js b/packages/backend/src/graphql/queries/get-app.js index 14139670..0f9dd4b5 100644 --- a/packages/backend/src/graphql/queries/get-app.js +++ b/packages/backend/src/graphql/queries/get-app.js @@ -1,5 +1,5 @@ -import App from '../../models/app'; -import Connection from '../../models/connection'; +import App from '../../models/app.js'; +import Connection from '../../models/connection.js'; const getApp = async (_parent, params, context) => { const conditions = context.currentUser.can('read', 'Connection'); diff --git a/packages/backend/src/graphql/queries/get-apps.js b/packages/backend/src/graphql/queries/get-apps.js index 6ba0dd3f..2c3a78a0 100644 --- a/packages/backend/src/graphql/queries/get-apps.js +++ b/packages/backend/src/graphql/queries/get-apps.js @@ -1,4 +1,4 @@ -import App from '../../models/app'; +import App from '../../models/app.js'; const getApps = async (_parent, params) => { const apps = await App.findAll(params.name); diff --git a/packages/backend/src/graphql/queries/get-automatisch-info.js b/packages/backend/src/graphql/queries/get-automatisch-info.js index dd89d273..63d444a2 100644 --- a/packages/backend/src/graphql/queries/get-automatisch-info.js +++ b/packages/backend/src/graphql/queries/get-automatisch-info.js @@ -1,5 +1,5 @@ -import appConfig from '../../config/app'; -import { getLicense } from '../../helpers/license.ee'; +import appConfig from '../../config/app.js'; +import { getLicense } from '../../helpers/license.ee.js'; const getAutomatischInfo = async () => { const license = await getLicense(); diff --git a/packages/backend/src/graphql/queries/get-billing-and-usage.ee.js b/packages/backend/src/graphql/queries/get-billing-and-usage.ee.js index ccc63df6..d23a44e5 100644 --- a/packages/backend/src/graphql/queries/get-billing-and-usage.ee.js +++ b/packages/backend/src/graphql/queries/get-billing-and-usage.ee.js @@ -1,6 +1,6 @@ import { DateTime } from 'luxon'; -import Billing from '../../helpers/billing/index.ee'; -import ExecutionStep from '../../models/execution-step'; +import Billing from '../../helpers/billing/index.ee.js'; +import ExecutionStep from '../../models/execution-step.js'; const getBillingAndUsage = async (_parent, _params, context) => { const persistedSubscription = await context.currentUser.$relatedQuery( diff --git a/packages/backend/src/graphql/queries/get-config.ee.js b/packages/backend/src/graphql/queries/get-config.ee.js index f1cad6ce..4844be88 100644 --- a/packages/backend/src/graphql/queries/get-config.ee.js +++ b/packages/backend/src/graphql/queries/get-config.ee.js @@ -1,5 +1,5 @@ -import { hasValidLicense } from '../../helpers/license.ee'; -import Config from '../../models/config'; +import { hasValidLicense } from '../../helpers/license.ee.js'; +import Config from '../../models/config.js'; const getConfig = async (_parent, params) => { if (!(await hasValidLicense())) return {}; diff --git a/packages/backend/src/graphql/queries/get-connected-apps.js b/packages/backend/src/graphql/queries/get-connected-apps.js index 32235ca7..3826c746 100644 --- a/packages/backend/src/graphql/queries/get-connected-apps.js +++ b/packages/backend/src/graphql/queries/get-connected-apps.js @@ -1,6 +1,6 @@ -import App from '../../models/app'; -import Flow from '../../models/flow'; -import Connection from '../../models/connection'; +import App from '../../models/app.js'; +import Flow from '../../models/flow.js'; +import Connection from '../../models/connection.js'; const getConnectedApps = async (_parent, params, context) => { const conditions = context.currentUser.can('read', 'Connection'); diff --git a/packages/backend/src/graphql/queries/get-dynamic-data.js b/packages/backend/src/graphql/queries/get-dynamic-data.js index 29f89bfe..731b7d5d 100644 --- a/packages/backend/src/graphql/queries/get-dynamic-data.js +++ b/packages/backend/src/graphql/queries/get-dynamic-data.js @@ -1,8 +1,8 @@ -import App from '../../models/app'; -import Step from '../../models/step'; -import ExecutionStep from '../../models/execution-step'; -import globalVariable from '../../helpers/global-variable'; -import computeParameters from '../../helpers/compute-parameters'; +import App from '../../models/app.js'; +import Step from '../../models/step.js'; +import ExecutionStep from '../../models/execution-step.js'; +import globalVariable from '../../helpers/global-variable.js'; +import computeParameters from '../../helpers/compute-parameters.js'; const getDynamicData = async (_parent, params, context) => { const conditions = context.currentUser.can('update', 'Flow'); diff --git a/packages/backend/src/graphql/queries/get-dynamic-fields.js b/packages/backend/src/graphql/queries/get-dynamic-fields.js index c3571cf1..2d7d18db 100644 --- a/packages/backend/src/graphql/queries/get-dynamic-fields.js +++ b/packages/backend/src/graphql/queries/get-dynamic-fields.js @@ -1,6 +1,6 @@ -import App from '../../models/app'; -import Step from '../../models/step'; -import globalVariable from '../../helpers/global-variable'; +import App from '../../models/app.js'; +import Step from '../../models/step.js'; +import globalVariable from '../../helpers/global-variable.js'; const getDynamicFields = async (_parent, params, context) => { const conditions = context.currentUser.can('update', 'Flow'); diff --git a/packages/backend/src/graphql/queries/get-execution-steps.js b/packages/backend/src/graphql/queries/get-execution-steps.js index a69c8e2c..61eab6ac 100644 --- a/packages/backend/src/graphql/queries/get-execution-steps.js +++ b/packages/backend/src/graphql/queries/get-execution-steps.js @@ -1,5 +1,5 @@ -import paginate from '../../helpers/pagination'; -import Execution from '../../models/execution'; +import paginate from '../../helpers/pagination.js'; +import Execution from '../../models/execution.js'; const getExecutionSteps = async (_parent, params, context) => { const conditions = context.currentUser.can('read', 'Execution'); diff --git a/packages/backend/src/graphql/queries/get-execution.js b/packages/backend/src/graphql/queries/get-execution.js index b14409c0..37659ffb 100644 --- a/packages/backend/src/graphql/queries/get-execution.js +++ b/packages/backend/src/graphql/queries/get-execution.js @@ -1,4 +1,4 @@ -import Execution from '../../models/execution'; +import Execution from '../../models/execution.js'; const getExecution = async (_parent, params, context) => { const conditions = context.currentUser.can('read', 'Execution'); diff --git a/packages/backend/src/graphql/queries/get-executions.js b/packages/backend/src/graphql/queries/get-executions.js index 20ca0cec..d19e6420 100644 --- a/packages/backend/src/graphql/queries/get-executions.js +++ b/packages/backend/src/graphql/queries/get-executions.js @@ -1,7 +1,7 @@ import { raw } from 'objection'; import { DateTime } from 'luxon'; -import Execution from '../../models/execution'; -import paginate from '../../helpers/pagination'; +import Execution from '../../models/execution.js'; +import paginate from '../../helpers/pagination.js'; const getExecutions = async (_parent, params, context) => { const conditions = context.currentUser.can('read', 'Execution'); diff --git a/packages/backend/src/graphql/queries/get-flow.js b/packages/backend/src/graphql/queries/get-flow.js index 935f852a..3c1b750b 100644 --- a/packages/backend/src/graphql/queries/get-flow.js +++ b/packages/backend/src/graphql/queries/get-flow.js @@ -1,4 +1,4 @@ -import Flow from '../../models/flow'; +import Flow from '../../models/flow.js'; const getFlow = async (_parent, params, context) => { const conditions = context.currentUser.can('read', 'Flow'); diff --git a/packages/backend/src/graphql/queries/get-flows.js b/packages/backend/src/graphql/queries/get-flows.js index 66c120f2..6f3899e8 100644 --- a/packages/backend/src/graphql/queries/get-flows.js +++ b/packages/backend/src/graphql/queries/get-flows.js @@ -1,5 +1,5 @@ -import Flow from '../../models/flow'; -import paginate from '../../helpers/pagination'; +import Flow from '../../models/flow.js'; +import paginate from '../../helpers/pagination.js'; const getFlows = async (_parent, params, context) => { const conditions = context.currentUser.can('read', 'Flow'); diff --git a/packages/backend/src/graphql/queries/get-invoices.ee.js b/packages/backend/src/graphql/queries/get-invoices.ee.js index 9183f62d..afb7d031 100644 --- a/packages/backend/src/graphql/queries/get-invoices.ee.js +++ b/packages/backend/src/graphql/queries/get-invoices.ee.js @@ -1,4 +1,4 @@ -import Billing from '../../helpers/billing/index.ee'; +import Billing from '../../helpers/billing/index.ee.js'; const getInvoices = async (_parent, _params, context) => { const subscription = await context.currentUser.$relatedQuery( diff --git a/packages/backend/src/graphql/queries/get-notifications.js b/packages/backend/src/graphql/queries/get-notifications.js index 39da69b1..c36eb442 100644 --- a/packages/backend/src/graphql/queries/get-notifications.js +++ b/packages/backend/src/graphql/queries/get-notifications.js @@ -1,6 +1,7 @@ -import axios from '../../helpers/axios-with-proxy'; +import axios from '../../helpers/axios-with-proxy.js'; -const NOTIFICATIONS_URL = 'https://notifications.automatisch.io/notifications.json'; +const NOTIFICATIONS_URL = + 'https://notifications.automatisch.io/notifications.json'; const getNotifications = async () => { try { diff --git a/packages/backend/src/graphql/queries/get-paddle-info.ee.js b/packages/backend/src/graphql/queries/get-paddle-info.ee.js index 35fc3c64..a07df777 100644 --- a/packages/backend/src/graphql/queries/get-paddle-info.ee.js +++ b/packages/backend/src/graphql/queries/get-paddle-info.ee.js @@ -1,5 +1,5 @@ -import appConfig from '../../config/app'; -import Billing from '../../helpers/billing/index.ee'; +import appConfig from '../../config/app.js'; +import Billing from '../../helpers/billing/index.ee.js'; const getPaddleInfo = async () => { if (!appConfig.isCloud) return; diff --git a/packages/backend/src/graphql/queries/get-payment-plans.ee.js b/packages/backend/src/graphql/queries/get-payment-plans.ee.js index 47fa7d91..49c4f7e2 100644 --- a/packages/backend/src/graphql/queries/get-payment-plans.ee.js +++ b/packages/backend/src/graphql/queries/get-payment-plans.ee.js @@ -1,5 +1,5 @@ -import appConfig from '../../config/app'; -import Billing from '../../helpers/billing/index.ee'; +import appConfig from '../../config/app.js'; +import Billing from '../../helpers/billing/index.ee.js'; const getPaymentPlans = async () => { if (!appConfig.isCloud) return; diff --git a/packages/backend/src/graphql/queries/get-permission-catalog.ee.js b/packages/backend/src/graphql/queries/get-permission-catalog.ee.js index 92f8cdc6..b902315b 100644 --- a/packages/backend/src/graphql/queries/get-permission-catalog.ee.js +++ b/packages/backend/src/graphql/queries/get-permission-catalog.ee.js @@ -1,4 +1,4 @@ -import permissionCatalog from '../../helpers/permission-catalog.ee'; +import permissionCatalog from '../../helpers/permission-catalog.ee.js'; const getPermissionCatalog = async () => { return permissionCatalog; diff --git a/packages/backend/src/graphql/queries/get-role.ee.js b/packages/backend/src/graphql/queries/get-role.ee.js index 23db99dc..906535b3 100644 --- a/packages/backend/src/graphql/queries/get-role.ee.js +++ b/packages/backend/src/graphql/queries/get-role.ee.js @@ -1,4 +1,4 @@ -import Role from '../../models/role'; +import Role from '../../models/role.js'; const getRole = async (_parent, params, context) => { context.currentUser.can('read', 'Role'); diff --git a/packages/backend/src/graphql/queries/get-roles.ee.js b/packages/backend/src/graphql/queries/get-roles.ee.js index 4c5cc25f..900af081 100644 --- a/packages/backend/src/graphql/queries/get-roles.ee.js +++ b/packages/backend/src/graphql/queries/get-roles.ee.js @@ -1,4 +1,4 @@ -import Role from '../../models/role'; +import Role from '../../models/role.js'; const getRoles = async (_parent, params, context) => { context.currentUser.can('read', 'Role'); diff --git a/packages/backend/src/graphql/queries/get-saml-auth-provider-role-mappings.ee.js b/packages/backend/src/graphql/queries/get-saml-auth-provider-role-mappings.ee.js index e339d88d..b6e4246e 100644 --- a/packages/backend/src/graphql/queries/get-saml-auth-provider-role-mappings.ee.js +++ b/packages/backend/src/graphql/queries/get-saml-auth-provider-role-mappings.ee.js @@ -1,4 +1,4 @@ -import SamlAuthProvider from '../../models/saml-auth-provider.ee'; +import SamlAuthProvider from '../../models/saml-auth-provider.ee.js'; const getSamlAuthProviderRoleMappings = async (_parent, params, context) => { context.currentUser.can('read', 'SamlAuthProvider'); diff --git a/packages/backend/src/graphql/queries/get-saml-auth-provider.ee.js b/packages/backend/src/graphql/queries/get-saml-auth-provider.ee.js index b12353c2..b95233b8 100644 --- a/packages/backend/src/graphql/queries/get-saml-auth-provider.ee.js +++ b/packages/backend/src/graphql/queries/get-saml-auth-provider.ee.js @@ -1,4 +1,4 @@ -import SamlAuthProvider from '../../models/saml-auth-provider.ee'; +import SamlAuthProvider from '../../models/saml-auth-provider.ee.js'; const getSamlAuthProvider = async (_parent, params, context) => { context.currentUser.can('read', 'SamlAuthProvider'); diff --git a/packages/backend/src/graphql/queries/get-step-with-test-executions.js b/packages/backend/src/graphql/queries/get-step-with-test-executions.js index 21462594..5ec088b0 100644 --- a/packages/backend/src/graphql/queries/get-step-with-test-executions.js +++ b/packages/backend/src/graphql/queries/get-step-with-test-executions.js @@ -1,6 +1,6 @@ import { ref } from 'objection'; -import ExecutionStep from '../../models/execution-step'; -import Step from '../../models/step'; +import ExecutionStep from '../../models/execution-step.js'; +import Step from '../../models/step.js'; const getStepWithTestExecutions = async (_parent, params, context) => { const conditions = context.currentUser.can('update', 'Flow'); diff --git a/packages/backend/src/graphql/queries/get-subscription-status.ee.js b/packages/backend/src/graphql/queries/get-subscription-status.ee.js index b8669456..28df51eb 100644 --- a/packages/backend/src/graphql/queries/get-subscription-status.ee.js +++ b/packages/backend/src/graphql/queries/get-subscription-status.ee.js @@ -1,4 +1,4 @@ -import appConfig from '../../config/app'; +import appConfig from '../../config/app.js'; const getSubscriptionStatus = async (_parent, _params, context) => { if (!appConfig.isCloud) return; diff --git a/packages/backend/src/graphql/queries/get-trial-status.ee.js b/packages/backend/src/graphql/queries/get-trial-status.ee.js index d824ef94..1980ccb7 100644 --- a/packages/backend/src/graphql/queries/get-trial-status.ee.js +++ b/packages/backend/src/graphql/queries/get-trial-status.ee.js @@ -1,4 +1,4 @@ -import appConfig from '../../config/app'; +import appConfig from '../../config/app.js'; const getTrialStatus = async (_parent, _params, context) => { if (!appConfig.isCloud) return; diff --git a/packages/backend/src/graphql/queries/get-user.js b/packages/backend/src/graphql/queries/get-user.js index 77389e2c..61b0e753 100644 --- a/packages/backend/src/graphql/queries/get-user.js +++ b/packages/backend/src/graphql/queries/get-user.js @@ -1,4 +1,4 @@ -import User from '../../models/user'; +import User from '../../models/user.js'; const getUser = async (_parent, params, context) => { context.currentUser.can('read', 'User'); diff --git a/packages/backend/src/graphql/queries/get-users.js b/packages/backend/src/graphql/queries/get-users.js index a16722ba..6bff6c29 100644 --- a/packages/backend/src/graphql/queries/get-users.js +++ b/packages/backend/src/graphql/queries/get-users.js @@ -1,5 +1,5 @@ -import paginate from '../../helpers/pagination'; -import User from '../../models/user'; +import paginate from '../../helpers/pagination.js'; +import User from '../../models/user.js'; const getUsers = async (_parent, params, context) => { context.currentUser.can('read', 'User'); diff --git a/packages/backend/src/graphql/queries/healthcheck.js b/packages/backend/src/graphql/queries/healthcheck.js index e4126d08..68bbeea0 100644 --- a/packages/backend/src/graphql/queries/healthcheck.js +++ b/packages/backend/src/graphql/queries/healthcheck.js @@ -1,4 +1,4 @@ -import appConfig from '../../config/app'; +import appConfig from '../../config/app.js'; const healthcheck = () => { return { diff --git a/packages/backend/src/graphql/queries/list-saml-auth-providers.ee.js b/packages/backend/src/graphql/queries/list-saml-auth-providers.ee.js index 313dd8e4..1e2ee21e 100644 --- a/packages/backend/src/graphql/queries/list-saml-auth-providers.ee.js +++ b/packages/backend/src/graphql/queries/list-saml-auth-providers.ee.js @@ -1,4 +1,4 @@ -import SamlAuthProvider from '../../models/saml-auth-provider.ee'; +import SamlAuthProvider from '../../models/saml-auth-provider.ee.js'; const listSamlAuthProviders = async () => { const providers = await SamlAuthProvider.query().where({ active: true }); diff --git a/packages/backend/src/graphql/queries/test-connection.js b/packages/backend/src/graphql/queries/test-connection.js index 8d4efb08..6d8e3489 100644 --- a/packages/backend/src/graphql/queries/test-connection.js +++ b/packages/backend/src/graphql/queries/test-connection.js @@ -1,6 +1,6 @@ -import App from '../../models/app'; -import Connection from '../../models/connection'; -import globalVariable from '../../helpers/global-variable'; +import App from '../../models/app.js'; +import Connection from '../../models/connection.js'; +import globalVariable from '../../helpers/global-variable.js'; const testConnection = async (_parent, params, context) => { const conditions = context.currentUser.can('update', 'Connection'); diff --git a/packages/backend/src/graphql/query-resolvers.js b/packages/backend/src/graphql/query-resolvers.js index 20bb6bcb..f4bf2916 100644 --- a/packages/backend/src/graphql/query-resolvers.js +++ b/packages/backend/src/graphql/query-resolvers.js @@ -1,37 +1,37 @@ -import getApp from './queries/get-app'; -import getAppAuthClient from './queries/get-app-auth-client.ee'; -import getAppAuthClients from './queries/get-app-auth-clients.ee'; -import getAppConfig from './queries/get-app-config.ee'; -import getApps from './queries/get-apps'; -import getAutomatischInfo from './queries/get-automatisch-info'; -import getBillingAndUsage from './queries/get-billing-and-usage.ee'; -import getConfig from './queries/get-config.ee'; -import getConnectedApps from './queries/get-connected-apps'; -import getCurrentUser from './queries/get-current-user'; -import getDynamicData from './queries/get-dynamic-data'; -import getDynamicFields from './queries/get-dynamic-fields'; -import getExecution from './queries/get-execution'; -import getExecutionSteps from './queries/get-execution-steps'; -import getExecutions from './queries/get-executions'; -import getFlow from './queries/get-flow'; -import getFlows from './queries/get-flows'; -import getInvoices from './queries/get-invoices.ee'; -import getNotifications from './queries/get-notifications'; -import getPaddleInfo from './queries/get-paddle-info.ee'; -import getPaymentPlans from './queries/get-payment-plans.ee'; -import getPermissionCatalog from './queries/get-permission-catalog.ee'; -import getRole from './queries/get-role.ee'; -import getRoles from './queries/get-roles.ee'; -import getSamlAuthProviderRoleMappings from './queries/get-saml-auth-provider-role-mappings.ee'; -import getSamlAuthProvider from './queries/get-saml-auth-provider.ee'; -import getStepWithTestExecutions from './queries/get-step-with-test-executions'; -import getSubscriptionStatus from './queries/get-subscription-status.ee'; -import getTrialStatus from './queries/get-trial-status.ee'; -import getUser from './queries/get-user'; -import getUsers from './queries/get-users'; -import healthcheck from './queries/healthcheck'; -import listSamlAuthProviders from './queries/list-saml-auth-providers.ee'; -import testConnection from './queries/test-connection'; +import getApp from './queries/get-app.js'; +import getAppAuthClient from './queries/get-app-auth-client.ee.js'; +import getAppAuthClients from './queries/get-app-auth-clients.ee.js'; +import getAppConfig from './queries/get-app-config.ee.js'; +import getApps from './queries/get-apps.js'; +import getAutomatischInfo from './queries/get-automatisch-info.js'; +import getBillingAndUsage from './queries/get-billing-and-usage.ee.js'; +import getConfig from './queries/get-config.ee.js'; +import getConnectedApps from './queries/get-connected-apps.js'; +import getCurrentUser from './queries/get-current-user.js'; +import getDynamicData from './queries/get-dynamic-data.js'; +import getDynamicFields from './queries/get-dynamic-fields.js'; +import getExecution from './queries/get-execution.js'; +import getExecutionSteps from './queries/get-execution-steps.js'; +import getExecutions from './queries/get-executions.js'; +import getFlow from './queries/get-flow.js'; +import getFlows from './queries/get-flows.js'; +import getInvoices from './queries/get-invoices.ee.js'; +import getNotifications from './queries/get-notifications.js'; +import getPaddleInfo from './queries/get-paddle-info.ee.js'; +import getPaymentPlans from './queries/get-payment-plans.ee.js'; +import getPermissionCatalog from './queries/get-permission-catalog.ee.js'; +import getRole from './queries/get-role.ee.js'; +import getRoles from './queries/get-roles.ee.js'; +import getSamlAuthProviderRoleMappings from './queries/get-saml-auth-provider-role-mappings.ee.js'; +import getSamlAuthProvider from './queries/get-saml-auth-provider.ee.js'; +import getStepWithTestExecutions from './queries/get-step-with-test-executions.js'; +import getSubscriptionStatus from './queries/get-subscription-status.ee.js'; +import getTrialStatus from './queries/get-trial-status.ee.js'; +import getUser from './queries/get-user.js'; +import getUsers from './queries/get-users.js'; +import healthcheck from './queries/healthcheck.js'; +import listSamlAuthProviders from './queries/list-saml-auth-providers.ee.js'; +import testConnection from './queries/test-connection.js'; const queryResolvers = { getApp, diff --git a/packages/backend/src/graphql/resolvers.js b/packages/backend/src/graphql/resolvers.js index 8087332f..344c0416 100644 --- a/packages/backend/src/graphql/resolvers.js +++ b/packages/backend/src/graphql/resolvers.js @@ -1,5 +1,5 @@ -import mutationResolvers from './mutation-resolvers'; -import queryResolvers from './query-resolvers'; +import mutationResolvers from './mutation-resolvers.js'; +import queryResolvers from './query-resolvers.js'; const resolvers = { Query: queryResolvers, diff --git a/packages/backend/src/helpers/app-assets-handler.js b/packages/backend/src/helpers/app-assets-handler.js index f9e9a3fe..778ad25b 100644 --- a/packages/backend/src/helpers/app-assets-handler.js +++ b/packages/backend/src/helpers/app-assets-handler.js @@ -1,4 +1,8 @@ import express from 'express'; +import path from 'path'; +import { fileURLToPath } from 'url'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const appAssetsHandler = async (app) => { app.use('/apps/:appKey/assets/favicon.svg', (req, res, next) => { diff --git a/packages/backend/src/helpers/authentication.js b/packages/backend/src/helpers/authentication.js index cf4a022c..90b99c35 100644 --- a/packages/backend/src/helpers/authentication.js +++ b/packages/backend/src/helpers/authentication.js @@ -1,7 +1,7 @@ import { allow, rule, shield } from 'graphql-shield'; import jwt from 'jsonwebtoken'; -import appConfig from '../config/app'; -import User from '../models/user'; +import appConfig from '../config/app.js'; +import User from '../models/user.js'; const isAuthenticated = rule()(async (_parent, _args, req) => { const token = req.headers['authorization']; diff --git a/packages/backend/src/helpers/billing/index.ee.js b/packages/backend/src/helpers/billing/index.ee.js index 899d28e6..091598af 100644 --- a/packages/backend/src/helpers/billing/index.ee.js +++ b/packages/backend/src/helpers/billing/index.ee.js @@ -1,7 +1,7 @@ -import appConfig from '../../config/app'; -import paddleClient from './paddle.ee'; -import paddlePlans from './plans.ee'; -import webhooks from './webhooks.ee'; +import appConfig from '../../config/app.js'; +import paddleClient from './paddle.ee.js'; +import paddlePlans from './plans.ee.js'; +import webhooks from './webhooks.ee.js'; const paddleInfo = { sandbox: appConfig.isProd ? false : true, diff --git a/packages/backend/src/helpers/billing/paddle.ee.js b/packages/backend/src/helpers/billing/paddle.ee.js index 94d12f60..e4bed3fa 100644 --- a/packages/backend/src/helpers/billing/paddle.ee.js +++ b/packages/backend/src/helpers/billing/paddle.ee.js @@ -1,6 +1,6 @@ // TODO: replace with axios-with-proxy when needed import axios from 'axios'; -import appConfig from '../../config/app'; +import appConfig from '../../config/app.js'; import { DateTime } from 'luxon'; const PADDLE_VENDOR_URL = appConfig.isDev diff --git a/packages/backend/src/helpers/billing/webhooks.ee.js b/packages/backend/src/helpers/billing/webhooks.ee.js index 3a98ca61..19cc194c 100644 --- a/packages/backend/src/helpers/billing/webhooks.ee.js +++ b/packages/backend/src/helpers/billing/webhooks.ee.js @@ -1,5 +1,5 @@ -import Subscription from '../../models/subscription.ee'; -import Billing from './index.ee'; +import Subscription from '../../models/subscription.ee.js'; +import Billing from './index.ee.js'; const handleSubscriptionCreated = async (request) => { const subscription = await Subscription.query().insertAndFetch( diff --git a/packages/backend/src/helpers/create-auth-token-by-user-id.js b/packages/backend/src/helpers/create-auth-token-by-user-id.js index b41017c8..d70382d9 100644 --- a/packages/backend/src/helpers/create-auth-token-by-user-id.js +++ b/packages/backend/src/helpers/create-auth-token-by-user-id.js @@ -1,5 +1,5 @@ import jwt from 'jsonwebtoken'; -import appConfig from '../config/app'; +import appConfig from '../config/app.js'; const TOKEN_EXPIRES_IN = '14d'; diff --git a/packages/backend/src/helpers/create-bull-board-handler.js b/packages/backend/src/helpers/create-bull-board-handler.js index 909d28f0..03f949b6 100644 --- a/packages/backend/src/helpers/create-bull-board-handler.js +++ b/packages/backend/src/helpers/create-bull-board-handler.js @@ -1,13 +1,13 @@ import { ExpressAdapter } from '@bull-board/express'; import { createBullBoard } from '@bull-board/api'; -import { BullMQAdapter } from '@bull-board/api/bullMQAdapter'; -import flowQueue from '../queues/flow'; -import triggerQueue from '../queues/trigger'; -import actionQueue from '../queues/action'; -import emailQueue from '../queues/email'; -import deleteUserQueue from '../queues/delete-user.ee'; -import removeCancelledSubscriptionsQueue from '../queues/remove-cancelled-subscriptions.ee'; -import appConfig from '../config/app'; +import { BullMQAdapter } from '@bull-board/api/bullMQAdapter.js'; +import flowQueue from '../queues/flow.js'; +import triggerQueue from '../queues/trigger.js'; +import actionQueue from '../queues/action.js'; +import emailQueue from '../queues/email.js'; +import deleteUserQueue from '../queues/delete-user.ee.js'; +import removeCancelledSubscriptionsQueue from '../queues/remove-cancelled-subscriptions.ee.js'; +import appConfig from '../config/app.js'; const serverAdapter = new ExpressAdapter(); diff --git a/packages/backend/src/helpers/error-handler.js b/packages/backend/src/helpers/error-handler.js index 910e92e5..c875cb4d 100644 --- a/packages/backend/src/helpers/error-handler.js +++ b/packages/backend/src/helpers/error-handler.js @@ -1,4 +1,4 @@ -import logger from './logger'; +import logger from './logger.js'; // Do not remove `next` argument as the function signature will not fit for an error handler middleware const errorHandler = (err, req, res, next) => { diff --git a/packages/backend/src/helpers/find-or-create-user-by-saml-identity.ee.js b/packages/backend/src/helpers/find-or-create-user-by-saml-identity.ee.js index 368f917e..daeb1206 100644 --- a/packages/backend/src/helpers/find-or-create-user-by-saml-identity.ee.js +++ b/packages/backend/src/helpers/find-or-create-user-by-saml-identity.ee.js @@ -1,5 +1,5 @@ -import User from '../models/user'; -import Identity from '../models/identity.ee'; +import User from '../models/user.js'; +import Identity from '../models/identity.ee.js'; const getUser = (user, providerConfig) => ({ name: user[providerConfig.firstnameAttributeName], diff --git a/packages/backend/src/helpers/graphql-instance.js b/packages/backend/src/helpers/graphql-instance.js index c4bf1c1b..a8a50db7 100644 --- a/packages/backend/src/helpers/graphql-instance.js +++ b/packages/backend/src/helpers/graphql-instance.js @@ -1,16 +1,19 @@ -import { join } from 'node:path'; +import path, { join } from 'path'; +import { fileURLToPath } from 'url'; import { graphqlHTTP } from 'express-graphql'; import { loadSchemaSync } from '@graphql-tools/load'; import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader'; import { addResolversToSchema } from '@graphql-tools/schema'; import { applyMiddleware } from 'graphql-middleware'; -import appConfig from '../config/app'; -import logger from './logger'; -import authentication from './authentication'; -import * as Sentry from './sentry.ee'; -import resolvers from '../graphql/resolvers'; -import HttpError from '../errors/http'; +import appConfig from '../config/app.js'; +import logger from './logger.js'; +import authentication from './authentication.js'; +import * as Sentry from './sentry.ee.js'; +import resolvers from '../graphql/resolvers.js'; +import HttpError from '../errors/http.js'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const schema = loadSchemaSync(join(__dirname, '../graphql/schema.graphql'), { loaders: [new GraphQLFileLoader()], @@ -22,7 +25,10 @@ const schemaWithResolvers = addResolversToSchema({ }); const graphQLInstance = graphqlHTTP({ - schema: applyMiddleware(schemaWithResolvers, authentication), + schema: applyMiddleware( + schemaWithResolvers, + authentication.generate(schemaWithResolvers) + ), graphiql: appConfig.isDev, customFormatErrorFn: (error) => { logger.error(error.path + ' : ' + error.message + '\n' + error.stack); diff --git a/packages/backend/src/helpers/inject-bull-board-handler.js b/packages/backend/src/helpers/inject-bull-board-handler.js index c0cd8b25..17266c07 100644 --- a/packages/backend/src/helpers/inject-bull-board-handler.js +++ b/packages/backend/src/helpers/inject-bull-board-handler.js @@ -1,5 +1,5 @@ import basicAuth from 'express-basic-auth'; -import appConfig from '../config/app'; +import appConfig from '../config/app.js'; const injectBullBoardHandler = async (app, serverAdapter) => { if ( diff --git a/packages/backend/src/helpers/morgan.js b/packages/backend/src/helpers/morgan.js index b2144cf3..1afa001f 100644 --- a/packages/backend/src/helpers/morgan.js +++ b/packages/backend/src/helpers/morgan.js @@ -1,5 +1,5 @@ import morgan from 'morgan'; -import logger from './logger'; +import logger from './logger.js'; const stream = { write: (message) => diff --git a/packages/backend/src/helpers/passport.js b/packages/backend/src/helpers/passport.js index 122d06de..2e7a1430 100644 --- a/packages/backend/src/helpers/passport.js +++ b/packages/backend/src/helpers/passport.js @@ -2,10 +2,10 @@ import { URL } from 'node:url'; import { MultiSamlStrategy } from '@node-saml/passport-saml'; import passport from 'passport'; -import appConfig from '../config/app'; -import createAuthTokenByUserId from './create-auth-token-by-user-id'; -import SamlAuthProvider from '../models/saml-auth-provider.ee'; -import findOrCreateUserBySamlIdentity from './find-or-create-user-by-saml-identity.ee'; +import appConfig from '../config/app.js'; +import createAuthTokenByUserId from './create-auth-token-by-user-id.js'; +import SamlAuthProvider from '../models/saml-auth-provider.ee.js'; +import findOrCreateUserBySamlIdentity from './find-or-create-user-by-saml-identity.ee.js'; export default function configurePassport(app) { app.use( diff --git a/packages/backend/src/helpers/web-ui-handler.js b/packages/backend/src/helpers/web-ui-handler.js index 13b9513f..8d82fe16 100644 --- a/packages/backend/src/helpers/web-ui-handler.js +++ b/packages/backend/src/helpers/web-ui-handler.js @@ -1,6 +1,6 @@ import express from 'express'; import { dirname, join } from 'path'; -import appConfig from '../config/app'; +import appConfig from '../config/app.js'; const webUIHandler = async (app) => { if (appConfig.serveWebAppSeparately) return; diff --git a/packages/backend/src/helpers/webhook-handler.js b/packages/backend/src/helpers/webhook-handler.js index 9b2f3726..fc39b124 100644 --- a/packages/backend/src/helpers/webhook-handler.js +++ b/packages/backend/src/helpers/webhook-handler.js @@ -1,14 +1,14 @@ -import isEmpty from 'lodash/isEmpty'; +import isEmpty from 'lodash/isEmpty.js'; -import Flow from '../models/flow'; -import { processTrigger } from '../services/trigger'; -import triggerQueue from '../queues/trigger'; -import globalVariable from './global-variable'; -import QuotaExceededError from '../errors/quote-exceeded'; +import Flow from '../models/flow.js'; +import { processTrigger } from '../services/trigger.js'; +import triggerQueue from '../queues/trigger.js'; +import globalVariable from './global-variable.js'; +import QuotaExceededError from '../errors/quote-exceeded.js'; import { REMOVE_AFTER_30_DAYS_OR_150_JOBS, REMOVE_AFTER_7_DAYS_OR_50_JOBS, -} from './remove-job-configuration'; +} from './remove-job-configuration.js'; export default async (flowId, request, response) => { const flow = await Flow.query().findById(flowId).throwIfNotFound(); diff --git a/packages/backend/src/models/app-auth-client.js b/packages/backend/src/models/app-auth-client.js index 965c9cdd..a2837763 100644 --- a/packages/backend/src/models/app-auth-client.js +++ b/packages/backend/src/models/app-auth-client.js @@ -47,7 +47,7 @@ class AppAuthClient extends Base { if (!this.eligibleForDecryption()) return; this.formattedAuthDefaults = JSON.parse( - AES.decrypt(this.authDefaults, appConfig.encryptionKey).toString(enc.Utf8) + AES.decrypt(this.authDefaults, appConfig.encryptionKey).toString(enc) ); } diff --git a/packages/backend/src/models/config.js b/packages/backend/src/models/config.js index 303f6d64..949c6aaf 100644 --- a/packages/backend/src/models/config.js +++ b/packages/backend/src/models/config.js @@ -1,4 +1,4 @@ -import Base from './base'; +import Base from './base.js'; class Config extends Base { static tableName = 'config'; diff --git a/packages/backend/src/models/connection.js b/packages/backend/src/models/connection.js index fb2bfeff..e79735d2 100644 --- a/packages/backend/src/models/connection.js +++ b/packages/backend/src/models/connection.js @@ -109,7 +109,7 @@ class Connection extends Base { if (!this.eligibleForDecryption()) return; this.formattedData = JSON.parse( - AES.decrypt(this.data, appConfig.encryptionKey).toString(enc.Utf8) + AES.decrypt(this.data, appConfig.encryptionKey).toString(enc) ); } diff --git a/packages/backend/src/queues/delete-user.ee.js b/packages/backend/src/queues/delete-user.ee.js index e01c340f..584807a1 100644 --- a/packages/backend/src/queues/delete-user.ee.js +++ b/packages/backend/src/queues/delete-user.ee.js @@ -1,7 +1,7 @@ import process from 'process'; import { Queue } from 'bullmq'; -import redisConfig from '../config/redis'; -import logger from '../helpers/logger'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; const CONNECTION_REFUSED = 'ECONNREFUSED'; diff --git a/packages/backend/src/queues/email.js b/packages/backend/src/queues/email.js index 223a97e7..c9da1804 100644 --- a/packages/backend/src/queues/email.js +++ b/packages/backend/src/queues/email.js @@ -1,7 +1,7 @@ import process from 'process'; import { Queue } from 'bullmq'; -import redisConfig from '../config/redis'; -import logger from '../helpers/logger'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; const CONNECTION_REFUSED = 'ECONNREFUSED'; diff --git a/packages/backend/src/queues/remove-cancelled-subscriptions.ee.js b/packages/backend/src/queues/remove-cancelled-subscriptions.ee.js index d444fd5e..20fd6d03 100644 --- a/packages/backend/src/queues/remove-cancelled-subscriptions.ee.js +++ b/packages/backend/src/queues/remove-cancelled-subscriptions.ee.js @@ -1,7 +1,7 @@ import process from 'process'; import { Queue } from 'bullmq'; -import redisConfig from '../config/redis'; -import logger from '../helpers/logger'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; const CONNECTION_REFUSED = 'ECONNREFUSED'; diff --git a/packages/backend/src/routes/index.js b/packages/backend/src/routes/index.js index 2a52de7a..8531516b 100644 --- a/packages/backend/src/routes/index.js +++ b/packages/backend/src/routes/index.js @@ -1,7 +1,7 @@ import { Router } from 'express'; -import graphQLInstance from '../helpers/graphql-instance'; -import webhooksRouter from './webhooks'; -import paddleRouter from './paddle.ee'; +import graphQLInstance from '../helpers/graphql-instance.js'; +import webhooksRouter from './webhooks.js'; +import paddleRouter from './paddle.ee.js'; const router = Router(); diff --git a/packages/backend/src/routes/paddle.ee.js b/packages/backend/src/routes/paddle.ee.js index de6e17f5..aeea6453 100644 --- a/packages/backend/src/routes/paddle.ee.js +++ b/packages/backend/src/routes/paddle.ee.js @@ -1,5 +1,5 @@ import { Router } from 'express'; -import webhooksHandler from '../controllers/paddle/webhooks.ee'; +import webhooksHandler from '../controllers/paddle/webhooks.ee.js'; const router = Router(); diff --git a/packages/backend/src/routes/webhooks.js b/packages/backend/src/routes/webhooks.js index 77889ae3..6d6898c9 100644 --- a/packages/backend/src/routes/webhooks.js +++ b/packages/backend/src/routes/webhooks.js @@ -1,9 +1,9 @@ import express, { Router } from 'express'; import multer from 'multer'; -import appConfig from '../config/app'; -import webhookHandlerByFlowId from '../controllers/webhooks/handler-by-flow-id'; -import webhookHandlerByConnectionIdAndRefValue from '../controllers/webhooks/handler-by-connection-id-and-ref-value'; +import appConfig from '../config/app.js'; +import webhookHandlerByFlowId from '../controllers/webhooks/handler-by-flow-id.js'; +import webhookHandlerByConnectionIdAndRefValue from '../controllers/webhooks/handler-by-connection-id-and-ref-value.js'; const router = Router(); const upload = multer(); diff --git a/packages/backend/src/server.js b/packages/backend/src/server.js index e3d161c2..6396088e 100644 --- a/packages/backend/src/server.js +++ b/packages/backend/src/server.js @@ -1,7 +1,7 @@ -import app from './app'; -import appConfig from './config/app'; -import logger from './helpers/logger'; -import telemetry from './helpers/telemetry'; +import app from './app.js'; +import appConfig from './config/app.js'; +import logger from './helpers/logger.js'; +import telemetry from './helpers/telemetry/index.js'; telemetry.setServiceType('main'); diff --git a/packages/backend/src/services/test-run.js b/packages/backend/src/services/test-run.js index dd19b4af..88023821 100644 --- a/packages/backend/src/services/test-run.js +++ b/packages/backend/src/services/test-run.js @@ -1,7 +1,7 @@ -import Step from '../models/step'; -import { processFlow } from './flow'; -import { processTrigger } from './trigger'; -import { processAction } from './action'; +import Step from '../models/step.js'; +import { processFlow } from './flow.js'; +import { processTrigger } from './trigger.js'; +import { processAction } from './action.js'; const testRun = async (options) => { const untilStep = await Step.query()