@iamnnort/nestjs-serializer 2.2.6 → 2.2.8

package/dist/index.mjs

@@ -9205,7 +9205,7 @@ SerializerService = _ts_decorate([
 ], SerializerService);
 
 // src/interceptor.ts
-import { intersection } from "lodash";
+import { intersection, uniq as uniq2 } from "lodash";
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -9228,7 +9228,7 @@ var SerializerInterceptor = /* @__PURE__ */ __name((config) => {
     }
     intercept(ctx, next) {
       const request = ctx.switchToHttp().getRequest();
-      request.scopes = this.getScopes(ctx);
+      request.scopes = this.withQueryScopes(ctx, this.withSecretScopes(ctx, this.getScopes(ctx)));
       return next.handle().pipe((0, import_operators.map)(async (responsePromise) => {
         const response = await responsePromise;
         if (!request.scopes && !config.fields) {
@@ -9242,19 +9242,36 @@ var SerializerInterceptor = /* @__PURE__ */ __name((config) => {
     }
     getScopes(ctx) {
       const request = ctx.switchToHttp().getRequest();
+      const scopes = config.scopes || [];
       if (request.query.limited === "true") {
-        return config.limitedScopes || this.serializerService.config.globalLimitedScopes || config.scopes;
+        return config.limitedScopes || this.serializerService.config.globalLimitedScopes || scopes;
       }
       if (request.query.extended === "true") {
-        return config.extendedScopes || config.scopes;
-      }
-      if (request.query.secret === "true") {
-        return config.secretScopes || this.serializerService.config.globalSecretScopes || config.scopes;
+        return config.extendedScopes || scopes;
       }
+      return scopes;
+    }
+    withQueryScopes(ctx, scopes) {
+      const request = ctx.switchToHttp().getRequest();
       if (request.query.scopes && config.allowedScopes) {
-        return intersection(request.query.scopes, config.allowedScopes);
+        const queryScopes = intersection(request.query.scopes, config.allowedScopes);
+        return uniq2([
+          ...scopes,
+          ...queryScopes
+        ]);
+      }
+      return scopes;
+    }
+    withSecretScopes(ctx, scopes) {
+      const request = ctx.switchToHttp().getRequest();
+      if (request.query.secret === "true") {
+        const secretScopes = config.secretScopes || this.serializerService.config.globalSecretScopes || [];
+        return uniq2([
+          ...scopes,
+          ...secretScopes
+        ]);
       }
-      return config.scopes;
+      return scopes;
     }
   };
   SerializerInterceptor2 = _ts_decorate2([