@appxdigital/appx-core 0.1.68 → 0.1.70

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 '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.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";
 //# 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,mvJA+H7B,CAAC"}
+{"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"}

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

@@ -7,7 +7,7 @@ import {addBasicFilters, createActions, createPermissionHandler, dynamicImport,
 import {initializeComponents} from './component-loader';
 import {readFileSync} from 'fs';
 import {getDMMF} from '@prisma/sdk';
-import {PrismaService} from 'appx-core';
+import {PrismaService} from '@appxdigital/appx-core';
 import {PrismaModule} from "../prisma/prisma.module";
 
 const DEFAULT_ADMIN = {

package/dist/config/generate-controllers.js

@@ -47,7 +47,7 @@ const genericControllerTemplate = (model, folder) => `
 import { Controller } from '@nestjs/common';
 import { ${model}Service } from './${folder}.service';
 import { ${model} } from '@prisma/client';
-import { CoreController } from 'appx-core';
+import { CoreController } from '@appxdigital/appx-core';
 
 @Controller('${model.toLowerCase()}s')
 export class ${model}Controller extends CoreController<${model}> {

package/dist/config/generate-resolvers.js

@@ -44,7 +44,7 @@ const outputPath = path.join(process.cwd(), 'src/modules');
  * @param folder
  */
 const genericResolverTemplate = (model, folder) => `import { Resolver } from '@nestjs/graphql';
-import { GenericResolverFactory, PrismaService } from 'appx-core';
+import { GenericResolverFactory, PrismaService } from '@appxdigital/appx-core';
 import { ${model} } from '../../generated/${folder}/${folder}.model';
 import { ${model}CreateInput } from '../../generated/${folder}/${folder}-create.input';
 import { ${model}UpdateInput } from '../../generated/${folder}/${folder}-update.input';

package/dist/config/generate-services.js

@@ -43,7 +43,7 @@ const servicesOutputPath = path.join(process.cwd(), 'src/modules');
  * @param model
  */
 const genericServiceTemplate = (model) => `import { Injectable } from '@nestjs/common';
-import { CoreService, PrismaService } from 'appx-core';
+import { CoreService, PrismaService } from '@appxdigital/appx-core';
 import { ${model} } from '@prisma/client';
 
 @Injectable()

package/dist/config/setup-fileupload.js

@@ -242,7 +242,7 @@ async function main() {
     else {
         const { provider } = await configureProvider();
         const newEndpointConfig = await configureEndpoint();
-        const configContent = `import { FileUploadModuleOptions } from 'appx-core';
+        const configContent = `import { FileUploadModuleOptions } from '@appxdigital/appx-core';
 
 export const fileUploadConfig: FileUploadModuleOptions = {
     cloudProvider: '${provider}',

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,QAEP;IAED,IAAI,OAAO,QAEV;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;IAKpB;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAiC1B,IAAI,2BAA2B,QAM9B;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,oBAAoB;IAmG5B,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;;;;;;;IAoCzD;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;;;OAOG;IACH,OAAO,CAAC,mBAAmB;IAwB3B;;;;;;;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;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,QAEP;IAED,IAAI,OAAO,QAEV;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;IAKpB;;;;;;;;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;IAwB3B;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAQvB;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAkDzB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CAgB9B"}

package/dist/prisma/prisma.service.js

@@ -295,25 +295,27 @@ let PrismaService = class PrismaService {
         const permissionsConfig = this.normalizedPermissionsConfig;
         const normalizedName = modelName.toLowerCase().trim();
         const permissions = permissionsConfig[normalizedName]?.[userRole];
-        for (const model of Object.keys(args.select)) {
-            if (!this.fieldConfigs[model.toLowerCase()]) {
-                continue;
-            }
-            const relation = this.getRelationType(modelName, model);
-            if (relation.relation === 'belongsTo') {
-                const relatedPermissions = permissionsConfig[model.toLowerCase()]?.[userRole]?.[action];
-                belongsToQueue.push({
-                    modelName: model,
-                    relation,
-                    relatedPermissions,
-                });
-                continue;
-            }
-            if (permissionsConfig[model.toLowerCase()]) {
-                this.applyWhereConditions(model, userRole, args.select[model], user, action);
-            }
-            else {
-                throw new common_1.ForbiddenException(`No permissions found for model ${model} and role ${userRole}`);
+        if (args.select) {
+            for (const model of Object.keys(args.select)) {
+                if (!this.fieldConfigs[model.toLowerCase()]) {
+                    continue;
+                }
+                const relation = this.getRelationType(modelName, model);
+                if (relation.relation === 'belongsTo') {
+                    const relatedPermissions = permissionsConfig[model.toLowerCase()]?.[userRole]?.[action];
+                    belongsToQueue.push({
+                        modelName: model,
+                        relation,
+                        relatedPermissions,
+                    });
+                    continue;
+                }
+                if (permissionsConfig[model.toLowerCase()]) {
+                    this.applyWhereConditions(model, userRole, args.select[model], user, action);
+                }
+                else {
+                    throw new common_1.ForbiddenException(`No permissions found for model ${model} and role ${userRole}`);
+                }
             }
         }
         if (!permissions) {

package/package.json

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