@appxdigital/appx-core 0.1.78 → 0.1.80

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

@@ -69,6 +69,40 @@ export declare class PrismaService {
      * @throws ForbiddenException if no valid `where` conditions are present after applying permissions.
      */
     private applyWhereConditions;
+    /**
+     * Extracts the `where` conditions from a `select` object.
+     * Documentation specifies this structure, however depending on the relation it might not be possible.
+     const result = await prisma.user.findFirst({
+     select: {
+     posts: {
+     where: {
+     published: false,
+     },
+     select: {
+     title: true,
+     },
+     },
+     },
+     })
+
+     * Instead, do it this way:
+     const result = await prisma.user.findFirst({
+     where: {
+     posts: {
+     published: false,
+     },
+     },
+     select: {
+     posts: {
+     select: {
+     title: true,
+     },
+     },
+     },
+     })
+
+     */
+    private extractWhereFromSelect;
     getRelationType(parentModel: string, relatedField: string): {
         relation: null;
         identifier: null;

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;AAI9E,OAAO,KAAK,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAElE,KAAK,QAAQ,GAAG,MAAM,aAAa,CAAC;AAEpC,qBACa,aAAa;IAOY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANpE,OAAO,CAAC,YAAY,CAA2B;IAC/C,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,CAAC,UAAU,CAAc;gBAG5B,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;IA4CX;;;;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;IASX;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAU9B;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA4B/B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAsD9B,OAAO,CAAC,YAAY;IAMpB;;;;;;;;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;;;;;;;IAoCzD;;;;;;;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;AAI9E,OAAO,KAAK,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAElE,KAAK,QAAQ,GAAG,MAAM,aAAa,CAAC;AAEpC,qBACa,aAAa;IAOY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANpE,OAAO,CAAC,YAAY,CAA2B;IAC/C,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,CAAC,UAAU,CAAc;gBAG5B,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;IA8CX;;;;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;IASX;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAU9B;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA4B/B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAsD9B,OAAO,CAAC,YAAY;IAMpB;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAiC1B,IAAI,2BAA2B,QAM9B;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,oBAAoB;IAkG5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,OAAO,CAAC,sBAAsB;IAuB9B,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;;;;;;;IAoCzD;;;;;;;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;CAiB9B"}

package/dist/prisma/prisma.service.js

@@ -82,6 +82,8 @@ let PrismaService = class PrismaService {
                                         params = this.applyFieldOmission(String(propKey), userRole, params);
                                     if (!options?.BYPASS_FILTERING) {
                                         params = this.applyWhereConditions(String(propKey), userRole, params, user, methodKey);
+                                        // Extract where conditions from inside select
+                                        params = this.extractWhereFromSelect(params);
                                         // findUnique should be findFirst for where conditions to work properly
                                         if (methodKey === 'findUnique')
                                             methodKey = 'findFirst';
@@ -314,7 +316,22 @@ let PrismaService = class PrismaService {
                     continue;
                 }
                 if (permissionsConfig[model.toLowerCase()]) {
-                    this.applyWhereConditions(model, userRole, args.select[model], user, action);
+                    /* Where conditions are applied outside of the select. Example as per documentation:
+                    const result = await prisma.user.findFirst({
+                      select: {
+                        posts: {
+                          where: {
+                            published: false,
+                          },
+                          select: {
+                            title: true,
+                          },
+                        },
+                      },
+                    })
+                     */
+                    args.select[model].where = this.applyWhereConditions(model, userRole, args.select[model], user, action).where;
+                    delete args.select[model].select.where;
                 }
                 else {
                     throw new common_1.ForbiddenException(`No permissions found for model ${model} and role ${userRole}`);
@@ -330,9 +347,11 @@ let PrismaService = class PrismaService {
         }
         const whereClause = this.buildConditions(actionPermissions.conditions, user);
         if (!args.where) {
-            args.where = {};
+            args.where = whereClause;
+        }
+        else {
+            args.where = { AND: [args.where, whereClause] };
         }
-        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
         if (Object.keys(args.where).length === 0 && !belongsToQueue?.length) {
             throw new common_1.ForbiddenException(`You are not authorized to access this record`);
@@ -348,22 +367,57 @@ let PrismaService = class PrismaService {
                     ]
                 }
             };
-            //TODO This may no longer be of use, since we are defaulting to not returning the parent if it includes a model the user has no access to.
-            // if (relatedPermissions?.conditions) {
-            //     const relatedWhere = this.buildConditions(relatedPermissions.conditions, user);
-            //     const foreignKey = relation.identifier;
-            //     const foreignKeyValue = args.where?.[foreignKey];
-            //     const requiredValue = relatedWhere[foreignKey] || relatedWhere.id;
-            //
-            //
-            //     if (requiredValue !== undefined && foreignKeyValue !== requiredValue) {
-            // throw new common_1.ForbiddenException(
-            //     `Access denied: You are requesting ${modelName.toUpperCase()} with an associated ${relatedModel.toUpperCase()}, ` +
-            //     `but your permissions only allow access to ${relatedModel.toUpperCase()} where ${foreignKey} is ${requiredValue}. ` +
-            //     `The requested record has ${foreignKey} = ${foreignKeyValue}.`
-            // );
-            //     }
-            // }
+        }
+        return args;
+    }
+    /**
+     * Extracts the `where` conditions from a `select` object.
+     * Documentation specifies this structure, however depending on the relation it might not be possible.
+     const result = await prisma.user.findFirst({
+     select: {
+     posts: {
+     where: {
+     published: false,
+     },
+     select: {
+     title: true,
+     },
+     },
+     },
+     })
+
+     * Instead, do it this way:
+     const result = await prisma.user.findFirst({
+     where: {
+     posts: {
+     published: false,
+     },
+     },
+     select: {
+     posts: {
+     select: {
+     title: true,
+     },
+     },
+     },
+     })
+
+     */
+    extractWhereFromSelect(args) {
+        if (!args || !args.select) {
+            return args;
+        }
+        const whereConditions = {};
+        for (const key in args.select) {
+            if (args.select[key] && typeof args.select[key] === 'object') {
+                if (args.select[key].where) {
+                    whereConditions[key] = args.select[key].where;
+                    delete args.select[key].where;
+                }
+            }
+        }
+        if (Object.keys(whereConditions).length > 0) {
+            args.where = { ...args.where, ...whereConditions };
         }
         return args;
     }
@@ -507,7 +561,8 @@ let PrismaService = class PrismaService {
             throw new Error(`Model information not found for ${parentModelName}`);
         }
         if (modelInfo.relationFields.includes(relationKey)) {
-            return modelInfo.fieldTypes[relationKey].toLowerCase();
+            // Remove [] and ? from the field type to get the related model name TODO assumes that there are no other relation qualifiers
+            return modelInfo.fieldTypes[relationKey].toLowerCase().replace('[]', '').replace('?', '');
         }
         throw new Error(`Relation key ${relationKey} not found in model ${parentModelName}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@appxdigital/appx-core",
-    "version": "0.1.78",
+    "version": "0.1.80",
     "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",