Merge branch 'main' into feature/google-signin-signup-integration

backend/src/index.ts

@@ -1,34 +1,26 @@
 import dotenv from "dotenv";
 dotenv.config();
-import express from "express";
-import helmet from "helmet";
-import cors from "cors";
-import * as Sentry from "@sentry/node";
-import { DatabaseService } from "./services";
-import { EELicenseService } from "./ee/services";
-import { setUpHealthEndpoint } from "./services/health";
-import { initSmtp } from "./services/smtp";
-import { TelemetryService } from "./services";
-import { setTransporter } from "./helpers/nodemailer";
-import { createTestUserForDevelopment } from "./utils/addDevelopmentUser";
+import express from 'express';
+import helmet from 'helmet';
+import cors from 'cors';
+import { DatabaseService } from './services';
+import { EELicenseService } from './ee/services';
+import { setUpHealthEndpoint } from './services/health';
+import cookieParser from 'cookie-parser';
+import swaggerUi = require('swagger-ui-express');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const { patchRouterParam } = require("./utils/patchAsyncRoutes");
-
-import cookieParser from "cookie-parser";
-import swaggerUi = require("swagger-ui-express");
+const swaggerFile = require('../spec.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const swaggerFile = require("../spec.json");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const requestIp = require("request-ip");
-import { apiLimiter } from "./helpers/rateLimiter";
+const requestIp = require('request-ip');
+import { apiLimiter } from './helpers/rateLimiter';
 import {
   workspace as eeWorkspaceRouter,
   secret as eeSecretRouter,
   secretSnapshot as eeSecretSnapshotRouter,
   action as eeActionRouter,
   organizations as eeOrganizationsRouter,
-  cloudProducts as eeCloudProductsRouter,
-} from "./ee/routes/v1";
+  cloudProducts as eeCloudProductsRouter
+} from './ee/routes/v1';
 import {
   signup as v1SignupRouter,
   auth as v1AuthRouter,
@@ -47,8 +39,8 @@ import {
   stripe as v1StripeRouter,
   integration as v1IntegrationRouter,
   integrationAuth as v1IntegrationAuthRouter,
-  secretsFolder as v1SecretsFolder,
-} from "./routes/v1";
+  secretsFolder as v1SecretsFolder
+} from './routes/v1';
 import {
   signup as v2SignupRouter,
   auth as v2AuthRouter,
@@ -62,130 +54,109 @@ import {
   apiKeyData as v2APIKeyDataRouter,
   environment as v2EnvironmentRouter,
   tags as v2TagsRouter,
-} from "./routes/v2";
+} from './routes/v2';
 import {
   auth as v3AuthRouter,
   secrets as v3SecretsRouter,
   signup as v3SignupRouter,
-  workspaces as v3WorkspacesRouter,
-} from "./routes/v3";
-import { healthCheck } from "./routes/status";
-import { getLogger } from "./utils/logger";
-import { RouteNotFoundError } from "./utils/errors";
-import { requestErrorHandler } from "./middleware/requestErrorHandler";
+  workspaces as v3WorkspacesRouter
+} from './routes/v3';
+import { healthCheck } from './routes/status';
+import { getLogger } from './utils/logger';
+import { RouteNotFoundError } from './utils/errors';
+import { requestErrorHandler } from './middleware/requestErrorHandler';
 import {
-  getMongoURL,
   getNodeEnv,
   getPort,
-  getSentryDSN,
-  getSiteURL,
-} from "./config";
-import { initializePassport } from "./utils/auth";
+  getSiteURL
+} from './config';
+import { setup } from './utils/setup';
 
 const main = async () => {
-  TelemetryService.logTelemetryMessage();
-  setTransporter(await initSmtp());
+  await setup();
 
   await EELicenseService.initGlobalFeatureSet();
 
-  await DatabaseService.initDatabase(await getMongoURL());
-  if ((await getNodeEnv()) !== "test") {
-    Sentry.init({
-      dsn: await getSentryDSN(),
-      tracesSampleRate: 1.0,
-      debug: (await getNodeEnv()) === "production" ? false : true,
-      environment: await getNodeEnv(),
-    });
-  }
-
-  patchRouterParam();
   const app = express();
-
-  await initializePassport();
-
-  app.enable("trust proxy");
+  app.enable('trust proxy');
   app.use(express.json());
   app.use(cookieParser());
   app.use(
     cors({
       credentials: true,
-      origin: await getSiteURL(),
+      origin: await getSiteURL()
     })
   );
 
   app.use(requestIp.mw());
 
-  if ((await getNodeEnv()) === "production") {
+  if ((await getNodeEnv()) === 'production') {
     // enable app-wide rate-limiting + helmet security
     // in production
-    app.disable("x-powered-by");
+    app.disable('x-powered-by');
     app.use(apiLimiter);
     app.use(helmet());
   }
 
   // (EE) routes
-  app.use("/api/v1/secret", eeSecretRouter);
-  app.use("/api/v1/secret-snapshot", eeSecretSnapshotRouter);
-  app.use("/api/v1/workspace", eeWorkspaceRouter);
-  app.use("/api/v1/action", eeActionRouter);
-  app.use("/api/v1/organizations", eeOrganizationsRouter);
-  app.use("/api/v1/cloud-products", eeCloudProductsRouter);
+  app.use('/api/v1/secret', eeSecretRouter);
+  app.use('/api/v1/secret-snapshot', eeSecretSnapshotRouter);
+  app.use('/api/v1/workspace', eeWorkspaceRouter);
+  app.use('/api/v1/action', eeActionRouter);
+  app.use('/api/v1/organizations', eeOrganizationsRouter);
+  app.use('/api/v1/cloud-products', eeCloudProductsRouter);
 
   // v1 routes (default)
-  app.use("/api/v1/signup", v1SignupRouter);
-  app.use("/api/v1/auth", v1AuthRouter);
-  app.use("/api/v1/bot", v1BotRouter);
-  app.use("/api/v1/user", v1UserRouter);
-  app.use("/api/v1/user-action", v1UserActionRouter);
-  app.use("/api/v1/organization", v1OrganizationRouter);
-  app.use("/api/v1/workspace", v1WorkspaceRouter);
-  app.use("/api/v1/membership-org", v1MembershipOrgRouter);
-  app.use("/api/v1/membership", v1MembershipRouter);
-  app.use("/api/v1/key", v1KeyRouter);
-  app.use("/api/v1/invite-org", v1InviteOrgRouter);
-  app.use("/api/v1/secret", v1SecretRouter);
-  app.use("/api/v1/service-token", v1ServiceTokenRouter); // deprecated
-  app.use("/api/v1/password", v1PasswordRouter);
-  app.use("/api/v1/stripe", v1StripeRouter);
-  app.use("/api/v1/integration", v1IntegrationRouter);
-  app.use("/api/v1/integration-auth", v1IntegrationAuthRouter);
-  app.use("/api/v1/folder", v1SecretsFolder);
+  app.use('/api/v1/signup', v1SignupRouter);
+  app.use('/api/v1/auth', v1AuthRouter);
+  app.use('/api/v1/bot', v1BotRouter);
+  app.use('/api/v1/user', v1UserRouter);
+  app.use('/api/v1/user-action', v1UserActionRouter);
+  app.use('/api/v1/organization', v1OrganizationRouter);
+  app.use('/api/v1/workspace', v1WorkspaceRouter);
+  app.use('/api/v1/membership-org', v1MembershipOrgRouter);
+  app.use('/api/v1/membership', v1MembershipRouter);
+  app.use('/api/v1/key', v1KeyRouter);
+  app.use('/api/v1/invite-org', v1InviteOrgRouter);
+  app.use('/api/v1/secret', v1SecretRouter); // deprecate
+  app.use('/api/v1/service-token', v1ServiceTokenRouter); // deprecate
+  app.use('/api/v1/password', v1PasswordRouter);
+  app.use('/api/v1/stripe', v1StripeRouter);
+  app.use('/api/v1/integration', v1IntegrationRouter);
+  app.use('/api/v1/integration-auth', v1IntegrationAuthRouter);
+  app.use('/api/v1/folder', v1SecretsFolder)
 
   // v2 routes (improvements)
-  app.use("/api/v2/signup", v2SignupRouter);
-  app.use("/api/v2/auth", v2AuthRouter);
-  app.use("/api/v2/users", v2UsersRouter);
-  app.use("/api/v2/organizations", v2OrganizationsRouter);
-  app.use("/api/v2/workspace", v2EnvironmentRouter);
-  app.use("/api/v2/workspace", v2TagsRouter);
-  app.use("/api/v2/workspace", v2WorkspaceRouter);
-  app.use("/api/v2/secret", v2SecretRouter); // deprecated
-  app.use("/api/v2/secrets", v2SecretsRouter);
-  app.use("/api/v2/service-token", v2ServiceTokenDataRouter); // TODO: turn into plural route
-  app.use("/api/v2/service-accounts", v2ServiceAccountsRouter); // new
-  app.use("/api/v2/api-key", v2APIKeyDataRouter);
+  app.use('/api/v2/signup', v2SignupRouter);
+  app.use('/api/v2/auth', v2AuthRouter);
+  app.use('/api/v2/users', v2UsersRouter);
+  app.use('/api/v2/organizations', v2OrganizationsRouter);
+  app.use('/api/v2/workspace', v2EnvironmentRouter);
+  app.use('/api/v2/workspace', v2TagsRouter);
+  app.use('/api/v2/workspace', v2WorkspaceRouter);
+  app.use('/api/v2/secret', v2SecretRouter); // deprecate
+  app.use('/api/v2/secrets', v2SecretsRouter); // note: in the process of moving to v3/secrets
+  app.use('/api/v2/service-token', v2ServiceTokenDataRouter);
+  app.use('/api/v2/service-accounts', v2ServiceAccountsRouter); // new
+  app.use('/api/v2/api-key', v2APIKeyDataRouter);
 
   // v3 routes (experimental)
   app.use("/api/v3/auth", v3AuthRouter);
-  app.use("/api/v3/secrets", v3SecretsRouter);
-  app.use("/api/v3/workspaces", v3WorkspacesRouter);
+  app.use('/api/v3/secrets', v3SecretsRouter);
+  app.use('/api/v3/workspaces', v3WorkspacesRouter);
   app.use("/api/v3/signup", v3SignupRouter);
 
-  // api docs
-  app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerFile));
+  // api docs 
+  app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerFile))
 
-  // Server status
-  app.use("/api", healthCheck);
+  // server status
+  app.use('/api', healthCheck)
 
   //* Handle unrouted requests and respond with proper error message as well as status code
   app.use((req, res, next) => {
     if (res.headersSent) return next();
-    next(
-      RouteNotFoundError({
-        message: `The requested source '(${req.method})${req.url}' was not found`,
-      })
-    );
-  });
+    next(RouteNotFoundError({ message: `The requested source '(${req.method})${req.url}' was not found` }))
+  })
 
   app.use(requestErrorHandler);
 
@@ -195,7 +166,7 @@ const main = async () => {
     );
   });
 
-  await createTestUserForDevelopment();
+  // await createTestUserForDevelopment();
   setUpHealthEndpoint(server);
 
   server.on("close", async () => {