@baseplate-dev/fastify-generators 0.4.2 → 0.4.3

package/dist/generators/auth/index.js

@@ -2,6 +2,7 @@ export * from './_providers/index.js';
 export * from './auth-context/index.js';
 export * from './auth-plugin/index.js';
 export * from './auth-roles/index.js';
+export * from './authorizer-utils-stub/index.js';
 export * from './password-hasher-service/index.js';
 export * from './placeholder-auth-service/index.js';
 export * from './user-session-types/index.js';

package/dist/generators/auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generators/auth/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oCAAoC,CAAC;AACnD,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generators/auth/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,oCAAoC,CAAC;AACnD,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC"}

package/dist/generators/core/fastify/fastify.generator.js

@@ -49,9 +49,9 @@ export const fastifyGenerator = createGenerator({
                 'tsx',
                 '@types/node',
             ]));
+            node.files.push('dist/**/*');
             node.extraProperties.merge({
                 main: 'dist/index.js',
-                files: ['dist/**/*', 'package.json', 'README.md'],
             });
         }),
         gitIgnore: createProviderTask(nodeGitIgnoreProvider, (nodeGitIgnore) => {

package/dist/generators/core/fastify/fastify.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"fastify.generator.js","sourceRoot":"","sources":["../../../../src/generators/core/fastify/fastify.generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fastify.generator.js","sourceRoot":"","sources":["../../../../src/generators/core/fastify/fastify.generator.ts"],"names":[],"mappings":"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"}

package/dist/generators/pothos/pothos-auth/generated/index.d.ts

@@ -12,17 +12,25 @@ export declare const POTHOS_POTHOS_AUTH_GENERATED: {
         task: import("@baseplate-dev/sync").GeneratorTask<{
             pothosPothosAuthRenderers: import("@baseplate-dev/sync").ProviderExport<import("./template-renderers.js").PothosPothosAuthRenderers>;
         }, {
-            errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-                BadRequestError: {};
-                ForbiddenError: {};
-                handleZodRequestValidationError: {};
-                HttpError: {};
-                InternalServerError: {};
-                logError: {};
-                NotFoundError: {};
-                UnauthorizedError: {};
+            authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                checkGlobalAuthorization: {};
+                checkInstanceAuthorization: {};
+                GlobalRoleCheck: {
+                    isTypeOnly: true;
+                };
+                InstanceRoleCheck: {
+                    isTypeOnly: true;
+                };
             }>>;
             paths: import("@baseplate-dev/sync").ProviderType<import("./template-paths.js").PothosPothosAuthPaths>;
+            serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                createServiceContext: {};
+                createSystemServiceContext: {};
+                createTestServiceContext: {};
+                ServiceContext: {
+                    isTypeOnly: true;
+                };
+            }>>;
             typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
         }, undefined>;
     };
@@ -33,20 +41,39 @@ export declare const POTHOS_POTHOS_AUTH_GENERATED: {
                 fieldAuthorizeTypes: {};
             }>;
             fieldAuthorizePlugin: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
-                errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-                    BadRequestError: {};
-                    ForbiddenError: {};
-                    handleZodRequestValidationError: {};
-                    HttpError: {};
-                    InternalServerError: {};
-                    logError: {};
-                    NotFoundError: {};
-                    UnauthorizedError: {};
+                authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                    checkGlobalAuthorization: {};
+                    checkInstanceAuthorization: {};
+                    GlobalRoleCheck: {
+                        isTypeOnly: true;
+                    };
+                    InstanceRoleCheck: {
+                        isTypeOnly: true;
+                    };
+                }>>;
+                serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                    createServiceContext: {};
+                    createSystemServiceContext: {};
+                    createTestServiceContext: {};
+                    ServiceContext: {
+                        isTypeOnly: true;
+                    };
                 }>>;
             }, {
                 fieldAuthorizeTypes: {};
             }>;
-            fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, Record<never, Record<never, never>>>;
+            fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
+                authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                    checkGlobalAuthorization: {};
+                    checkInstanceAuthorization: {};
+                    GlobalRoleCheck: {
+                        isTypeOnly: true;
+                    };
+                    InstanceRoleCheck: {
+                        isTypeOnly: true;
+                    };
+                }>>;
+            }, Record<never, Record<never, never>>>;
         };
     };
 };

