nesties 1.1.6 → 1.1.7

package/dist/index.mjs

@@ -207,34 +207,158 @@ import {
   UseGuards
 } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
-import { ApiHeader } from "@nestjs/swagger";
+import { ApiHeader as ApiHeader2 } from "@nestjs/swagger";
+
+// src/resolver.ts
+import {
+  ApiHeader,
+  ApiQuery
+} from "@nestjs/swagger";
+var coerceToString = (v) => {
+  if (v == null) return void 0;
+  if (v === false) return void 0;
+  if (Array.isArray(v)) return v.length ? coerceToString(v[0]) : void 0;
+  if (typeof v === "string") return v;
+  if (typeof v === "number") return String(v);
+  return void 0;
+};
+var getHeader = (req, name) => {
+  const viaMethod = typeof req.getHeader === "function" && req.getHeader(name) || typeof req.header === "function" && req.header(name) || typeof req.get === "function" && req.get(name);
+  if (viaMethod) {
+    return coerceToString(viaMethod);
+  }
+  const n = name.toLowerCase();
+  const headers = req.headers ?? {};
+  if (n in headers) return coerceToString(headers[n]);
+  const hit = Object.entries(headers).find(([k]) => k.toLowerCase() === n)?.[1];
+  return coerceToString(hit);
+};
+var pickPrimaryFromAcceptLanguage = (v) => {
+  if (!v) return void 0;
+  const first = v.split(",")[0]?.trim();
+  return first?.split(";")[0]?.trim() || first;
+};
+function getQueryValue(req, key) {
+  const q = req.query;
+  if (q && typeof q === "object" && !("raw" in q)) {
+    const v = q[key];
+    if (v != null) return coerceToString(v);
+  }
+  const rawUrl = req.originalUrl ?? req.url;
+  if (typeof rawUrl === "string" && rawUrl.includes("?")) {
+    try {
+      const search = rawUrl.startsWith("http") ? new URL(rawUrl).search : new URL(rawUrl, "http://localhost").search;
+      if (search) {
+        const params = new URLSearchParams(search);
+        const val = params.get(key);
+        if (val != null) return val;
+      }
+    } catch {
+    }
+  }
+  return void 0;
+}
+var createResolver = (_options) => {
+  if (typeof _options === "function") {
+    return _options;
+  }
+  const options = _options;
+  const field = options.paramType;
+  let name = options.paramName;
+  if (field === "header") name = name.toLowerCase();
+  return (ctx) => {
+    const req = ctx.switchToHttp().getRequest();
+    if (field === "header") {
+      let raw = getHeader(req, name);
+      if (name === "accept-language") raw = pickPrimaryFromAcceptLanguage(raw);
+      return raw;
+    }
+    if (field === "query") {
+      return getQueryValue(req, name);
+    }
+    throw new Error(`Unsupported paramType: ${field}`);
+  };
+};
+var ApiFromResolver = (_options, extras = {}) => {
+  if (typeof _options === "function") {
+    return () => {
+    };
+  }
+  const options = _options;
+  const paramType = options?.paramType;
+  const apiOptions = {
+    name: options.paramName,
+    ...extras
+  };
+  return paramType === "header" ? ApiHeader(apiOptions) : paramType === "query" ? ApiQuery({ type: "string", ...apiOptions }) : () => {
+  };
+};
+
+// src/token.guard.ts
+import { MetadataSetter, Reflector } from "typed-reflector";
+import { ModuleRef } from "@nestjs/core";
+var reflector = new Reflector();
+var Metadata = new MetadataSetter();
+var defaultHeaderName = "x-server-token";
+var defaultConfigName = "SERVER_TOKEN";
+var defaultErrorCode = 401;
 var TokenGuard = class {
-  constructor(config) {
+  constructor(config, moduleRef) {
     this.config = config;
-    this.token = this.config.get("SERVER_TOKEN");
+    this.moduleRef = moduleRef;
   }
   async canActivate(context) {
-    const request = context.switchToHttp().getRequest();
-    const token = request.headers["x-server-token"];
-    if (this.token && token !== this.token) {
-      throw new BlankReturnMessageDto(401, "Unauthorized").toException();
+    const controller = context.getClass();
+    const handlerName = context.getHandler()?.name;
+    let config = {};
+    if (controller) {
+      if (handlerName) {
+        config = reflector.get("requireTokenOptions", controller, handlerName) || {};
+      } else {
+        config = reflector.get("requireTokenOptions", controller) || {};
+      }
+    }
+    const resolver = createResolver(
+      config.resolver || { paramType: "header", paramName: defaultHeaderName }
+    );
+    const tokenSource = config.tokenSource || defaultConfigName;
+    const [tokenFromClient, tokenFromConfig] = await Promise.all([
+      resolver(context, this.moduleRef),
+      typeof tokenSource === "function" ? tokenSource(context, this.moduleRef) : this.config.get(tokenSource)
+    ]);
+    if (tokenFromConfig && tokenFromConfig !== tokenFromClient) {
+      throw new BlankReturnMessageDto(
+        config.errorCode || defaultErrorCode,
+        "Unauthorized"
+      ).toException();
     }
     return true;
   }
 };
 TokenGuard = __decorateClass([
   Injectable(),
-  __decorateParam(0, Inject(ConfigService))
+  __decorateParam(0, Inject(ConfigService)),
+  __decorateParam(1, Inject(ModuleRef))
 ], TokenGuard);
-var RequireToken = () => MergeClassOrMethodDecorators([
-  UseGuards(TokenGuard),
-  ApiHeader({
-    name: "x-server-token",
+var RequireToken = (options = {}) => {
+  const swaggerDec = options.resolver ? ApiFromResolver(options.resolver, {
+    description: "Server token",
+    required: false
+  }) : ApiHeader2({
+    name: defaultHeaderName,
     description: "Server token",
     required: false
-  }),
-  ApiError(401, "Incorrect server token provided")
-]);
+  });
+  return MergeClassOrMethodDecorators([
+    UseGuards(TokenGuard),
+    swaggerDec,
+    ApiError(
+      options.errorCode || defaultErrorCode,
+      "Incorrect server token provided"
+    ),
+    ...options ? [Metadata.set("requireTokenOptions", options)] : []
+  ]);
+};
 
 // src/abort-utils.ts
 import { Observable, takeUntil } from "rxjs";
@@ -342,7 +466,7 @@ var AbortSignalProvider = createProvider(
 var InjectAbortSignal = () => Inject2(ABORT_SIGNAL);
 
 // src/abortable-module/abortable.token.ts
-import { ContextIdFactory, ModuleRef, REQUEST as REQUEST2 } from "@nestjs/core";
+import { ContextIdFactory, ModuleRef as ModuleRef2, REQUEST as REQUEST2 } from "@nestjs/core";
 var tokenMemo = /* @__PURE__ */ new Map();
 var abortableToken = (token) => {
   if (tokenMemo.has(token)) return tokenMemo.get(token);
@@ -372,7 +496,7 @@ function createAbortableProvider(token, opts) {
     {
       provide,
       scope: Scope2.REQUEST,
-      inject: [ModuleRef, REQUEST2, ABORT_SIGNAL]
+      inject: [ModuleRef2, REQUEST2, ABORT_SIGNAL]
     },
     async (moduleRef, req, signal) => {
       const ctxId = ContextIdFactory.getByRequest(req);
@@ -465,12 +589,12 @@ var parseI18n = (text) => {
 };
 
 // src/i18n-module/i18n.service.ts
-import { ModuleRef as ModuleRef2 } from "@nestjs/core";
+import { ModuleRef as ModuleRef3 } from "@nestjs/core";
 var I18nService = class {
-  constructor(resolver, options, moduleRef) {
-    this.resolver = resolver;
+  constructor(options, moduleRef) {
     this.options = options;
     this.moduleRef = moduleRef;
+    this.resolver = createResolver(this.options.resolver);
     this.locales = new Set(this.options.locales);
     this.defaultLocale = this.options.defaultLocale ?? this.options.locales[0];
     this.middlewares = [];
@@ -677,81 +801,13 @@ var I18nService = class {
 };
 I18nService = __decorateClass([
   Injectable2(),
-  __decorateParam(0, Inject4(I18nResolverToken)),
-  __decorateParam(1, Inject4(I18nModuleOptionsToken)),
-  __decorateParam(2, Inject4(ModuleRef2))
+  __decorateParam(0, Inject4(I18nModuleOptionsToken)),
+  __decorateParam(1, Inject4(ModuleRef3))
 ], I18nService);
 
 // src/i18n-module/i18n.module.ts
 import { Global, Module as Module2 } from "@nestjs/common";
 
-// src/i18n-module/i18n-resolver.ts
-var coerceToString = (v) => {
-  if (v == null) return void 0;
-  if (v === false) return void 0;
-  if (Array.isArray(v)) return v.length ? coerceToString(v[0]) : void 0;
-  if (typeof v === "string") return v;
-  if (typeof v === "number") return String(v);
-  return void 0;
-};
-var getHeader = (req, name) => {
-  const viaMethod = typeof req.getHeader === "function" && req.getHeader(name) || typeof req.header === "function" && req.header(name) || typeof req.get === "function" && req.get(name);
-  if (viaMethod) {
-    return coerceToString(viaMethod);
-  }
-  const n = name.toLowerCase();
-  const headers = req.headers ?? {};
-  if (n in headers) return coerceToString(headers[n]);
-  const hit = Object.entries(headers).find(([k]) => k.toLowerCase() === n)?.[1];
-  return coerceToString(hit);
-};
-var pickPrimaryFromAcceptLanguage = (v) => {
-  if (!v) return void 0;
-  const first = v.split(",")[0]?.trim();
-  return first?.split(";")[0]?.trim() || first;
-};
-function getQueryValue(req, key) {
-  const q = req.query;
-  if (q && typeof q === "object" && !("raw" in q)) {
-    const v = q[key];
-    if (v != null) return coerceToString(v);
-  }
-  const rawUrl = req.originalUrl ?? req.url;
-  if (typeof rawUrl === "string" && rawUrl.includes("?")) {
-    try {
-      const search = rawUrl.startsWith("http") ? new URL(rawUrl).search : new URL(rawUrl, "http://localhost").search;
-      if (search) {
-        const params = new URLSearchParams(search);
-        const val = params.get(key);
-        if (val != null) return val;
-      }
-    } catch {
-    }
-  }
-  return void 0;
-}
-var createDynamicResolverFromStatic = (_options) => {
-  if (typeof _options === "function") {
-    return _options;
-  }
-  const options = _options;
-  const field = options.paramType;
-  let name = options.paramName;
-  if (field === "header") name = name.toLowerCase();
-  return (ctx) => {
-    const req = ctx.switchToHttp().getRequest();
-    if (field === "header") {
-      let raw = getHeader(req, name);
-      if (name === "accept-language") raw = pickPrimaryFromAcceptLanguage(raw);
-      return raw;
-    }
-    if (field === "query") {
-      return getQueryValue(req, name);
-    }
-    throw new Error(`Unsupported paramType: ${field}`);
-  };
-};
-
 // src/i18n-module/locale.pipe.ts
 import {
   createParamDecorator as createParamDecorator2,
@@ -765,7 +821,7 @@ var LocalePipe = class {
   async transform(ctx, metadata) {
     const resolver = ctx.resolver;
     if (resolver) {
-      const _resolver = createDynamicResolverFromStatic(resolver);
+      const _resolver = createResolver(resolver);
       const locale = await _resolver(ctx.ctx, void 0);
       return this.i18nService.getExactLocale(locale);
     } else {
@@ -788,17 +844,7 @@ var I18nModule = class extends ConfigurableModuleClass {
 I18nModule = __decorateClass([
   Global(),
   Module2({
-    providers: [
-      createProvider(
-        {
-          provide: I18nResolverToken,
-          inject: [I18nModuleOptionsToken]
-        },
-        (o) => createDynamicResolverFromStatic(o.resolver)
-      ),
-      I18nService,
-      LocalePipe
-    ],
+    providers: [I18nService, LocalePipe],
     exports: [I18nService, LocalePipe]
   })
 ], I18nModule);
@@ -846,24 +892,15 @@ I18nInterceptor = __decorateClass([
 ], I18nInterceptor);
 
 // src/i18n-module/i18n-decorator.ts
-import {
-  ApiHeader as ApiHeader2,
-  ApiQuery
-} from "@nestjs/swagger";
 var createI18nDecorator = (options) => {
-  const paramType = options.resolver?.paramType;
-  const apiOptions = {
-    name: options.resolver.paramName,
-    description: "Locale for internationalization",
-    required: false,
-    default: options.defaultLocale ?? options.locales[0],
-    enum: options.locales
-  };
-  const dec = paramType === "header" ? () => ApiHeader2(apiOptions) : paramType === "query" ? () => ApiQuery({ ...apiOptions, type: "string" }) : () => () => {
-  };
   return () => MergeClassOrMethodDecorators([
     UseInterceptors(I18nInterceptor),
-    ...paramType ? [dec()] : []
+    ApiFromResolver(options.resolver, {
+      description: "Locale for internationalization",
+      required: false,
+      default: options.defaultLocale ?? options.locales[0],
+      enum: options.locales
+    })
   ]);
 };
 
@@ -881,7 +918,7 @@ var createI18n = (options) => {
   };
 };
 
-// src/i18n-module/middelewares/lookup.ts
+// src/i18n-module/middlewares/lookup.ts
 var I18nLookupMiddleware = (dict, options) => {
   const matchType = options?.matchType ?? "exact";
   const dictFactory = typeof dict === "function" ? dict : () => dict;
@@ -919,7 +956,9 @@ var I18nLookupMiddleware = (dict, options) => {
     }
     if (dictionary && Object.prototype.hasOwnProperty.call(dictionary, key)) {
       const val = dictionary[key];
-      if (val != null) return val;
+      if (val != null) {
+        return val;
+      }
     }
     return next();
   };
@@ -931,6 +970,7 @@ export {
   ApiBlankResponse,
   ApiError,
   ApiErrorTyped,
+  ApiFromResolver,
   ApiTypeResponse,
   As,
   BlankPaginatedReturnMessageDto,
@@ -964,6 +1004,7 @@ export {
   createI18n,
   createI18nDecorator,
   createProvider,
+  createResolver,
   fromAbortable,
   getClassFromClassOrArray,
   takeUntilAbort