@digitaldefiance/node-express-suite 3.6.21 → 3.6.22

package/src/routers/app.ts

@@ -1,333 +0,0 @@
-import {
-  CoreI18nComponentId,
-  TranslatableGenericError,
-} from '@digitaldefiance/i18n-lib';
-import {
-  getSuiteCoreTranslation,
-  SuiteCoreStringKey,
-  TranslatableSuiteError,
-} from '@digitaldefiance/suite-core-lib';
-import ejs from 'ejs';
-import {
-  Application,
-  static as expressStatic,
-  NextFunction,
-  Request,
-  Response,
-} from 'express';
-import { existsSync, readdirSync } from 'fs';
-import { resolve, sep } from 'path';
-import { IApplication } from '../interfaces/application';
-import { debugLog, handleError, sendApiMessageResponse } from '../utils';
-import { BaseRouter } from './base';
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function keepEJS() {
-  ejs.compile(''); // Compile an empty string, doesn't generate anything meaningful
-}
-
-/**
- * Application router
- * Sets up the API and static file serving
- */
-export class AppRouter<TApplication extends IApplication = IApplication> {
-  protected readonly viewsPath: string;
-  protected readonly indexPath: string;
-  protected readonly assetsDir: string;
-  protected readonly reactDistDir: string;
-
-  protected readonly apiRouter: BaseRouter<TApplication>;
-  protected readonly application: TApplication;
-
-  constructor(apiRouter: BaseRouter<TApplication>) {
-    this.application = apiRouter.application;
-    this.apiRouter = apiRouter;
-
-    // Validate paths don't contain traversal sequences
-    if (
-      this.application.environment.apiDistDir.includes('..') ||
-      this.application.environment.reactDistDir.includes('..')
-    ) {
-      throw new TranslatableSuiteError(
-        SuiteCoreStringKey.Error_InvalidPathContainsParentDirectoryReference,
-      );
-    }
-
-    const normalizedApiDistDir = resolve(
-      this.application.environment.apiDistDir,
-    );
-    const viewsPath = resolve(normalizedApiDistDir, 'views');
-    if (
-      !viewsPath.startsWith(normalizedApiDistDir + sep) &&
-      viewsPath !== normalizedApiDistDir
-    ) {
-      throw new TranslatableSuiteError(
-        SuiteCoreStringKey.Error_InvalidViewsPathEscapesBaseDirectory,
-      );
-    }
-    this.viewsPath = viewsPath;
-
-    const normalizedReactDistDir = resolve(
-      this.application.environment.reactDistDir,
-    );
-    this.reactDistDir = normalizedReactDistDir;
-
-    const indexPath = resolve(normalizedReactDistDir, 'index.html');
-    if (
-      !indexPath.startsWith(normalizedReactDistDir + sep) &&
-      indexPath !== normalizedReactDistDir
-    ) {
-      throw new TranslatableSuiteError(
-        SuiteCoreStringKey.Error_InvalidIndexPathEscapesBaseDirectory,
-      );
-    }
-    this.indexPath = indexPath;
-
-    const assetsPath = resolve(normalizedReactDistDir, 'assets');
-    if (
-      !assetsPath.startsWith(normalizedReactDistDir + sep) &&
-      assetsPath !== normalizedReactDistDir
-    ) {
-      throw new TranslatableSuiteError(
-        SuiteCoreStringKey.Error_InvalidAssetsPathEscapesBaseDirectory,
-      );
-    }
-    this.assetsDir = assetsPath;
-  }
-
-  public getAssetFilename(
-    assetDir: string,
-    pattern: RegExp,
-  ): string | undefined {
-    try {
-      // Prevent path traversal by validating assetDir is within expected directory
-      // amazonq-ignore-next-line already addressed
-      if (
-        // amazonq-ignore-next-line
-        assetDir.includes('..') ||
-        !assetDir.startsWith(this.reactDistDir)
-      ) {
-        return undefined;
-      }
-      const files = readdirSync(assetDir, 'utf8');
-      return files.find((f) => pattern.test(f));
-    } catch {
-      return undefined;
-    }
-  }
-
-  // Allow subclasses to register additional catch-all handlers before rendering the index page.
-  protected getBaseViewLocals(
-    req: Request,
-    res: Response,
-  ): Record<string, unknown> {
-    const SiteName = this.application.constants.Site;
-    const SiteTagline = this.application.constants.SiteTagline;
-    const SiteDescription = this.application.constants.SiteDescription;
-    const hostname = req.hostname;
-    const server =
-      (req.socket.localPort === 443 && req.protocol === 'https') ||
-      (req.socket.localPort === 80 && req.protocol === 'http')
-        ? `${req.protocol}://${hostname}`
-        : `${req.protocol}://${hostname}:${req.socket.localPort}`;
-
-    return {
-      cspNonce: res.locals['cspNonce'],
-      title: SiteName,
-      tagline: SiteTagline,
-      description: SiteDescription,
-      server,
-      siteUrl: this.apiRouter.application.environment.serverUrl,
-      baseHref: this.apiRouter.application.environment.basePath,
-      hostname,
-      siteTitle: SiteName,
-    };
-  }
-
-  protected renderTemplate(
-    req: Request,
-    res: Response,
-    next: NextFunction,
-    template: string,
-    locals: Record<string, unknown>,
-  ): void {
-    if (!/^[\w/-]+$/.test(template)) {
-      next(new Error('Invalid template name requested'));
-      return;
-    }
-
-    const sanitizedUrl = (req.url || '').replace(/[\r\n]/g, ' ');
-    debugLog(
-      this.apiRouter.application.environment.debug,
-      'log',
-      `Rendering view "${template}" for ${sanitizedUrl}`,
-    );
-
-    res.render(template, locals, (err, html) => {
-      if (err) {
-        const errMsg =
-          err && typeof err === 'object' && 'message' in err
-            ? String(err.message).replace(/[\r\n]/g, ' ')
-            : 'Unknown error';
-        console.error('Error rendering: ' + errMsg);
-        const normalizedError = err instanceof Error ? err : new Error(errMsg);
-        if (!res.headersSent) {
-          res.status(500).send('An error occurred');
-        }
-        next(normalizedError);
-        return;
-      }
-
-      if (!html) {
-        next(new Error(`Rendered template "${template}" returned empty HTML`));
-        return;
-      }
-
-      debugLog(
-        this.apiRouter.application.environment.debug,
-        'log',
-        `Rendered view "${template}" for ${sanitizedUrl}`,
-      );
-
-      res.send(html);
-    });
-  }
-
-  protected createViewRenderer(
-    template: string,
-    localsFactory?: (req: Request, res: Response) => Record<string, unknown>,
-  ): (req: Request, res: Response, next: NextFunction) => void {
-    return (req, res, next) => {
-      const baseLocals = this.getBaseViewLocals(req, res);
-      const extraLocals = localsFactory ? localsFactory(req, res) : {};
-      this.renderTemplate(req, res, next, template, {
-        ...baseLocals,
-        ...extraLocals,
-      });
-    };
-  }
-
-  /**
-   * Override to register additional routes (e.g. other EJS pages) before the index catch-all.
-   */
-  protected registerAdditionalRenderHooks(app: Application): void {
-    void app;
-  }
-
-  public renderIndex(req: Request, res: Response, next: NextFunction): void {
-    if (req.url.endsWith('.js')) {
-      res.type('application/javascript');
-    }
-
-    const jsFile = this.getAssetFilename(this.assetsDir, /^index-.*\.js$/);
-    const cssFile = this.getAssetFilename(this.assetsDir, /^index-.*\.css$/);
-    const locals = {
-      ...this.getBaseViewLocals(req, res),
-      jsFile: jsFile ? `assets/${jsFile}` : undefined,
-      cssFile: cssFile ? `assets/${cssFile}` : undefined,
-    };
-
-    this.renderTemplate(req, res, next, 'index', locals);
-  }
-
-  /**
-   * Initialize the application router
-   * @param app Express application
-   * @param debugRoutes Whether to log routes
-   */
-  public init(app: Application) {
-    const reactDistHasDistSegment = this.reactDistDir
-      .split(sep)
-      .filter((segment) => segment.length > 0)
-      .some((segment) => segment.toLowerCase() === 'dist');
-    if (!reactDistHasDistSegment) {
-      throw new TranslatableGenericError<SuiteCoreStringKey>(
-        CoreI18nComponentId,
-        SuiteCoreStringKey.Error_AppDoesNotAppearToBeRunningWithinDistTemplate,
-        { dir: this.apiRouter.application.environment.reactDistDir },
-      );
-    }
-    if (!existsSync(this.indexPath)) {
-      throw new TranslatableGenericError<SuiteCoreStringKey>(
-        CoreI18nComponentId,
-        SuiteCoreStringKey.Error_IndexFileNotFoundTemplate,
-        { path: this.indexPath },
-      );
-    }
-
-    if (this.apiRouter.application.environment.debug) {
-      app.use((req, res, next) => {
-        const port =
-          (req.socket.localPort === 443 && req.protocol === 'https') ||
-          (req.socket.localPort === 80 && req.protocol === 'http')
-            ? ''
-            : `:${req.socket.localPort}`;
-        // amazonq-ignore-next-line
-        console.log(
-          getSuiteCoreTranslation(SuiteCoreStringKey.Admin_ServingRoute) +
-            ': method=' +
-            req.method +
-            ' url=' +
-            req.protocol +
-            '://' +
-            req.hostname +
-            port +
-            (req.url || '').replace(/[\r\n]/g, ' '),
-        );
-        next();
-      });
-    }
-
-    app.use('/api', this.apiRouter.router);
-
-    app.set('views', this.viewsPath);
-    app.set('view engine', 'ejs');
-
-    // Serve static files from the React app build directory (validated in constructor)
-    app.use('/assets', expressStatic(this.assetsDir));
-    const serveStaticWithLogging = expressStatic(this.reactDistDir);
-    app.use('/static/js', expressStatic(this.reactDistDir));
-    app.use((req, res, next) => {
-      if (req.url === '/') {
-        next();
-        return;
-      }
-      debugLog(
-        this.apiRouter.application.environment.debug,
-        'log',
-        `Trying to serve static for ${(req.url || '').replace(/[\r\n]/g, ' ')}`,
-      );
-      if (req.url.endsWith('.js')) {
-        res.type('application/javascript');
-      }
-      serveStaticWithLogging(req, res, (err) => {
-        if (err) {
-          const sanitizedErr =
-            err instanceof Error
-              ? err.message.replace(/[\r\n]/g, ' ')
-              : String(err).replace(/[\r\n]/g, ' ');
-          debugLog(
-            this.apiRouter.application.environment.debug,
-            'error',
-            'Error serving static file:',
-            sanitizedErr,
-          );
-          handleError(err, res, sendApiMessageResponse, next);
-          return;
-        }
-        next();
-      });
-    });
-
-    // The "catchall" handler: for any request that doesn't
-    // match one above, send back React's index.html file.
-    // app.get('*', (req, res) => {
-    //   res.sendFile(path.join(__dirname,'..', '..', '..', 'myapp-react', 'index.html'));
-    // });
-    this.registerAdditionalRenderHooks(app);
-
-    app.use((req: Request, res: Response, next: NextFunction) => {
-      this.renderIndex(req, res, next);
-    });
-  }
-}