package/dist/generators/pothos/pothos-auth/generated/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAIxC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAIxC,CAAC"}

package/dist/generators/pothos/pothos-auth/generated/template-renderers.d.ts

@@ -11,17 +11,25 @@ export declare const POTHOS_POTHOS_AUTH_RENDERERS: {
     task: import("@baseplate-dev/sync").GeneratorTask<{
         pothosPothosAuthRenderers: import("@baseplate-dev/sync").ProviderExport<PothosPothosAuthRenderers>;
     }, {
-        errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            BadRequestError: {};
-            ForbiddenError: {};
-            handleZodRequestValidationError: {};
-            HttpError: {};
-            InternalServerError: {};
-            logError: {};
-            NotFoundError: {};
-            UnauthorizedError: {};
+        authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            checkGlobalAuthorization: {};
+            checkInstanceAuthorization: {};
+            GlobalRoleCheck: {
+                isTypeOnly: true;
+            };
+            InstanceRoleCheck: {
+                isTypeOnly: true;
+            };
         }>>;
         paths: import("@baseplate-dev/sync").ProviderType<import("./template-paths.js").PothosPothosAuthPaths>;
+        serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            createServiceContext: {};
+            createSystemServiceContext: {};
+            createTestServiceContext: {};
+            ServiceContext: {
+                isTypeOnly: true;
+            };
+        }>>;
         typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
     }, undefined>;
 };

package/dist/generators/pothos/pothos-auth/generated/template-renderers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-renderers.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/template-renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,MAAM,WAAW,yBAAyB;IACxC,yBAAyB,EAAE;QACzB,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,gCAAgC,CAC9B,OAAO,4BAA4B,CAAC,yBAAyB,CAC9D,EACD,oBAAoB,GAAG,OAAO,GAAG,OAAO,GAAG,gBAAgB,CAC5D,KACE,aAAa,CAAC;KACpB,CAAC;CACH;AAmCD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;CAGxC,CAAC"}
+{"version":3,"file":"template-renderers.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/template-renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AASzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,MAAM,WAAW,yBAAyB;IACxC,yBAAyB,EAAE;QACzB,MAAM,EAAE,CACN,OAAO,EAAE,IAAI,CACX,gCAAgC,CAC9B,OAAO,4BAA4B,CAAC,yBAAyB,CAC9D,EACD,oBAAoB,GAAG,OAAO,GAAG,OAAO,GAAG,gBAAgB,CAC5D,KACE,aAAa,CAAC;KACpB,CAAC;CACH;AA0CD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;CAGxC,CAAC"}

package/dist/generators/pothos/pothos-auth/generated/template-renderers.js

@@ -1,17 +1,19 @@
 import { typescriptFileProvider } from '@baseplate-dev/core-generators';
 import { createGeneratorTask, createProviderType } from '@baseplate-dev/sync';
