@appxdigital/appx-core 0.1.89 → 0.1.90

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.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.js

@@ -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.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/package.json

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