package/src/routers/base.ts

@@ -1,13 +0,0 @@
-import { Router } from 'express';
-import { IApplication } from '../interfaces/application';
-
-export abstract class BaseRouter<
-  TApplication extends IApplication = IApplication,
-> {
-  public readonly router: Router;
-  public readonly application: TApplication;
-  protected constructor(application: TApplication) {
-    this.application = application;
-    this.router = Router();
-  }
-}

package/src/routers/router-config.ts

@@ -1,16 +0,0 @@
-import { RequestHandler } from 'express';
-
-export interface RouterConfig {
-  staticPaths?: Array<{ prefix: string; directory: string }>;
-  viewEngine?: { name: string; viewsPath: string };
-  middleware?: RequestHandler[];
-  cors?: {
-    origin?: string | string[];
-    credentials?: boolean;
-  };
-}
-
-export const DefaultRouterConfig: RouterConfig = {
-  staticPaths: [],
-  middleware: [],
-};

package/src/routing/index.ts

@@ -1 +0,0 @@
-export * from './route-builder';

package/src/routing/route-builder.ts

@@ -1,128 +0,0 @@
-import { RequestHandler } from 'express';
-import { ValidationChain } from 'express-validator';
-import { z } from 'zod';
-
-export class RouteBuilder<TLanguage extends string = string> {
-  private config: {
-    method?: 'get' | 'post' | 'put' | 'delete' | 'patch';
-    path?: string;
-    handler?: RequestHandler;
-    auth?: boolean;
-    cryptoAuth?: boolean;
-    validation?: ValidationChain[] | ((lang: TLanguage) => ValidationChain[]);
-    schema?: z.ZodSchema;
-    middleware?: RequestHandler[];
-    transaction?: boolean;
-    transactionTimeout?: number;
-    rawJson?: boolean;
-  } = {};
-
-  static create<T extends string = string>(): RouteBuilder<T> {
-    return new RouteBuilder<T>();
-  }
-
-  get(path: string): this {
-    this.config.method = 'get';
-    this.config.path = path;
-    return this;
-  }
-
-  post(path: string): this {
-    this.config.method = 'post';
-    this.config.path = path;
-    return this;
-  }
-
-  put(path: string): this {
-    this.config.method = 'put';
-    this.config.path = path;
-    return this;
-  }
-
-  delete(path: string): this {
-    this.config.method = 'delete';
-    this.config.path = path;
-    return this;
-  }
-
-  patch(path: string): this {
-    this.config.method = 'patch';
-    this.config.path = path;
-    return this;
-  }
-
-  auth(enabled = true): this {
-    this.config.auth = enabled;
-    return this;
-  }
-
-  cryptoAuth(enabled = true): this {
-    this.config.cryptoAuth = enabled;
-    return this;
-  }
-
-  validate(
-    validation: ValidationChain[] | ((lang: TLanguage) => ValidationChain[]),
-  ): this {
-    this.config.validation = validation;
-    return this;
-  }
-
-  schema(schema: z.ZodSchema): this {
-    this.config.schema = schema;
-    return this;
-  }
-
-  use(...middleware: RequestHandler[]): this {
-    this.config.middleware = [...(this.config.middleware || []), ...middleware];
-    return this;
-  }
-
-  transaction(enabled = true, timeout?: number): this {
-    this.config.transaction = enabled;
-    if (timeout) this.config.transactionTimeout = timeout;
-    return this;
-  }
-
-  rawJson(enabled = true): this {
-    this.config.rawJson = enabled;
-    return this;
-  }
-
-  handle(handler: RequestHandler): RouteConfig<TLanguage> {
-    if (!this.config.method || !this.config.path) {
-      throw new Error('Method and path must be set before calling handle()');
-    }
-    return {
-      method: this.config.method,
-      path: this.config.path,
-      handler,
-      options: {
-        auth: this.config.auth,
-        cryptoAuth: this.config.cryptoAuth,
-        validation: this.config.validation,
-        schema: this.config.schema,
-        middleware: this.config.middleware,
-        transaction: this.config.transaction,
-        transactionTimeout: this.config.transactionTimeout,
-        rawJson: this.config.rawJson,
-      },
-    };
-  }
-}
-
-export interface RouteConfig<TLanguage extends string = string> {
-  method: 'get' | 'post' | 'put' | 'delete' | 'patch';
-  path: string;
-  handler: RequestHandler;
-  options: {
-    auth?: boolean;
-    cryptoAuth?: boolean;
-    validation?: ValidationChain[] | ((lang: TLanguage) => ValidationChain[]);
-    schema?: z.ZodSchema;
-    middleware?: RequestHandler[];
-    transaction?: boolean;
-    transactionTimeout?: number;
-    rawJson?: boolean;
-  };
-}