-import { errorHandlerServiceImportsProvider } from '#src/generators/core/error-handler-service/generated/ts-import-providers.js';
+import { authorizerUtilsImportsProvider } from '#src/generators/auth/_providers/authorizer-utils-imports.js';
+import { serviceContextImportsProvider } from '#src/generators/core/service-context/generated/ts-import-providers.js';
 import { POTHOS_POTHOS_AUTH_PATHS } from './template-paths.js';
 import { POTHOS_POTHOS_AUTH_TEMPLATES } from './typed-templates.js';
 const pothosPothosAuthRenderers = createProviderType('pothos-pothos-auth-renderers');
 const pothosPothosAuthRenderersTask = createGeneratorTask({
     dependencies: {
-        errorHandlerServiceImports: errorHandlerServiceImportsProvider,
+        authorizerUtilsImports: authorizerUtilsImportsProvider,
         paths: POTHOS_POTHOS_AUTH_PATHS.provider,
+        serviceContextImports: serviceContextImportsProvider,
         typescriptFile: typescriptFileProvider,
     },
     exports: { pothosPothosAuthRenderers: pothosPothosAuthRenderers.export() },
-    run({ errorHandlerServiceImports, paths, typescriptFile }) {
+    run({ authorizerUtilsImports, paths, serviceContextImports, typescriptFile, }) {
         return {
             providers: {
                 pothosPothosAuthRenderers: {
@@ -20,7 +22,8 @@ const pothosPothosAuthRenderersTask = createGeneratorTask({
                             group: POTHOS_POTHOS_AUTH_TEMPLATES.fieldAuthorizePluginGroup,
                             paths,
                             importMapProviders: {
-                                errorHandlerServiceImports,
+                                authorizerUtilsImports,
+                                serviceContextImports,
                             },
                             generatorPaths: paths,
                             ...options,

package/dist/generators/pothos/pothos-auth/generated/template-renderers.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-renderers.js","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/template-renderers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,6EAA6E,CAAC;AAEjI,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAepE,MAAM,yBAAyB,GAAG,kBAAkB,CAClD,8BAA8B,CAC/B,CAAC;AAEF,MAAM,6BAA6B,GAAG,mBAAmB,CAAC;IACxD,YAAY,EAAE;QACZ,0BAA0B,EAAE,kCAAkC;QAC9D,KAAK,EAAE,wBAAwB,CAAC,QAAQ;QACxC,cAAc,EAAE,sBAAsB;KACvC;IACD,OAAO,EAAE,EAAE,yBAAyB,EAAE,yBAAyB,CAAC,MAAM,EAAE,EAAE;IAC1E,GAAG,CAAC,EAAE,0BAA0B,EAAE,KAAK,EAAE,cAAc,EAAE;QACvD,OAAO;YACL,SAAS,EAAE;gBACT,yBAAyB,EAAE;oBACzB,yBAAyB,EAAE;wBACzB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,mBAAmB,CAAC;4BACjC,KAAK,EAAE,4BAA4B,CAAC,yBAAyB;4BAC7D,KAAK;4BACL,kBAAkB,EAAE;gCAClB,0BAA0B;6BAC3B;4BACD,cAAc,EAAE,KAAK;4BACrB,GAAG,OAAO;yBACX,CAAC;qBACL;iBACF;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,QAAQ,EAAE,yBAAyB;IACnC,IAAI,EAAE,6BAA6B;CACpC,CAAC"}
+{"version":3,"file":"template-renderers.js","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/template-renderers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,6DAA6D,CAAC;AAC7G,OAAO,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAEtH,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAepE,MAAM,yBAAyB,GAAG,kBAAkB,CAClD,8BAA8B,CAC/B,CAAC;AAEF,MAAM,6BAA6B,GAAG,mBAAmB,CAAC;IACxD,YAAY,EAAE;QACZ,sBAAsB,EAAE,8BAA8B;QACtD,KAAK,EAAE,wBAAwB,CAAC,QAAQ;QACxC,qBAAqB,EAAE,6BAA6B;QACpD,cAAc,EAAE,sBAAsB;KACvC;IACD,OAAO,EAAE,EAAE,yBAAyB,EAAE,yBAAyB,CAAC,MAAM,EAAE,EAAE;IAC1E,GAAG,CAAC,EACF,sBAAsB,EACtB,KAAK,EACL,qBAAqB,EACrB,cAAc,GACf;QACC,OAAO;YACL,SAAS,EAAE;gBACT,yBAAyB,EAAE;oBACzB,yBAAyB,EAAE;wBACzB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAClB,cAAc,CAAC,mBAAmB,CAAC;4BACjC,KAAK,EAAE,4BAA4B,CAAC,yBAAyB;4BAC7D,KAAK;4BACL,kBAAkB,EAAE;gCAClB,sBAAsB;gCACtB,qBAAqB;6BACtB;4BACD,cAAc,EAAE,KAAK;4BACrB,GAAG,OAAO;yBACX,CAAC;qBACL;iBACF;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,QAAQ,EAAE,yBAAyB;IACnC,IAAI,EAAE,6BAA6B;CACpC,CAAC"}

package/dist/generators/pothos/pothos-auth/generated/typed-templates.d.ts

@@ -4,20 +4,39 @@ export declare const fieldAuthorizePluginGroup: {
         fieldAuthorizeTypes: {};
     }>;
     fieldAuthorizePlugin: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
-        errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            BadRequestError: {};
-            ForbiddenError: {};
-            handleZodRequestValidationError: {};
-            HttpError: {};
-            InternalServerError: {};
-            logError: {};
-            NotFoundError: {};
-            UnauthorizedError: {};
+        authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            checkGlobalAuthorization: {};
+            checkInstanceAuthorization: {};
+            GlobalRoleCheck: {
+                isTypeOnly: true;
+            };
+            InstanceRoleCheck: {
+                isTypeOnly: true;
+            };
+        }>>;
+        serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            createServiceContext: {};
+            createSystemServiceContext: {};
+            createTestServiceContext: {};
+            ServiceContext: {
+                isTypeOnly: true;
+            };
         }>>;
     }, {
         fieldAuthorizeTypes: {};
     }>;
-    fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, Record<never, Record<never, never>>>;
+    fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
+        authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            checkGlobalAuthorization: {};
+            checkInstanceAuthorization: {};
+            GlobalRoleCheck: {
+                isTypeOnly: true;
+            };
+            InstanceRoleCheck: {
+                isTypeOnly: true;
+            };
+        }>>;
+    }, Record<never, Record<never, never>>>;
 };
 export declare const POTHOS_POTHOS_AUTH_TEMPLATES: {
     fieldAuthorizePluginGroup: {
@@ -26,20 +45,39 @@ export declare const POTHOS_POTHOS_AUTH_TEMPLATES: {
             fieldAuthorizeTypes: {};
         }>;
         fieldAuthorizePlugin: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
-            errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-                BadRequestError: {};
-                ForbiddenError: {};
-                handleZodRequestValidationError: {};
-                HttpError: {};
-                InternalServerError: {};
-                logError: {};
-                NotFoundError: {};
-                UnauthorizedError: {};
+            authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                checkGlobalAuthorization: {};
+                checkInstanceAuthorization: {};
+                GlobalRoleCheck: {
+                    isTypeOnly: true;
+                };
+                InstanceRoleCheck: {
+                    isTypeOnly: true;
+                };
+            }>>;
+            serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                createServiceContext: {};
+                createSystemServiceContext: {};
+                createTestServiceContext: {};
+                ServiceContext: {
+                    isTypeOnly: true;
+                };
             }>>;
         }, {
             fieldAuthorizeTypes: {};
         }>;
-        fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {}, Record<never, Record<never, never>>>;
+        fieldAuthorizeTypes: import("@baseplate-dev/core-generators").TsTemplateFile<{}, {
+            authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+                checkGlobalAuthorization: {};
+                checkInstanceAuthorization: {};
+                GlobalRoleCheck: {
+                    isTypeOnly: true;
+                };
+                InstanceRoleCheck: {
+                    isTypeOnly: true;
+                };
+            }>>;
+        }, Record<never, Record<never, never>>>;
     };
 };
 //# sourceMappingURL=typed-templates.d.ts.map

