@appxdigital/appx-core 0.1.89 → 0.1.91

package/dist/config/admin/templates/admin.template.d.ts

@@ -1,2 +1,2 @@
-export declare const adminJsModuleCode = "\nimport {DynamicModule} from '@nestjs/common';\nimport {addBasicFilters, createActions, createPermissionHandler, dynamicImport, getAdminJSResources} from './utils';\nimport {initializeComponents} from './component-loader';\nimport {readFileSync} from 'fs';\nimport {getDMMF} from '@prisma/sdk';\nimport {PrismaService} from '@appxdigital/appx-core';\nimport {PrismaModule} from \"../prisma/prisma.module\";\n\nconst DEFAULT_ADMIN = {\n    email: 'joao.duvido@appx.pt',\n    password: 'password',\n};\n\nconst authenticate = async (email: string, password: string) => {\n    if (email === DEFAULT_ADMIN.email && password === DEFAULT_ADMIN.password) {\n        return Promise.resolve(DEFAULT_ADMIN);\n    }\n    return null;\n};\n\nexport async function createAdminJsModule(): Promise<DynamicModule> {\n    const {default: AdminJS} = await dynamicImport('adminjs');\n    const {Database, Resource} = await dynamicImport('@adminjs/prisma');\n    const {AdminModule} = await dynamicImport('@adminjs/nestjs');\n    const {default: importExportFeature} = await dynamicImport('@adminjs/import-export');\n    const {default: passwordFeature} = await dynamicImport('@adminjs/passwords');\n    const argon2 = await dynamicImport('argon2');\n\n    const resources = getAdminJSResources();\n    const {componentLoader, Components} = await initializeComponents();\n    const schemaPath = './prisma/schema.prisma';\n    const schema = readFileSync(schemaPath, 'utf-8');\n    const dmmf = await getDMMF({datamodel: schema});\n\n    const models = [];\n\n    for (const resource of resources) {\n        const model = dmmf.datamodel.models.find(\n            (model) => model.name === resource.name,\n        );\n\n        models.push({\n            model,\n            options: resource.options,\n            features: model.name === 'User' ? [\n                passwordFeature({\n                    properties: {\n                        encryptedPassword: 'password',\n                        password: 'plainPassword',\n                    },\n                    hash: argon2.hash,\n                    componentLoader,\n                }),\n            ] : [],\n        });\n    }\n\n    AdminJS.registerAdapter({Database, Resource});\n\n    return AdminModule.createAdminAsync({\n        imports: [PrismaModule],\n        inject: [PrismaService],\n        useFactory: async (prisma: PrismaService) => {\n            const authenticate = async (email: string, password: string) => {\n                const user = await prisma.user.findUnique({\n                    where: {\n                        email\n                    }\n                });\n\n                if (!user || user.role !== 'ADMIN') {\n                    return null;\n                }\n\n                const isPasswordValid = await argon2.verify(user.password, password);\n\n                return isPasswordValid ? Promise.resolve({email: user.email, role: user.role, id: user.id}) : null;\n            }\n\n            return {\n                adminJsOptions: {\n                    rootPath: '/admin',\n                    dashboard: {\n                        component: Components.Dashboard,\n                        handler: async () => {\n                            return {some: 'output'};\n                        },\n                    },\n                    branding: {\n                        companyName: 'AppX Core Wizard',\n                        withMadeWithLove: false,\n                        logo: 'https://i.ibb.co/XZNRS5m/appxdigitalcom-logo.jpg',\n                    },\n                    resources: models.map((m) => {\n                        return {\n                            resource: {model: m.model, client: prisma},\n                            options: {\n                                ...m.options,\n                                actions: createActions(),\n                            },\n                            features: [...(m.features || []), importExportFeature({\n                                componentLoader\n                            })],\n                        };\n                    }),\n                    componentLoader,\n                },\n                auth: {\n                    authenticate,\n                    cookieName: process.env.SESSION_COOKIE_NAME,\n                    cookiePassword: process.env.SESSION_SECRET,\n                },\n                sessionOptions: {\n                    resave: false,\n                    saveUninitialized: true,\n                    secret: process.env.SESSION_SECRET,\n                    cookie: {\n                        httpOnly: process.env.NODE_ENV === 'production',\n                        secure: false,\n                    },\n                    name: process.env.SESSION_COOKIE_NAME,\n                },\n            };\n        },\n    });\n}\n";
+export declare const adminJsModuleCode = "\nimport {DynamicModule} from '@nestjs/common';\nimport {addBasicFilters, createActions, createPermissionHandler, dynamicImport, getAdminJSResources} from './utils';\nimport {initializeComponents} from './component-loader';\nimport {readFileSync} from 'fs';\nimport {getDMMF} from '@prisma/sdk';\nimport {PrismaService} from '@appxdigital/appx-core';\nimport {PrismaModule} from \"../prisma/prisma.module\";\n\nconst DEFAULT_ADMIN = {\n    email: 'joao.duvido@appx.pt',\n    password: 'password',\n};\n\nconst authenticate = async (email: string, password: string) => {\n    if (email === DEFAULT_ADMIN.email && password === DEFAULT_ADMIN.password) {\n        return Promise.resolve(DEFAULT_ADMIN);\n    }\n    return null;\n};\n\nexport async function createAdminJsModule(): Promise<DynamicModule> {\n    const {default: AdminJS} = await dynamicImport('adminjs');\n    const {Database, Resource} = await dynamicImport('@adminjs/prisma');\n    const {AdminModule} = await dynamicImport('@adminjs/nestjs');\n    const {default: importExportFeature} = await dynamicImport('@adminjs/import-export');\n    const {default: passwordFeature} = await dynamicImport('@adminjs/passwords');\n    const argon2 = await dynamicImport('argon2');\n\n    const resources = getAdminJSResources();\n    const {componentLoader, Components} = await initializeComponents();\n    const schemaPath = './prisma/schema.prisma';\n    const schema = readFileSync(schemaPath, 'utf-8');\n    const dmmf = await getDMMF({datamodel: schema});\n\n    const models = [];\n\n    for (const resource of resources) {\n        const model = dmmf.datamodel.models.find(\n            (model) => model.name === resource.name,\n        );\n\n        models.push({\n            model,\n            options: resource.options,\n            features: model.name === 'User' ? [\n                passwordFeature({\n                    properties: {\n                        encryptedPassword: 'password',\n                        password: 'plainPassword',\n                    },\n                    hash: argon2.hash,\n                    componentLoader,\n                }),\n            ] : [],\n        });\n    }\n\n    AdminJS.registerAdapter({Database, Resource});\n\n    return AdminModule.createAdminAsync({\n        imports: [PrismaModule],\n        inject: [PrismaService],\n        useFactory: async (prisma: PrismaService) => {\n            const authenticate = async (email: string, password: string) => {\n                const user = await prisma.user.findFirst({\n                    where: {\n                        email\n                    }\n                });\n\n                if (!user || user.role !== 'ADMIN') {\n                    return null;\n                }\n\n                const isPasswordValid = await argon2.verify(user.password, password);\n\n                return isPasswordValid ? Promise.resolve({email: user.email, role: user.role, id: user.id}) : null;\n            }\n\n            return {\n                adminJsOptions: {\n                    rootPath: '/admin',\n                    dashboard: {\n                        component: Components.Dashboard,\n                        handler: async () => {\n                            return {some: 'output'};\n                        },\n                    },\n                    branding: {\n                        companyName: 'AppX Core Wizard',\n                        withMadeWithLove: false,\n                        logo: 'https://i.ibb.co/XZNRS5m/appxdigitalcom-logo.jpg',\n                    },\n                    resources: models.map((m) => {\n                        return {\n                            resource: {model: m.model, client: prisma},\n                            options: {\n                                ...m.options,\n                                actions: createActions(),\n                            },\n                            features: [...(m.features || []), importExportFeature({\n                                componentLoader\n                            })],\n                        };\n                    }),\n                    componentLoader,\n                },\n                auth: {\n                    authenticate,\n                    cookieName: process.env.SESSION_COOKIE_NAME,\n                    cookiePassword: process.env.SESSION_SECRET,\n                },\n                sessionOptions: {\n                    resave: false,\n                    saveUninitialized: true,\n                    secret: process.env.SESSION_SECRET,\n                    cookie: {\n                        httpOnly: process.env.NODE_ENV === 'production',\n                        secure: false,\n                    },\n                    name: process.env.SESSION_COOKIE_NAME,\n                },\n            };\n        },\n    });\n}\n";
 //# sourceMappingURL=admin.template.d.ts.map