package/src/schemas/email-token.ts

@@ -1,95 +0,0 @@
-import { Schema } from '@digitaldefiance/mongoose-types';
-import {
-  EmailTokenType,
-  getSuiteCoreTranslation,
-  SuiteCoreStringKey,
-} from '@digitaldefiance/suite-core-lib';
-import validator from 'validator';
-import { BaseModelName } from '../enumerations';
-import { IConstants } from '../interfaces';
-
-/**
- * Configuration options for creating an email token schema
- */
-export interface EmailTokenSchemaOptions<
-  TTokenType extends string = EmailTokenType,
-  TModelName extends string = BaseModelName,
-  TConstants extends IConstants = IConstants,
-> {
-  /** Token type enum values to use */
-  tokenTypeEnum?: TTokenType[];
-  /** Model name for user reference */
-  userModelName?: TModelName;
-  /** Token expiration time (default: '1d') */
-  expiresIn?: string;
-  /** Custom email validator function */
-  emailValidator?: (v: string) => boolean;
-  /** Custom validation error message function */
-  validationMessage?: (props: { value: string }) => string;
-  constants?: TConstants;
-  /** ID type for references */
-  idType?: any;
-}
-
-/**
- * Factory function to create an extensible email token schema
- */
-export function createEmailTokenSchema<
-  TTokenType extends string = EmailTokenType,
-  TModelName extends string = BaseModelName,
-  TConstants extends IConstants = IConstants,
->(
-  options: EmailTokenSchemaOptions<TTokenType, TModelName> = {},
-  _constants?: TConstants,
-): Schema {
-  const {
-    tokenTypeEnum = Object.values(EmailTokenType) as TTokenType[],
-    userModelName = BaseModelName.User as TModelName,
-    expiresIn = '1d',
-    validationMessage = (props: { value: string }) =>
-      getSuiteCoreTranslation(SuiteCoreStringKey.Error_InvalidEmailTemplate, {
-        email: props.value,
-      }),
-    idType = Schema.Types.ObjectId,
-  } = options;
-
-  const definition = {
-    userId: {
-      type: idType,
-      required: true,
-      ref: userModelName,
-      immutable: true,
-    },
-    type: {
-      type: String,
-      enum: tokenTypeEnum,
-      required: true,
-      immutable: true,
-    },
-    token: { type: String, required: true, immutable: true, unique: true },
-    email: {
-      type: String,
-      required: true,
-      immutable: true,
-      validate: {
-        validator: (v: string) => validator.isEmail(v),
-        message: validationMessage,
-      },
-    },
-    lastSent: { type: Date, required: false },
-    expiresAt: {
-      type: Date,
-      default: Date.now,
-      index: { expires: expiresIn },
-    },
-  };
-
-  const schema = new Schema(definition, { timestamps: true });
-  schema.index({ userId: 1, email: 1, type: 1 }, { unique: true });
-  return schema;
-}
-
-/**
- * Default email token schema with base configuration
- */
-export const EmailTokenSchema = createEmailTokenSchema();

package/src/schemas/mnemonic.ts

@@ -1,37 +0,0 @@
-import { Schema } from '@digitaldefiance/mongoose-types';
-import {
-  getSuiteCoreTranslation,
-  SuiteCoreStringKey,
-} from '@digitaldefiance/suite-core-lib';
-import { LocalhostConstants as AppConstants } from '../constants';
-import { IConstants } from '../interfaces/constants';
-
-/**
- * Create a mnemonic schema with custom or default constants
- */
-export function createMnemonicSchema<T extends IConstants = IConstants>(
-  validationMessage?: () => string,
-  constants: T = AppConstants as T,
-): Schema {
-  const definition = {
-    hmac: {
-      type: String,
-      required: true,
-      unique: true,
-      index: true,
-      validate: {
-        validator: (v: string) => constants.MnemonicHmacRegex.test(v),
-        message:
-          validationMessage ||
-          (() =>
-            getSuiteCoreTranslation(SuiteCoreStringKey.Validation_HmacRegex)),
-      },
-    },
-  };
-  return new Schema(definition);
-}
-
-/**
- * Default mnemonic schema using AppConstants
- */
-export const MnemonicSchema = createMnemonicSchema();