package/dist/generators/pothos/pothos-auth/generated/typed-templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typed-templates.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/typed-templates.ts"],"names":[],"mappings":"AAsDA,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;CAIrC,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;CAAgC,CAAC"}
+{"version":3,"file":"typed-templates.d.ts","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/typed-templates.ts"],"names":[],"mappings":"AA0DA,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAIrC,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAgC,CAAC"}

package/dist/generators/pothos/pothos-auth/generated/typed-templates.js

@@ -1,6 +1,7 @@
 import { createTsTemplateFile } from '@baseplate-dev/core-generators';
 import path from 'node:path';
-import { errorHandlerServiceImportsProvider } from '#src/generators/core/error-handler-service/generated/ts-import-providers.js';
+import { authorizerUtilsImportsProvider } from '#src/generators/auth/_providers/authorizer-utils-imports.js';
+import { serviceContextImportsProvider } from '#src/generators/core/service-context/generated/ts-import-providers.js';
 const fieldAuthorizeGlobalTypes = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     group: 'field-authorize-plugin',
@@ -19,7 +20,8 @@ const fieldAuthorizePlugin = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     group: 'field-authorize-plugin',
     importMapProviders: {
-        errorHandlerServiceImports: errorHandlerServiceImportsProvider,
+        authorizerUtilsImports: authorizerUtilsImportsProvider,
+        serviceContextImports: serviceContextImportsProvider,
     },
     name: 'field-authorize-plugin',
     referencedGeneratorTemplates: { fieldAuthorizeTypes: {} },
