Merge pull request #36 from Rezonate-io/fix-relation-auth

fix a bug where a relation has no auth providers

Author: rezoled

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Cache node modules
         id: cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             **/node_modules

copy.js

@@ -1,9 +1,10 @@
-const prompts = require('prompts');
-const { rmSync, renameSync } = require('node:fs')
-const path = require('path');
+import prompts from 'prompts';
+import { rmSync, renameSync } from 'node:fs';
+import path from 'path';
 
 
-const projects = ['nestjs-query-core', 'nestjs-query-typeorm', 'nestjs-query-graphql', ]
+const projects = ['core', 'query-typeorm', 'query-graphql', ];
+const targets = ['nestjs-query-core', 'nestjs-query-typeorm', 'nestjs-query-graphql', ]
 
 async function run() {
   const { dir } = await prompts({
@@ -12,9 +13,9 @@ async function run() {
     message: 'target folder?',
   });
 
-  projects.forEach(p => {
+  projects.forEach((p, i) => {
     const oldPath = path.resolve('dist/packages', p, 'src');
-    const newPath = path.resolve(dir, 'node_modules/@rezonate', p,);
+    const newPath = path.resolve(dir, 'node_modules/@rezonate', targets[i],);
     const newPathSrc = path.resolve(newPath, 'src');
     rmSync(newPathSrc, {recursive: true, force: true})
     renameSync(oldPath, newPathSrc);

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rezonate/nestjs-query-core",
-  "version": "6.0.9",
+  "version": "6.0.10",
   "description": "Base query package",
   "author": "doug-martin <doug@dougamartin.com>",
   "homepage": "https://github.com/Rezonate-io/nestjs-query#readme",

packages/query-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rezonate/nestjs-query-graphql",
-  "version": "6.0.9",
+  "version": "6.0.10",
   "description": "Nestjs graphql query adapter",
   "author": "doug-martin <doug@dougamartin.com>",
   "homepage": "https://github.com/Rezonate-io/nestjs-query#readme",

packages/query-graphql/src/auth/default-crud.authorizer.ts

@@ -2,7 +2,7 @@ import { Inject, Injectable, Optional } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 import { Class, Filter } from '@rezonate/nestjs-query-core';
 
-import { getAuthorizer, getRelations } from '../decorators';
+import { getAuthorizer, getHasAuthorizerProvider, getRelations } from '../decorators';
 import { ResolverRelation } from '../resolvers/relations';
 import { AuthorizationContext, Authorizer, CustomAuthorizer } from './authorizer';
 import { getAuthorizerToken, getCustomAuthorizerToken } from './tokens';
@@ -75,7 +75,7 @@ export function createDefaultAuthorizer<DTO>(
         if (!relation) return;
         if (relation.auth) {
           this.relationsAuthorizers.set(relationName, createRelationAuthorizer(relation.auth));
-        } else if (getAuthorizer(relation.DTO)) {
+        } else if (getAuthorizer(relation.DTO) && getHasAuthorizerProvider(relation.DTO)) {
           this.relationsAuthorizers.set(relationName, this.moduleRef.get(getAuthorizerToken(relation.DTO), { strict: false }));
         }
       }

packages/query-graphql/src/decorators/authorizer.decorator.ts

@@ -1,9 +1,10 @@
 import { Class, MetaValue, ValueReflector } from '@rezonate/nestjs-query-core';
 
 import { Authorizer, AuthorizerOptions, createDefaultAuthorizer, CustomAuthorizer } from '../auth';
-import { AUTHORIZER_KEY, CUSTOM_AUTHORIZER_KEY } from './constants';
+import { AUTHORIZER_KEY, AUTHORIZER_PROVIDER_KEY, CUSTOM_AUTHORIZER_KEY } from './constants';
 
 const reflector = new ValueReflector(AUTHORIZER_KEY);
+const authorizerProviderReflector = new ValueReflector(AUTHORIZER_PROVIDER_KEY);
 const customAuthorizerReflector = new ValueReflector(CUSTOM_AUTHORIZER_KEY);
 
 export function Authorize<DTO>(
@@ -22,3 +23,7 @@ export function Authorize<DTO>(
 export const getAuthorizer = <DTO>(DTOClass: Class<DTO>): MetaValue<Class<Authorizer<DTO>>> => reflector.get(DTOClass);
 export const getCustomAuthorizer = <DTO>(DTOClass: Class<DTO>): MetaValue<Class<CustomAuthorizer<DTO>>> =>
   customAuthorizerReflector.get(DTOClass);
+
+export const setHasAuthorizerProvider  = <DTO>(DTOClass: Class<DTO>): void => authorizerProviderReflector.set(DTOClass, true);
+
+export const getHasAuthorizerProvider  = <DTO>(DTOClass: Class<DTO>): MetaValue<boolean> => authorizerProviderReflector.get(DTOClass);

packages/query-graphql/src/decorators/constants.ts

@@ -4,6 +4,7 @@ export const RELATION_KEY = 'nestjs-query:relation';
 export const REFERENCE_KEY = 'nestjs-query:reference';
 
 export const AUTHORIZER_KEY = 'nestjs-query:authorizer';
+export const AUTHORIZER_PROVIDER_KEY = 'nestjs-query:authorizer-provider';
 export const CUSTOM_AUTHORIZER_KEY = 'nestjs-query:custom-authorizer';
 
 export const KEY_SET_KEY = 'nestjs-query:key-set';

packages/query-graphql/src/providers/authorizer.provider.ts

@@ -2,31 +2,32 @@ import { Provider } from '@nestjs/common';
 import { Class } from '@rezonate/nestjs-query-core';
 
 import { createDefaultAuthorizer, getAuthorizerToken, getCustomAuthorizerToken } from '../auth';
-import { getAuthorizer, getCustomAuthorizer } from '../decorators';
+import { getAuthorizer, getCustomAuthorizer, setHasAuthorizerProvider } from '../decorators';
 
 function createServiceProvider<DTO>(DTOClass: Class<DTO>): Provider {
-  const token = getAuthorizerToken(DTOClass);
-  const authorizer = getAuthorizer(DTOClass);
-  if (!authorizer) {
-    // create default authorizer in case any relations have an authorizers
-    return { provide: token, useClass: createDefaultAuthorizer(DTOClass, { authorize: () => ({}) }) };
-  }
-  return { provide: token, useClass: authorizer };
+	const token = getAuthorizerToken(DTOClass);
+	const authorizer = getAuthorizer(DTOClass);
+	setHasAuthorizerProvider(DTOClass);
+	if (!authorizer) {
+		// create default authorizer in case any relations have an authorizers
+		return { provide: token, useClass: createDefaultAuthorizer(DTOClass, { authorize: () => ({}) }) };
+	}
+	return { provide: token, useClass: authorizer };
 }
 
 function createCustomAuthorizerProvider<DTO>(DTOClass: Class<DTO>): Provider | undefined {
-  const token = getCustomAuthorizerToken(DTOClass);
-  const customAuthorizer = getCustomAuthorizer(DTOClass);
-  if (customAuthorizer) {
-    return { provide: token, useClass: customAuthorizer };
-  }
-  return undefined;
+	const token = getCustomAuthorizerToken(DTOClass);
+	const customAuthorizer = getCustomAuthorizer(DTOClass);
+	if (customAuthorizer) {
+		return { provide: token, useClass: customAuthorizer };
+	}
+	return undefined;
 }
 
 export const createAuthorizerProviders = (DTOClasses: Class<unknown>[]): Provider[] =>
-  DTOClasses.reduce<Provider[]>((providers, DTOClass) => {
-    const p = createCustomAuthorizerProvider(DTOClass);
-    if (p) providers.push(p);
-    providers.push(createServiceProvider(DTOClass));
-    return providers;
-  }, []);
+	DTOClasses.reduce<Provider[]>((providers, DTOClass) => {
+		const p = createCustomAuthorizerProvider(DTOClass);
+		if (p) providers.push(p);
+		providers.push(createServiceProvider(DTOClass));
+		return providers;
+	}, []);

packages/query-graphql/src/resolvers/read.resolver.ts

@@ -21,6 +21,7 @@ import {
 import { CursorQueryArgsTypeOpts, QueryType, StaticQueryType } from '../types/query';
 import { DEFAULT_QUERY_OPTS } from '../types/query/query-args';
 import { BaseServiceResolver, ExtractPagingStrategy, ResolverClass, ResolverOpts, ServiceResolver } from './resolver.interface';
+import { FilterConstructor } from '../types/query/filter.type';
 
 const QUERY_ARGS_TOKEN = Symbol('QUERY_ARGS_TOKEN');
 
@@ -53,6 +54,8 @@ export interface ReadResolver<DTO, PS extends PagingStrategies, QS extends Query
 
 export const getQueryArgs = <DTO>(DTOClass: Class<DTO>) => FilterType(DTOClass);
 
+export type QueryArgsField<T extends FilterConstructor<any>> = InstanceType<T>;
+
 const serializeNestedObjects = (obj: Record<string, any>): Record<string, any> => {
   const result: Record<string, any> = {};
   Object.entries(obj).forEach(([key, value]) => {

packages/query-typeorm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rezonate/nestjs-query-typeorm",
-  "version": "6.0.9",
+  "version": "6.0.10",
   "description": "Typeorm adapter for @rezonate/nestjs-query-core",
   "author": "doug-martin <doug@dougamartin.com>",
   "homepage": "https://github.com/Rezonate-io/nestjs-query#readme",