package/dist/config/admin/templates/admin.template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.template.d.ts","sourceRoot":"","sources":["../../../../src/config/admin/templates/admin.template.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,gwJA+H7B,CAAC"}
+{"version":3,"file":"admin.template.d.ts","sourceRoot":"","sources":["../../../../src/config/admin/templates/admin.template.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,+vJA+H7B,CAAC"}

package/dist/config/admin/templates/admin.template.js

@@ -66,7 +66,7 @@ export async function createAdminJsModule(): Promise<DynamicModule> {
         inject: [PrismaService],
         useFactory: async (prisma: PrismaService) => {
             const authenticate = async (email: string, password: string) => {
-                const user = await prisma.user.findUnique({
+                const user = await prisma.user.findFirst({
                     where: {
                         email
                     }

package/dist/graphql/generic.resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generic.resolver.d.ts","sourceRoot":"","sources":["../../src/graphql/generic.resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAC,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAGvD,wBAAgB,sBAAsB,CAAC,SAAS,EAC5C,WAAW,EACX,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,EAEf,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAC3B,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,EAClC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,EAClC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,EAChC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAC5C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EACxC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,EAC1C,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAC9C,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAC5C,mBAAmB,EAAE,IAAI,CAAC,eAAe,CAAC,EAC1C,cAAc,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAC;iBAIF,aAAa;yBAAb,aAAa;sBAWnC,gBAAgB,QACZ,kBAAkB,GACjC,OAAO,CAAC,SAAS,EAAE,CAAC;uBAcR,gBAAgB,QACb,kBAAkB,GACjC,OAAO,CAAC,SAAS,CAAC;wBAcP,gBAAgB,QACZ,kBAAkB,GACjC,OAAO,CAAC,SAAS,CAAC;wBAcP,iBAAiB,QACb,kBAAkB,GACjC,OAAO,CAAC,mBAAmB,CAAC;;EA0ItC"}
+{"version":3,"file":"generic.resolver.d.ts","sourceRoot":"","sources":["../../src/graphql/generic.resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAC,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEvD,wBAAgB,sBAAsB,CAAC,SAAS,EAC5C,WAAW,EACX,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,EAEf,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAC3B,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,EAClC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,EAClC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,EAChC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAC5C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EACxC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,EAC1C,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAC9C,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAC5C,mBAAmB,EAAE,IAAI,CAAC,eAAe,CAAC,EAC1C,cAAc,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAC;iBAIF,aAAa;yBAAb,aAAa;sBAWnC,gBAAgB,QACZ,kBAAkB,GACjC,OAAO,CAAC,SAAS,EAAE,CAAC;uBAcR,gBAAgB,QACb,kBAAkB,GACjC,OAAO,CAAC,SAAS,CAAC;wBAcP,gBAAgB,QACZ,kBAAkB,GACjC,OAAO,CAAC,SAAS,CAAC;wBAcP,iBAAiB,QACb,kBAAkB,GACjC,OAAO,CAAC,mBAAmB,CAAC;;EA0ItC"}

package/dist/graphql/generic.resolver.js

@@ -37,7 +37,7 @@ function GenericResolverFactory(model, returnType, createInputType, updateInputT
         async findOne(where, info) {
             const select = new plugins_1.PrismaSelect(info).value;
             const modelDelegate = this.prisma.getModelDelegate(model);
-            return modelDelegate.findUnique({
+            return modelDelegate.findFirst({
                 where,
                 ...select,
             });

package/dist/modules/auth/auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,qBACa,WAAW;IAIhB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAC3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa;IACxC,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU;IACzC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IANnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;gBAGpB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa;IAK7C,QAAQ,CAAC,WAAW,EAAE,WAAW;;cAaE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC;;IAWzD,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,CAAC;IA8B1D,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlD,YAAY,CACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,GAAG,CAAC;IAuBT,cAAc,CAAC,GAAG,EAAE,OAAO;IAW3B,iBAAiB,CAAC,GAAG,EAAE,OAAO;IAW9B,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IA0BhD,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAMlC,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAOtC,kBAAkB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YAQtC,cAAc;IAkCtB,aAAa,CAAC,yBAAyB,EAAE,GAAG,GAAG,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAC,CAAC;IAuB3G,OAAO,CAAC,WAAW;IAUb,QAAQ,CAAC,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,CAAC;IAUnG,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUlE"}
+{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,qBACa,WAAW;IAIhB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAC3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa;IACxC,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU;IACzC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IANnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;gBAGpB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa;IAK7C,QAAQ,CAAC,WAAW,EAAE,WAAW;;cAgBE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC;;IAWzD,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,CAAC;IA8B1D,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlD,YAAY,CACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,GAAG,CAAC;IAuBT,cAAc,CAAC,GAAG,EAAE,OAAO;IAW3B,iBAAiB,CAAC,GAAG,EAAE,OAAO;IAW9B,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IA0BhD,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAMlC,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAOtC,kBAAkB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YAQtC,cAAc;IAkCtB,aAAa,CAAC,yBAAyB,EAAE,GAAG,GAAG,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAC,CAAC;IAuB3G,OAAO,CAAC,WAAW;IAUb,QAAQ,CAAC,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,CAAC;IAUnG,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUlE"}

package/dist/modules/auth/auth.service.js

@@ -59,7 +59,7 @@ let AuthService = class AuthService {
         this.sessionCookieName = this.configService.get('SESSION_COOKIE_NAME', 'defaultCookieName');
     }
     async register(registerDto) {
-        const existingUser = await this.userService.findByEmail(registerDto.email);
+        const existingUser = await this.prisma.user.findFirst({ where: { email: registerDto.email } }, { BYPASS_FILTERING: true });
         if (existingUser) {
             throw new common_1.HttpException('Email already in use', common_1.HttpStatus.CONFLICT);
         }
@@ -138,7 +138,7 @@ let AuthService = class AuthService {
         if (!req?.user?.id) {
             throw new common_1.UnauthorizedException('Please log-in');
         }
-        return this.prisma.user.findUnique({
+        return this.prisma.user.findFirst({
             where: {
                 id: req?.user?.id,
             },
@@ -186,7 +186,7 @@ let AuthService = class AuthService {
         });
     }
     async closeSpecificSession(sessionId) {
-        const deleted = await this.prisma.session.delete({
+        const deleted = await this.prisma.session.deleteMany({
             where: { id: sessionId },
         }).catch(() => null);
         return !!deleted;
@@ -232,7 +232,7 @@ let AuthService = class AuthService {
         const currentTokenId = userFromRefreshTokenGuard.refreshTokenId;
         const providedTokenString = userFromRefreshTokenGuard.currentRefreshToken;
         // Invalidate the used refresh token
-        await this.prisma.userRefreshToken.update({
+        await this.prisma.userRefreshToken.updateMany({
             where: { id: currentTokenId },
             data: { revokedAt: new Date() },
         }, 

package/dist/modules/auth/refresh-token.strategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refresh-token.strategy.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/refresh-token.strategy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,EAAa,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAChC,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;;;;AAEjD,qBACa,oBAAqB,SAAQ,yBAAyC;IAE3E,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAFX,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,WAAW;IAcvC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG;CA6B5C"}
+{"version":3,"file":"refresh-token.strategy.d.ts","sourceRoot":"","sources":["../../../src/modules/auth/refresh-token.strategy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,QAAQ,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAChC,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;;;;AAEjD,qBACa,oBAAqB,SAAQ,yBAAyC;IAE3E,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAFX,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,WAAW;IAcvC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG;CA6B5C"}

package/dist/modules/auth/refresh-token.strategy.js

@@ -39,7 +39,7 @@ let RefreshTokenStrategy = class RefreshTokenStrategy extends (0, passport_1.Pas
         if (!user) {
             throw new common_1.UnauthorizedException('User not found');
         }
-        const tokenRecord = await this.prisma.userRefreshToken.findUnique({
+        const tokenRecord = await this.prisma.userRefreshToken.findFirst({
             where: { token: refreshToken },
         });
         if (!tokenRecord) {

package/dist/modules/auth/session/session-serializer.js

@@ -26,7 +26,7 @@ let SessionSerializer = class SessionSerializer extends passport_1.PassportSeria
             return done(new Error('No userId provided'), null);
         }
         try {
-            const user = await this.prisma.user.findUniqueOrThrow({
+            const user = await this.prisma.user.findFirstOrThrow({
                 where: { id: Number(userId) },
                 select: {
                     id: true,

package/dist/modules/auth/session/session-store.js

@@ -9,12 +9,12 @@ class CorePrismaSessionStore extends express_session_1.Store {
         super();
         this.get = async (sid, callback) => {
             try {
-                const record = await this.prisma.session.findUnique({ where: { sid } }, { BYPASS_FILTERING: true });
+                const record = await this.prisma.session.findFirst({ where: { sid } }, { BYPASS_FILTERING: true });
                 if (!record) {
                     return callback(null, null);
                 }
                 if (record.expiresAt && record.expiresAt <= new Date()) {
-                    await this.prisma.session.delete({ where: { sid } }, { BYPASS_FILTERING: true });
+                    await this.prisma.session.deleteMany({ where: { sid } }, { BYPASS_FILTERING: true });
                     return callback(null, null);
                 }
                 const session = JSON.parse(record.data);
@@ -60,7 +60,7 @@ class CorePrismaSessionStore extends express_session_1.Store {
         };
         this.destroy = async (sid, callback) => {
             try {
-                await this.prisma.session.delete({ where: { sid } }, { BYPASS_FILTERING: true });
+                await this.prisma.session.deleteMany({ where: { sid } }, { BYPASS_FILTERING: true });
                 callback?.();
             }
             catch (err) {
@@ -82,7 +82,7 @@ class CorePrismaSessionStore extends express_session_1.Store {
                 else {
                     expiresAt = new Date(Date.now() + this.options.ttl * 1000);
                 }
-                await this.prisma.session.update({
+                await this.prisma.session.updateMany({
                     where: { sid },
                     data: { expiresAt },
                 }, { BYPASS_FILTERING: true });

package/dist/modules/core/core.service.js

@@ -36,7 +36,7 @@ let CoreService = class CoreService {
      * @returns A promise of the record
      */
     async findOne(where, options = {}) {
-        const record = this.modelDelegate.findUnique({
+        const record = this.modelDelegate.findFirst({
             where,
             ...options
         });
@@ -51,7 +51,7 @@ let CoreService = class CoreService {
      * @returns A promise of the record
      */
     async findById(id) {
-        const record = await this.modelDelegate.findUnique({
+        const record = await this.modelDelegate.findFirst({
             where: this._generateWhereFromIdField(id)
         });
         if (!record) {
@@ -80,10 +80,10 @@ let CoreService = class CoreService {
      */
     async updateById(id, data) {
         try {
-            return await this.modelDelegate.update({
+            return (await this.modelDelegate.updateMany({
                 where: this._generateWhereFromIdField(id),
                 data,
-            });
+            }))[0];
         }
         catch (error) {
             (0, error_handler_1.handleError)(error);
@@ -96,9 +96,9 @@ let CoreService = class CoreService {
      */
     async deleteById(id) {
         try {
-            return await this.modelDelegate.delete({
+            return (await this.modelDelegate.deleteMany({
                 where: this._generateWhereFromIdField(id)
-            });
+            }))[0];
         }
         catch (error) {
             (0, error_handler_1.handleError)(error);

package/dist/modules/user/user.service.js

@@ -32,7 +32,7 @@ let UserService = class UserService extends core_service_1.CoreService {
         });
     }
     async findByEmail(email) {
-        return this.prisma.user.findUnique({
+        return this.prisma.user.findFirst({
             where: { email },
             select: {
                 id: true,

package/dist/prisma/prisma.service.d.ts

@@ -7,11 +7,14 @@ export type CorePrismaOptions = {
     BYPASS_OMISSION?: boolean;
     BYPASS_FILTERING?: boolean;
 };
+export type CorePrismaModel<M extends ModelKey> = Exclude<RuntimeClient[M], 'findUnique' | 'findUniqueOrThrow' | 'delete' | 'update'>;
 export declare class PrismaService {
     private readonly permissionsConfig;
     private fieldConfigs;
     prismaClient: PrismaClient;
     constructor(prismaClient: PrismaClient, permissionsConfig: PermissionsConfigType);
+    debugQueries(enable: boolean): void;
+    private debug;
     $transaction<T>(fn: (prisma: Prisma.TransactionClient) => Promise<T>): any;
     proxyModels(): void;
     /**
@@ -19,10 +22,10 @@ export declare class PrismaService {
      * Used in the graphql generic resolver
      * @param model
      */
-    getModelDelegate<M extends ModelKey>(model: M): RuntimeClient[M];
+    getModelDelegate<M extends ModelKey>(model: M): CorePrismaModel<M>;
     get model(): RuntimeClient;
-    get user(): RuntimeClient['user'];
-    get session(): RuntimeClient['session'];
+    get user(): CorePrismaModel<'user'>;
+    get session(): CorePrismaModel<'session'>;
     get userRefreshToken(): any;
     /**
      * Parses the Prisma schema to extract model information and field configurations
@@ -53,7 +56,6 @@ export declare class PrismaService {
      * @throws ForbiddenException if no valid `where` conditions are present after applying permissions.
      */
     private applyWhereConditions;
-    getRelationType(parentModel: string, relatedField: string): any;
     /**
      * Builds dynamic conditions based on the type of clause (OR, AND, or field conditions).
      * Each condition is processed, and placeholders (like `$USER_ID`) are replaced with actual values.
@@ -92,16 +94,13 @@ export declare class PrismaService {
      * @returns A `select` object for Prisma queries.
      */
     private buildSelectFields;
-    /**
-     * Retrieves the related model's name for a given relation field.
-     * This is used to navigate relations between models when constructing the `select` object.
-     *
-     * @param parentModelName - The name of the parent model.
-     * @param relationKey - The key of the relation field.
-     * @returns The name of the related model.
-     * @throws Error if the relation field is not found in the parent model.
-     */
-    private getRelatedModelName;
+    getRelation(parentModel: string, relatedField: string, throwOnNotFound?: true): {
+        model: string;
+        relation: string;
+        foreignKey?: string;
+        referencingColumn?: string;
+    };
+    selectPermission(permissions: any, action: string, modelName: string, userRole: string): any;
 }
 export {};
 //# sourceMappingURL=prisma.service.d.ts.map

package/dist/prisma/prisma.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prisma.service.d.ts","sourceRoot":"","sources":["../../src/prisma/prisma.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAC,qBAAqB,EAAC,MAAM,yCAAyC,CAAC;AAE9E,OAAO,KAAK,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAGlE,KAAK,QAAQ,GAAG,MAAM,aAAa,CAAC;AAEpC,oDAAoD;AACpD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,qBACa,aAAa;IAMY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IALpE,OAAO,CAAC,YAAY,CAA2B;IAC/C,YAAY,EAAE,YAAY,CAAC;gBAGvB,YAAY,EAAE,YAAY,EACqB,iBAAiB,EAAE,qBAAqB;IAO3F,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC;IAIpE,WAAW;IAgDX;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,QAAQ,EAAE,KAAK,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;IAYhE,IAAI,KAAK,IAAI,aAAa,CAUzB;IAED,IAAI,IAAI,IAAI,aAAa,CAAC,MAAM,CAAC,CAEhC;IAED,IAAI,OAAO,IAAI,aAAa,CAAC,SAAS,CAAC,CAEtC;IAED,IAAI,gBAAgB,QAEnB;IAED;;;OAGG;IACH,WAAW;IAoDX;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAiC1B,IAAI,2BAA2B,QAM9B;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,oBAAoB;IAqG5B,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAYzD;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;;;OAOG;IACH,OAAO,CAAC,mBAAmB;IA2B3B;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAQvB;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAkDzB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CAgB9B"}
+{"version":3,"file":"prisma.service.d.ts","sourceRoot":"","sources":["../../src/prisma/prisma.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAC,qBAAqB,EAAC,MAAM,yCAAyC,CAAC;AAE9E,OAAO,KAAK,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAGlE,KAAK,QAAQ,GAAG,MAAM,aAAa,CAAC;AAEpC,oDAAoD;AACpD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAGF,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,YAAY,GAAG,mBAAmB,GAAG,QAAQ,GAAG,QAAQ,CAAC,CAAC;AAEtI,qBACa,aAAa;IAMY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IALpE,OAAO,CAAC,YAAY,CAA2B;IAC/C,YAAY,EAAE,YAAY,CAAC;gBAGvB,YAAY,EAAE,YAAY,EACqB,iBAAiB,EAAE,qBAAqB;IAO3F,YAAY,CAAC,MAAM,EAAE,OAAO;IAI5B,OAAO,CAAC,KAAK;IAQb,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC;IAIpE,WAAW;IAuDX;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,QAAQ,EAAE,KAAK,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAYlE,IAAI,KAAK,IAAI,aAAa,CAUzB;IAED,IAAI,IAAI,IAAI,eAAe,CAAC,MAAM,CAAC,CAElC;IAED,IAAI,OAAO,IAAI,eAAe,CAAC,SAAS,CAAC,CAExC;IAED,IAAI,gBAAgB,QAEnB;IAED;;;OAGG;IACH,WAAW;IAoDX;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAmC1B,IAAI,2BAA2B,QAM9B;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,oBAAoB;IAsH5B;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;;;OAOG;IACH,OAAO,CAAC,mBAAmB;IA2B3B;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAUvB;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAkDzB,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,IAAI,GAAG;QAC5E,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC9B;IAkBD,gBAAgB,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAgBzF"}

package/dist/prisma/prisma.service.js

@@ -24,6 +24,16 @@ let PrismaService = class PrismaService {
         this.parseSchema();
         this.proxyModels();
     }
+    debugQueries(enable) {
+        nestjs_request_context_1.RequestContext.currentContext.req.corePrismaDebug = enable;
+    }
+    debug(msg, type = 'log') {
+        if (nestjs_request_context_1.RequestContext.currentContext?.req.corePrismaDebug) {
+            // Default for log, yellow for warn, red for error, blue for info
+            const color = type === 'log' ? '' : type === 'warn' ? '\x1b[33m' : type === 'error' ? '\x1b[31m' : '\x1b[34m';
+            console.debug(color, `[APPX-CORE PRISMA] ${msg}`, '\x1b[0m');
+        }
+    }
     $transaction(fn) {
         return this.prismaClient.$transaction(fn);
     }
@@ -39,6 +49,7 @@ let PrismaService = class PrismaService {
                             const user = nestjs_request_context_1.RequestContext.currentContext?.req.user || {};
                             const userRole = user?.role || 'GUEST';
                             if (typeof model[methodKey] === 'function' && !methodKey.toString().startsWith('_') && !methodKey.toString().startsWith('$')) {
+                                this.debug(`Proxying ${String(propKey)}.${String(methodKey)}() for role ${userRole}`);
                                 const contextModel = nestjs_request_context_1.RequestContext.currentContext?.req.prisma?.[propKey] || model;
                                 return async (params = {}, options) => {
                                     // Blacklisted methods, should not be used to ensure permission filtering is applied
@@ -52,14 +63,22 @@ let PrismaService = class PrismaService {
                                         throw new Error(`The method ${methodKey.toString()} is not compatible with permission filtering and is not allowed. Please use ${blacklist[methodKey.toString()]}} instead.`);
                                     }
                                     // delete, deleteMany, update and updateMany methods should not apply field omission because they are not selecting fields
-                                    if (!options?.BYPASS_OMISSION && !['delete', 'deleteMany', 'update', 'updateMany', 'create', 'createMany'].includes(methodKey.toString()))
+                                    if (!options?.BYPASS_OMISSION && !['delete', 'deleteMany', 'update', 'updateMany', 'create', 'createMany'].includes(methodKey.toString())) {
                                         params = this.applyFieldOmission(String(propKey), userRole, params);
+                                    }
+                                    else {
+                                        this.debug(`Skipping field omission for ${String(propKey)}.${String(methodKey)}()`);
+                                    }
                                     if (!options?.BYPASS_FILTERING && !['create', 'createMany'].includes(methodKey.toString())) {
                                         params = this.applyWhereConditions(String(propKey), userRole, params, user, methodKey);
                                     }
+                                    else {
+                                        this.debug(`Skipping permission filtering for ${String(propKey)}.${String(methodKey)}()`);
+                                    }
                                     if (methodKey === 'count' && !!params.select) {
                                         delete params.select;
                                     }
+                                    this.debug(`Executing ${String(propKey)}.${String(methodKey)}() with params: ${JSON.stringify(params)}`);
                                     return contextModel[methodKey](params);
                                 };
                             }
@@ -163,6 +182,7 @@ let PrismaService = class PrismaService {
      * @returns The modified query arguments with omitted fields.
      */
     applyFieldOmission(modelName, userRole, args) {
+        this.debug(`Applying field omission for model ${modelName} and role ${userRole}`);
         const omitFields = this.getFieldsToOmit(modelName, userRole);
         if (!args) {
             args = {};
@@ -173,6 +193,7 @@ let PrismaService = class PrismaService {
             });
         }
         else if (args.include) {
+            this.debug(`Found included model '${modelName}', generating select fields`);
             args.select = this.buildSelectFields(modelName, omitFields, args.include, userRole);
             delete args.include;
         }
@@ -208,14 +229,28 @@ let PrismaService = class PrismaService {
         const permissionsConfig = this.normalizedPermissionsConfig;
         const normalizedName = modelName.toLowerCase().trim();
         const permissions = permissionsConfig[normalizedName]?.[userRole];
+        if (!permissions) {
+            throw new common_1.HttpException(`No permissions found for model '${modelName}' and role ${userRole}`, common_1.HttpStatus.FORBIDDEN);
+        }
+        let actionPermissions = this.selectPermission(permissions, action.toString(), modelName, userRole);
+        if (!actionPermissions) {
+            console.debug(`No permissions found for action '${modelName}.${String(action)}()' on role ${userRole}`);
+            throw new common_1.HttpException('Missing permissions on model ' + modelName, common_1.HttpStatus.FORBIDDEN);
+        }
         if (args.select) {
             for (const field of Object.keys(args.select)) {
-                let relation = this.getRelationType(modelName, field);
+                // If field is relation
+                let relation = this.getRelation(modelName, field);
                 if (!relation) {
                     continue;
                 }
                 if (relation.relation === 'belongsTo') {
-                    const relatedPermissions = permissionsConfig[relation.model.toLowerCase()]?.[userRole]?.[action];
+                    this.debug(`Found 1:1 / *:1 (belongsTo) relation to model '${relation.model}' from model '${modelName}' via field '${field}'. Filter will be applied to main conditions...`);
+                    const relatedPermissions = this.selectPermission(permissionsConfig[relation.model.toLowerCase()]?.[userRole] || {}, action.toString(), relation.model, userRole);
+                    if (!relatedPermissions) {
+                        console.debug(`No permissions found for action '${relation.model}.${String(action)}()' on role ${userRole}`);
+                        throw new common_1.HttpException('Missing permissions on model ' + relation.model, common_1.HttpStatus.FORBIDDEN);
+                    }
                     belongsToQueue.push({
                         field,
                         relation,
@@ -223,52 +258,48 @@ let PrismaService = class PrismaService {
                     });
                     continue;
                 }
-                if (permissionsConfig[relation.model.toLowerCase()]) {
-                    /* Where conditions are applied outside of the select. Example as per documentation:
-                    const result = await prisma.user.findFirst({
+                this.debug(`Found 1:N / N:N (hasMany) relation to model '${relation.model}' from model '${modelName}' via field '${field}'. Applying filter to the relation...`);
+                /* Where conditions are applied outside of the select. Example as per documentation:
+                const result = await prisma.user.findFirst({
+                  select: {
+                    posts: {
+                      where: {
+                        published: false,
+                      },
                       select: {
-                        posts: {
-                          where: {
-                            published: false,
-                          },
-                          select: {
-                            title: true,
-                          },
-                        },
+                        title: true,
                       },
-                    })
-                     */
-                    args.select[field].where = this.applyWhereConditions(relation.model, userRole, args.select[field], user, action).where;
-                    delete args.select[field].select.where;
-                }
-                else {
-                    throw new common_1.ForbiddenException(`No permissions found for model ${relation.model} and role ${userRole}`);
-                }
+                    },
+                  },
+                })
+                 */
+                args.select[field].where = this.applyWhereConditions(relation.model, userRole, args.select[field], user, action).where;
+                delete args.select[field].select.where;
             }
         }
-        if (!permissions) {
-            throw new common_1.HttpException(`No permissions found for model ${modelName} and role ${userRole}`, common_1.HttpStatus.FORBIDDEN);
-        }
-        const actionPermissions = permissions[action];
-        if (!actionPermissions) {
-            throw new common_1.HttpException(`No permissions found for action ${String(action)} on model ${modelName} and role ${userRole}`, common_1.HttpStatus.FORBIDDEN);
-        }
         if (actionPermissions === 'ALL' && belongsToQueue.length === 0 || action.toString().startsWith('create')) {
+            this.debug(`No conditions to apply for '${modelName}.${String(action)}()' on role ${userRole}`);
             return args;
         }
         const whereClause = this.buildConditions(actionPermissions.conditions, user);
+        this.debug(`Applying where conditions for '${modelName}.${String(action)}()' on role ${userRole}: ${JSON.stringify(whereClause)}`);
         if (!args.where) {
             args.where = whereClause;
         }
         else {
             args.where = { AND: [args.where, whereClause] };
         }
-        //TODO Test this in more scenarios, it may need to be more robust, it's a quick fix but I must make sure it wont be abused by adding a model with this type of relation to bypass something it shouldn't
+        // Failsafe: If there are no conditions at all and there were supposed to be, block access
         if (Object.keys(args.where).length === 0 && !belongsToQueue?.length) {
+            this.debug(`Found a weird edge case. Contact Manuel Olveira @ AppX.`);
             throw new common_1.ForbiddenException(`You are not authorized to access this record`);
         }
+        if (belongsToQueue?.length > 0) {
+            this.debug(`Merging belongsTo relation conditions into main ${modelName}.`, 'warn');
+        }
         for (const entry of belongsToQueue) {
             const { relatedPermissions, field } = entry;
+            this.debug(`Merging conditions for belongsTo relation field '${field}': ${JSON.stringify(relatedPermissions?.conditions)}`, 'info');
             args.where = {
                 ...args.where,
                 [field]: {
@@ -281,15 +312,6 @@ let PrismaService = class PrismaService {
         }
         return args;
     }
-    getRelationType(parentModel, relatedField) {
-        parentModel = parentModel.toLowerCase();
-        relatedField = relatedField.toLowerCase();
-        const parent = this.fieldConfigs[parentModel];
-        const relation = parent.relationFields[relatedField];
-        if (!relation)
-            return null;
-        return relation;
-    }
     /**
      * Builds dynamic conditions based on the type of clause (OR, AND, or field conditions).
      * Each condition is processed, and placeholders (like `$USER_ID`) are replaced with actual values.
@@ -349,9 +371,11 @@ let PrismaService = class PrismaService {
     getFieldsToOmit(modelName, role) {
         const modelInfo = this.fieldConfigs[modelName.toLowerCase()] || {};
         const fieldConfig = modelInfo.fieldConfig || {};
-        return Object.entries(fieldConfig)
+        const omitFields = Object.entries(fieldConfig)
             .filter(([_, roles]) => !roles.includes(role))
             .map(([field]) => field);
+        this.debug(`Fields to omit on '${modelName}', based on schema @Role() configuration: ${omitFields.join(', ')}`);
+        return omitFields;
     }
     /**
      * Builds the `select` object for Prisma queries, omitting fields based on the user's role.
@@ -383,7 +407,8 @@ let PrismaService = class PrismaService {
                 if (includedArgs === true) {
                     includedArgs = {};
                 }
-                const relatedModelName = this.getRelatedModelName(modelName, relationKey);
+                const relatedModelName = this.getRelation(modelName, relationKey, true).model;
+                this.debug(`Found relation to model '${relatedModelName}' from model '${modelName}' via field '${relationKey}'. Generating select fields...`);
                 const relatedModelOmitFields = this.getFieldsToOmit(relatedModelName, userRole);
                 const relatedSelectFields = this.buildSelectFields(relatedModelName, relatedModelOmitFields, includedArgs.include || null, userRole);
                 if (Object.keys(relatedSelectFields).length > 0) {
@@ -393,24 +418,28 @@ let PrismaService = class PrismaService {
         }
         return selectFields;
     }
-    /**
-     * Retrieves the related model's name for a given relation field.
-     * This is used to navigate relations between models when constructing the `select` object.
-     *
-     * @param parentModelName - The name of the parent model.
-     * @param relationKey - The key of the relation field.
-     * @returns The name of the related model.
-     * @throws Error if the relation field is not found in the parent model.
-     */
-    getRelatedModelName(parentModelName, relationKey) {
-        const modelInfo = this.fieldConfigs[parentModelName.toLowerCase()];
-        if (!modelInfo) {
-            throw new Error(`Model information not found for ${parentModelName}`);
-        }
-        if (modelInfo.relationFields[relationKey]) {
-            return modelInfo.relationFields[relationKey].model;
+    getRelation(parentModel, relatedField, throwOnNotFound = false) {
+        parentModel = parentModel.toLowerCase();
+        const parent = this.fieldConfigs[parentModel];
+        const relation = parent.relationFields[relatedField];
+        if (!relation && throwOnNotFound)
+            throw new Error(`Relation key ${relatedField} not found in model ${parentModel}`);
+        return relation;
+    }
+    selectPermission(permissions, action, modelName, userRole) {
+        let actionPermissions = permissions[action];
+        // If action is find* or count and there is no permission, coalesce to one of the find actions
+        if (!actionPermissions && (action.startsWith('find') || action === 'count')) {
+            if (permissions['findMany']) {
+                this.debug(`Using 'findMany' permissions for '${action}' action on model '${modelName}' and role ${userRole}`, 'info');
+                actionPermissions = permissions['findMany'];
+            }
+            else if (permissions['findFirst']) {
+                this.debug(`Using 'findFirst' permissions for '${action}' action on model '${modelName}' and role ${userRole}`, 'info');
+                actionPermissions = permissions['findFirst'];
+            }
         }
-        throw new Error(`Relation key ${relationKey} not found in model ${parentModelName}`);
+        return actionPermissions;
     }
 };
 exports.PrismaService = PrismaService;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@appxdigital/appx-core",
-    "version": "0.1.89",
+    "version": "0.1.91",
     "description": "Appx Core is a library that provides a set of tools to help you build your application faster.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",