@@ -31,7 +33,9 @@ const fieldAuthorizePlugin = createTsTemplateFile({
 const fieldAuthorizeTypes = createTsTemplateFile({
     fileOptions: { kind: 'singleton' },
     group: 'field-authorize-plugin',
-    importMapProviders: {},
+    importMapProviders: {
+        authorizerUtilsImports: authorizerUtilsImportsProvider,
+    },
     name: 'field-authorize-types',
     source: {
         path: path.join(import.meta.dirname, '../templates/src/plugins/graphql/FieldAuthorizePlugin/types.ts'),

package/dist/generators/pothos/pothos-auth/generated/typed-templates.js.map

@@ -1 +1 @@
-{"version":3,"file":"typed-templates.js","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/typed-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,kCAAkC,EAAE,MAAM,6EAA6E,CAAC;AAEjI,MAAM,yBAAyB,GAAG,oBAAoB,CAAC;IACrD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,8BAA8B;IACpC,4BAA4B,EAAE;QAC5B,oBAAoB,EAAE,EAAE;QACxB,mBAAmB,EAAE,EAAE;KACxB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,uEAAuE,CACxE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;IAChD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE;QAClB,0BAA0B,EAAE,kCAAkC;KAC/D;IACD,IAAI,EAAE,wBAAwB;IAC9B,4BAA4B,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE;IACzD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,gEAAgE,CACjE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;IAC/C,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,uBAAuB;IAC7B,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,gEAAgE,CACjE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,yBAAyB;IACzB,oBAAoB;IACpB,mBAAmB;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"typed-templates.js","sourceRoot":"","sources":["../../../../../src/generators/pothos/pothos-auth/generated/typed-templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,6DAA6D,CAAC;AAC7G,OAAO,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAEtH,MAAM,yBAAyB,GAAG,oBAAoB,CAAC;IACrD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE,EAAE;IACtB,IAAI,EAAE,8BAA8B;IACpC,4BAA4B,EAAE;QAC5B,oBAAoB,EAAE,EAAE;QACxB,mBAAmB,EAAE,EAAE;KACxB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,uEAAuE,CACxE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;IAChD,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,8BAA8B;QACtD,qBAAqB,EAAE,6BAA6B;KACrD;IACD,IAAI,EAAE,wBAAwB;IAC9B,4BAA4B,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE;IACzD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,gEAAgE,CACjE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;IAC/C,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;IAClC,KAAK,EAAE,wBAAwB;IAC/B,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,8BAA8B;KACvD;IACD,IAAI,EAAE,uBAAuB;IAC7B,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI,CACb,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,gEAAgE,CACjE;KACF;IACD,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,yBAAyB;IACzB,oBAAoB;IACpB,mBAAmB;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,yBAAyB,EAAE,CAAC"}

package/dist/generators/pothos/pothos-auth/pothos-auth.generator.d.ts

@@ -21,17 +21,25 @@ export declare const pothosAuthGenerator: import("@baseplate-dev/sync").Generato
     renderers: import("@baseplate-dev/sync").GeneratorTask<{
         pothosPothosAuthRenderers: import("@baseplate-dev/sync").ProviderExport<import("./generated/template-renderers.js").PothosPothosAuthRenderers>;
     }, {
-        errorHandlerServiceImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            BadRequestError: {};
-            ForbiddenError: {};
-            handleZodRequestValidationError: {};
-            HttpError: {};
-            InternalServerError: {};
-            logError: {};
-            NotFoundError: {};
-            UnauthorizedError: {};
+        authorizerUtilsImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            checkGlobalAuthorization: {};
+            checkInstanceAuthorization: {};
+            GlobalRoleCheck: {
+                isTypeOnly: true;
+            };
+            InstanceRoleCheck: {
+                isTypeOnly: true;
+            };
         }>>;
         paths: import("@baseplate-dev/sync").ProviderType<import("./generated/template-paths.js").PothosPothosAuthPaths>;
+        serviceContextImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
+            createServiceContext: {};
+            createSystemServiceContext: {};
+            createTestServiceContext: {};
+            ServiceContext: {
+                isTypeOnly: true;
+            };
+        }>>;
         typescriptFile: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").TypescriptFileProvider>;
     }, undefined>;
     pothosConfig: import("@baseplate-dev/sync").GeneratorTask<any, {
@@ -44,17 +52,6 @@ export declare const pothosAuthGenerator: import("@baseplate-dev/sync").Generato
             inputTypes: import("@baseplate-dev/utils").MapContainer<string, import("../../../index.js").PothosTypeReference>;
             customScalars: import("@baseplate-dev/utils").MapContainer<"string" | "boolean" | "int" | "date" | "enum" | "uuid" | "dateTime" | "float" | "decimal" | "json" | "jsonObject", import("../../../index.js").PothosCustomScalarConfig>;
         }>, "getValues">>;
-        authRolesImports: import("@baseplate-dev/sync").ProviderType<import("@baseplate-dev/core-generators").InferTsImportMapFromSchema<{
-            AUTH_ROLE_CONFIG: {};
-            AuthRole: {
-                isTypeOnly: true;
-            };
-            DEFAULT_PUBLIC_ROLES: {};
-            DEFAULT_USER_ROLES: {};
-            RoleConfig: {
-                isTypeOnly: true;
-            };
-        }>>;
     }, any>;
     main: import("@baseplate-dev/sync").GeneratorTask<any, {
         pothosSchema: import("@baseplate-dev/sync").ProviderType<import("../pothos/pothos.generator.js").PothosSchemaProvider>;

package/dist/generators/pothos/pothos-auth/pothos-auth.generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pothos-auth.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/pothos/pothos-auth/pothos-auth.generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAYrE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,eAAO,MAAM,2BAA2B;;iBAEtC,CAAC;AAEH,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,cAAc,CAAC;CACtE;AAED,eAAO,MAAM,kBAAkB,gEACwB,CAAC;AAKxD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqE9B,CAAC"}
+{"version":3,"file":"pothos-auth.generator.d.ts","sourceRoot":"","sources":["../../../../src/generators/pothos/pothos-auth/pothos-auth.generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAYrE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,eAAO,MAAM,2BAA2B;;iBAEtC,CAAC;AAEH,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,cAAc,CAAC;CACtE;AAED,eAAO,MAAM,kBAAkB,gEACwB,CAAC;AAKxD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8D9B,CAAC"}

package/dist/generators/pothos/pothos-auth/pothos-auth.generator.js

@@ -1,7 +1,6 @@
 import { packageScope, tsCodeFragment, TsCodeUtils, } from '@baseplate-dev/core-generators';
 import { createGenerator, createGeneratorTask, createProviderType, } from '@baseplate-dev/sync';
 import { z } from 'zod';
-import { authRolesImportsProvider } from '#src/generators/auth/index.js';
 import { pothosConfigProvider, pothosSchemaProvider } from '../pothos/index.js';
 import { POTHOS_POTHOS_AUTH_GENERATED } from './generated/index.js';
 const descriptorSchema = z.object({
@@ -22,14 +21,11 @@ export const pothosAuthGenerator = createGenerator({
         pothosConfig: createGeneratorTask({
             dependencies: {
                 pothosConfig: pothosConfigProvider,
-                authRolesImports: authRolesImportsProvider,
             },
-            run({ pothosConfig, authRolesImports }) {
+            run({ pothosConfig }) {
                 pothosConfig.pothosPlugins.set('pothosAuthorizeByRolesPlugin', TsCodeUtils.importFragment('pothosAuthorizeByRolesPlugin', pothosAuthPluginPath));
-                pothosConfig.schemaTypeOptions.set('AuthRole', authRolesImports.AuthRole.typeFragment());
                 pothosConfig.schemaBuilderOptions.set('authorizeByRoles', TsCodeUtils.mergeFragmentsAsObject({
                     requireOnRootFields: requireOnRootFields.toString(),
-                    extractRoles: '(context) => context.auth.roles',
                 }));
             },
         }),

package/dist/generators/pothos/pothos-auth/pothos-auth.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"pothos-auth.generator.js","sourceRoot":"","sources":["../../../../src/generators/pothos/pothos-auth/pothos-auth.generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pothos-auth.generator.js","sourceRoot":"","sources":["../../../../src/generators/pothos/pothos-auth/pothos-auth.generator.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,WAAW,GACZ,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,mBAAmB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CAC/C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAC;AAUH,MAAM,CAAC,MAAM,kBAAkB,GAC7B,kBAAkB,CAAqB,aAAa,CAAC,CAAC;AAExD,MAAM,oBAAoB,GACxB,qDAAqD,CAAC;AAExD,MAAM,CAAC,MAAM,mBAAmB,GAAG,eAAe,CAAC;IACjD,IAAI,EAAE,oBAAoB;IAC1B,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG;IACjC,gBAAgB;IAChB,UAAU,EAAE,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CAAC,CAAC;QACxC,KAAK,EAAE,4BAA4B,CAAC,KAAK,CAAC,IAAI;QAC9C,SAAS,EAAE,4BAA4B,CAAC,SAAS,CAAC,IAAI;QACtD,YAAY,EAAE,mBAAmB,CAAC;YAChC,YAAY,EAAE;gBACZ,YAAY,EAAE,oBAAoB;aACnC;YACD,GAAG,CAAC,EAAE,YAAY,EAAE;gBAClB,YAAY,CAAC,aAAa,CAAC,GAAG,CAC5B,8BAA8B,EAC9B,WAAW,CAAC,cAAc,CACxB,8BAA8B,EAC9B,oBAAoB,CACrB,CACF,CAAC;gBAEF,YAAY,CAAC,oBAAoB,CAAC,GAAG,CACnC,kBAAkB,EAClB,WAAW,CAAC,sBAAsB,CAAC;oBACjC,mBAAmB,EAAE,mBAAmB,CAAC,QAAQ,EAAE;iBACpD,CAAC,CACH,CAAC;YACJ,CAAC;SACF,CAAC;QACF,IAAI,EAAE,mBAAmB,CAAC;YACxB,YAAY,EAAE;gBACZ,YAAY,EAAE,oBAAoB;gBAClC,SAAS,EAAE,4BAA4B,CAAC,SAAS,CAAC,QAAQ;aAC3D;YACD,GAAG,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE;gBAC7B,OAAO;oBACL,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;wBACvB,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;wBAEpE,YAAY,CAAC,kBAAkB,CAC7B,qDAAqD,CACtD,CAAC;oBACJ,CAAC;iBACF,CAAC;YACJ,CAAC;SACF,CAAC;QACF,aAAa,EAAE,mBAAmB,CAAC;YACjC,OAAO,EAAE;gBACP,UAAU,EAAE,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC;aACpD;YACD,GAAG;gBACD,OAAO;oBACL,SAAS,EAAE;wBACT,UAAU,EAAE;4BACV,qBAAqB,EAAE,CAAC,MAAM,EAAE,EAAE;4BAChC,uBAAuB;4BACvB,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;yBAC/C;qBACF;iBACF,CAAC;YACJ,CAAC;SACF,CAAC;KACH,CAAC;CACH,CAAC,CAAC"}

package/dist/generators/pothos/pothos-auth/templates/src/plugins/graphql/FieldAuthorizePlugin/global-types.ts

@@ -8,7 +8,6 @@ import type {
 import type {
   FieldNullability,
   InputFieldMap,
-  InputShapeFromFields,
   SchemaTypes,
   TypeParam,
 } from '@pothos/core';
@@ -22,18 +21,8 @@ declare global {
       authorizeByRoles: PothosAuthorizeByRolesPlugin<Types>;
     }
 
-    export interface UserSchemaTypes {
-      AuthRole: string;
-    }
-
-    export interface ExtendDefaultTypes<
-      PartialTypes extends Partial<UserSchemaTypes>,
-    > {
-      AuthRole: PartialTypes['AuthRole'] & string;
-    }
-
     export interface SchemaBuilderOptions<Types extends SchemaTypes> {
-      authorizeByRoles: AuthorizeRolePluginOptions<Types>;
+      authorizeByRoles: AuthorizeRolePluginOptions;
     }
 
     export interface FieldOptions<
@@ -45,11 +34,7 @@ declare global {
       ResolveShape,
       ResolveReturnShape,
     > {
-      authorize?: AuthorizeRoleRuleOption<
-        ParentShape,
-        InputShapeFromFields<Args>,
-        Types
-      >;
+      authorize?: AuthorizeRoleRuleOption<ParentShape>;
     }
   }
 }

package/dist/generators/pothos/pothos-auth/templates/src/plugins/graphql/FieldAuthorizePlugin/index.ts

@@ -1,13 +1,11 @@
 // @ts-nocheck
 
-import type {
-  AuthorizeRoleRuleFunction,
-  AuthorizeRoleRuleOption,
-} from '$fieldAuthorizeTypes';
+import type { AuthorizeRoleRuleOption } from '$fieldAuthorizeTypes';
+import type { ServiceContext } from '%serviceContextImports';
 import type { PothosOutputFieldConfig, SchemaTypes } from '@pothos/core';
-import type { GraphQLFieldResolver, GraphQLResolveInfo } from 'graphql';
+import type { GraphQLFieldResolver } from 'graphql';
 
-import { ForbiddenError } from '%errorHandlerServiceImports';
+import { checkInstanceAuthorization } from '%authorizerUtilsImports';
 import SchemaBuilder, { BasePlugin } from '@pothos/core';
 
 import './global-types.js';
@@ -37,59 +35,14 @@ export class PothosAuthorizeByRolesPlugin<
 
   async authorizeAccess(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    authorize: AuthorizeRoleRuleOption<any, any, Types>,
+    authorize: AuthorizeRoleRuleOption<any>,
     root: unknown,
-    args: object,
     context: Types['Context'],
-    info: GraphQLResolveInfo,
   ): Promise<void> {
     const rules = Array.isArray(authorize) ? authorize : [authorize];
-    const roles = this.builder.options.authorizeByRoles.extractRoles(context);
+    const ctx = context as ServiceContext;
 
-    // process all string rules first
-    const stringRules = rules.filter(
-      (rule): rule is Types['AuthRole'] => typeof rule === 'string',
-    );
-
-    if (stringRules.some((rule) => roles.includes(rule))) {
-      return;
-    }
-
-    const ruleFunctions = rules.filter(
-      (rule): rule is AuthorizeRoleRuleFunction<unknown, unknown, Types> =>
-        typeof rule === 'function',
-    );
-
-    // try all rules and see if any match
-    const results = await Promise.allSettled(
-      ruleFunctions.map((func) => func(root, args, context, info)),
-    );
-
-    // if any check passed, return success
-    if (results.some((r) => r.status === 'fulfilled' && r.value)) {
-      return;
-    }
-
-    // if a check threw an unexpected error, throw that since it may mean
-    // the authorization rule may have been valid but failed to run
-    const unexpectedError = results.find(
-      (r) => r.status === 'rejected' && !(r.reason instanceof ForbiddenError),
-    ) as PromiseRejectedResult | undefined;
-
-    if (unexpectedError) {
-      throw unexpectedError.reason;
-    }
-
-    // if a check threw a forbidden error with a message, throw that
-    const forbiddenError = results.find(
-      (r) => r.status === 'rejected' && r.reason instanceof ForbiddenError,
-    ) as PromiseRejectedResult | undefined;
-
-    if (forbiddenError) {
-      throw forbiddenError.reason;
-    }
-
-    throw new ForbiddenError('Forbidden');
+    await checkInstanceAuthorization(ctx, root, rules);
   }
 
   override wrapResolve(
@@ -102,7 +55,7 @@ export class PothosAuthorizeByRolesPlugin<
     }
 
     return async (source, args, context, info) => {
-      await this.authorizeAccess(authorize, source, args, context, info);
+      await this.authorizeAccess(authorize, source, context);
       return resolver(source, args, context, info);
     };
   }
@@ -117,7 +70,7 @@ export class PothosAuthorizeByRolesPlugin<
     }
 
     return async (source, args, context, info) => {
-      await this.authorizeAccess(authorize, source, args, context, info);
+      await this.authorizeAccess(authorize, source, context);
       return subscriber(source, args, context, info);
     };
   }