@iamnnort/nestjs-serializer 2.2.8 → 2.2.9

package/dist/index.d.mts

@@ -63,7 +63,7 @@ declare const SerializerInterceptor: (config: {
         serializerService: SerializerService;
         intercept(ctx: ExecutionContext, next: CallHandler<Promise<any>>): rxjs.Observable<Promise<any>>;
         getScopes(ctx: ExecutionContext): string[];
-        withQueryScopes(ctx: ExecutionContext, scopes: string[]): string[];
+        withExtendedScopes(ctx: ExecutionContext, scopes: string[]): string[];
         withSecretScopes(ctx: ExecutionContext, scopes: string[]): string[];
     };
 };
@@ -72,7 +72,7 @@ declare const SerializerIdInterceptor_base: {
         serializerService: SerializerService;
         intercept(ctx: ExecutionContext, next: CallHandler<Promise<any>>): rxjs.Observable<Promise<any>>;
         getScopes(ctx: ExecutionContext): string[];
-        withQueryScopes(ctx: ExecutionContext, scopes: string[]): string[];
+        withExtendedScopes(ctx: ExecutionContext, scopes: string[]): string[];
         withSecretScopes(ctx: ExecutionContext, scopes: string[]): string[];
     };
 };

package/dist/index.d.ts

@@ -63,7 +63,7 @@ declare const SerializerInterceptor: (config: {
         serializerService: SerializerService;
         intercept(ctx: ExecutionContext, next: CallHandler<Promise<any>>): rxjs.Observable<Promise<any>>;
         getScopes(ctx: ExecutionContext): string[];
-        withQueryScopes(ctx: ExecutionContext, scopes: string[]): string[];
+        withExtendedScopes(ctx: ExecutionContext, scopes: string[]): string[];
         withSecretScopes(ctx: ExecutionContext, scopes: string[]): string[];
     };
 };
@@ -72,7 +72,7 @@ declare const SerializerIdInterceptor_base: {
         serializerService: SerializerService;
         intercept(ctx: ExecutionContext, next: CallHandler<Promise<any>>): rxjs.Observable<Promise<any>>;
         getScopes(ctx: ExecutionContext): string[];
-        withQueryScopes(ctx: ExecutionContext, scopes: string[]): string[];
+        withExtendedScopes(ctx: ExecutionContext, scopes: string[]): string[];
         withSecretScopes(ctx: ExecutionContext, scopes: string[]): string[];
     };
 };

package/dist/index.js

@@ -9228,7 +9228,7 @@ var SerializerInterceptor = /* @__PURE__ */ __name((config) => {
     }
     intercept(ctx, next) {
       const request = ctx.switchToHttp().getRequest();
-      request.scopes = this.withQueryScopes(ctx, this.withSecretScopes(ctx, this.getScopes(ctx)));
+      request.scopes = this.getScopes(ctx);
       return next.handle().pipe((0, import_operators.map)(async (responsePromise) => {
         const response = await responsePromise;
         if (!request.scopes && !config.fields) {
@@ -9246,18 +9246,18 @@ var SerializerInterceptor = /* @__PURE__ */ __name((config) => {
       if (request.query.limited === "true") {
         return config.limitedScopes || this.serializerService.config.globalLimitedScopes || scopes;
       }
-      if (request.query.extended === "true") {
-        return config.extendedScopes || scopes;
+      if (request.query.scopes && config.allowedScopes) {
+        return _lodash.intersection.call(void 0, request.query.scopes, config.allowedScopes);
       }
-      return scopes;
+      return this.withSecretScopes(ctx, this.withExtendedScopes(ctx, scopes));
     }
-    withQueryScopes(ctx, scopes) {
+    withExtendedScopes(ctx, scopes) {
       const request = ctx.switchToHttp().getRequest();
-      if (request.query.scopes && config.allowedScopes) {
-        const queryScopes = _lodash.intersection.call(void 0, request.query.scopes, config.allowedScopes);
+      if (request.query.extended === "true") {
+        const extendedScopes = config.extendedScopes || [];
         return _lodash.uniq.call(void 0, [
           ...scopes,
-          ...queryScopes
+          ...extendedScopes
         ]);
       }
       return scopes;