@friggframework/core 2.0.0-next.54 → 2.0.0-next.55

package/integrations/repositories/process-repository-documentdb.js

@@ -8,17 +8,23 @@ const {
     updateOne,
     deleteOne,
 } = require('../../database/documentdb-utils');
-const { ProcessRepositoryInterface } = require('./process-repository-interface');
+const {
+    ProcessRepositoryInterface,
+} = require('./process-repository-interface');
+const {
+    DocumentDBEncryptionService,
+} = require('../../database/documentdb-encryption-service');
 
 class ProcessRepositoryDocumentDB extends ProcessRepositoryInterface {
     constructor() {
         super();
         this.prisma = prisma;
+        this.encryptionService = new DocumentDBEncryptionService();
     }
 
     async create(processData) {
         const now = new Date();
-        const document = {
+        const plainDocument = {
             userId: toObjectId(processData.userId),
             integrationId: toObjectId(processData.integrationId),
             name: processData.name,
@@ -26,45 +32,127 @@ class ProcessRepositoryDocumentDB extends ProcessRepositoryInterface {
             state: processData.state || 'INITIALIZING',
             context: processData.context || {},
             results: processData.results || {},
-            childProcesses: (processData.childProcesses || []).map((id) => toObjectId(id)).filter(Boolean),
-            parentProcessId: processData.parentProcessId ? toObjectId(processData.parentProcessId) : null,
+            childProcesses: (processData.childProcesses || [])
+                .map((id) => toObjectId(id))
+                .filter(Boolean),
+            parentProcessId: processData.parentProcessId
+                ? toObjectId(processData.parentProcessId)
+                : null,
             createdAt: now,
             updatedAt: now,
         };
-        const insertedId = await insertOne(this.prisma, 'Process', document);
-        const created = await findOne(this.prisma, 'Process', { _id: insertedId });
-        return this._mapProcess(created);
+
+        const encryptedDocument = await this.encryptionService.encryptFields(
+            'Process',
+            plainDocument
+        );
+
+        const insertedId = await insertOne(
+            this.prisma,
+            'Process',
+            encryptedDocument
+        );
+
+        const created = await findOne(this.prisma, 'Process', {
+            _id: insertedId,
+        });
+        if (!created) {
+            console.error(
+                '[ProcessRepositoryDocumentDB] Process not found after insert',
+                {
+                    insertedId: fromObjectId(insertedId),
+                    processData: {
+                        userId: processData.userId,
+                        integrationId: processData.integrationId,
+                        name: processData.name,
+                        type: processData.type,
+                    },
+                }
+            );
+            throw new Error(
+                'Failed to create process: Document not found after insert. ' +
+                    'This indicates a database consistency issue.'
+            );
+        }
+        const decryptedProcess = await this.encryptionService.decryptFields(
+            'Process',
+            created
+        );
+        return this._mapProcess(decryptedProcess);
     }
 
     async findById(processId) {
         const objectId = toObjectId(processId);
         if (!objectId) return null;
         const doc = await findOne(this.prisma, 'Process', { _id: objectId });
-        return doc ? this._mapProcess(doc) : null;
+        if (!doc) return null;
+
+        const decryptedProcess = await this.encryptionService.decryptFields(
+            'Process',
+            doc
+        );
+        return this._mapProcess(decryptedProcess);
     }
 
     async update(processId, updates) {
         const objectId = toObjectId(processId);
         if (!objectId) return null;
+
+        const existing = await findOne(this.prisma, 'Process', {
+            _id: objectId,
+        });
+        if (!existing) return null;
+
         const updatePayload = {};
         if (updates.state !== undefined) updatePayload.state = updates.state;
-        if (updates.context !== undefined) updatePayload.context = updates.context;
-        if (updates.results !== undefined) updatePayload.results = updates.results;
+        if (updates.context !== undefined)
+            updatePayload.context = updates.context;
+        if (updates.results !== undefined)
+            updatePayload.results = updates.results;
         if (updates.childProcesses !== undefined) {
-            updatePayload.childProcesses = (updates.childProcesses || []).map((id) => toObjectId(id)).filter(Boolean);
+            updatePayload.childProcesses = (updates.childProcesses || [])
+                .map((id) => toObjectId(id))
+                .filter(Boolean);
         }
         if (updates.parentProcessId !== undefined) {
-            updatePayload.parentProcessId = updates.parentProcessId ? toObjectId(updates.parentProcessId) : null;
+            updatePayload.parentProcessId = updates.parentProcessId
+                ? toObjectId(updates.parentProcessId)
+                : null;
         }
         updatePayload.updatedAt = new Date();
+
+        const encryptedUpdate = await this.encryptionService.encryptFields(
+            'Process',
+            updatePayload
+        );
+
         await updateOne(
             this.prisma,
             'Process',
             { _id: objectId },
-            { $set: updatePayload }
+            { $set: encryptedUpdate }
+        );
+
+        const updated = await findOne(this.prisma, 'Process', {
+            _id: objectId,
+        });
+        if (!updated) {
+            console.error(
+                '[ProcessRepositoryDocumentDB] Process not found after update',
+                {
+                    processId: fromObjectId(objectId),
+                }
+            );
+            throw new Error(
+                'Failed to update process: Document not found after update. ' +
+                    'This indicates a database consistency issue.'
+            );
+        }
+        const decryptedProcess = await this.encryptionService.decryptFields(
+            'Process',
+            updated
         );
-        const updated = await findOne(this.prisma, 'Process', { _id: objectId });
-        return updated ? this._mapProcess(updated) : null;
+        return this._mapProcess(decryptedProcess);
     }
 
     async findByIntegrationAndType(integrationId, type) {
@@ -76,30 +164,36 @@ class ProcessRepositoryDocumentDB extends ProcessRepositoryInterface {
         const docs = await findMany(this.prisma, 'Process', filter, {
             sort: { createdAt: -1 },
         });
-        return docs.map((doc) => this._mapProcess(doc));
+
+        const decryptedDocs = await Promise.all(
+            docs.map((doc) =>
+                this.encryptionService.decryptFields('Process', doc)
+            )
+        );
+
+        return decryptedDocs.map((doc) => this._mapProcess(doc));
     }
 
-    async findActiveProcesses(integrationId, excludeStates = ['COMPLETED', 'ERROR']) {
+    async findActiveProcesses(
+        integrationId,
+        excludeStates = ['COMPLETED', 'ERROR']
+    ) {
         const integrationObjectId = toObjectId(integrationId);
-        const pipeline = [
-            {
-                $match: {
-                    integrationId: integrationObjectId,
-                },
-            },
-            {
-                $match: {
-                    state: { $nin: excludeStates },
-                },
-            },
-            { $sort: { createdAt: -1 } },
-        ];
-        const docs = await this.prisma.$runCommandRaw({
-            aggregate: 'Process',
-            pipeline,
-            cursor: {},
-        }).then((res) => res?.cursor?.firstBatch || []);
-        return docs.map((doc) => this._mapProcess(doc));
+        const filter = {
+            integrationId: integrationObjectId,
+            state: { $nin: excludeStates },
+        };
+        const docs = await findMany(this.prisma, 'Process', filter, {
+            sort: { createdAt: -1 },
+        });
+
+        const decryptedDocs = await Promise.all(
+            docs.map((doc) =>
+                this.encryptionService.decryptFields('Process', doc)
+            )
+        );
+
+        return decryptedDocs.map((doc) => this._mapProcess(doc));
     }
 
     async findByName(name) {
@@ -109,7 +203,13 @@ class ProcessRepositoryDocumentDB extends ProcessRepositoryInterface {
             { name },
             { sort: { createdAt: -1 } }
         );
-        return doc ? this._mapProcess(doc) : null;
+        if (!doc) return null;
+
+        const decryptedProcess = await this.encryptionService.decryptFields(
+            'Process',
+            doc
+        );
+        return this._mapProcess(decryptedProcess);
     }
 
     async deleteById(processId) {
@@ -128,8 +228,12 @@ class ProcessRepositoryDocumentDB extends ProcessRepositoryInterface {
             state: doc?.state ?? null,
             context: doc?.context ?? {},
             results: doc?.results ?? {},
-            childProcesses: (doc?.childProcesses || []).map((id) => fromObjectId(id)),
-            parentProcessId: doc?.parentProcessId ? fromObjectId(doc.parentProcessId) : null,
+            childProcesses: (doc?.childProcesses || []).map((id) =>
+                fromObjectId(id)
+            ),
+            parentProcessId: doc?.parentProcessId
+                ? fromObjectId(doc.parentProcessId)
+                : null,
             createdAt: doc?.createdAt ? new Date(doc.createdAt) : null,
             updatedAt: doc?.updatedAt ? new Date(doc.updatedAt) : null,
         };
@@ -137,5 +241,3 @@ class ProcessRepositoryDocumentDB extends ProcessRepositoryInterface {
 }
 
 module.exports = { ProcessRepositoryDocumentDB };
-
-

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0-next.54",
+    "version": "2.0.0-next.55",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -38,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0-next.54",
-        "@friggframework/prettier-config": "2.0.0-next.54",
-        "@friggframework/test": "2.0.0-next.54",
+        "@friggframework/eslint-config": "2.0.0-next.55",
+        "@friggframework/prettier-config": "2.0.0-next.55",
+        "@friggframework/test": "2.0.0-next.55",
         "@prisma/client": "^6.17.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d72f0af6966a5701fe2a4257139d40292972f92a"
+    "gitHead": "7f86d4b5faaab4de74e6e3676948b62d1e1a5bb1"
 }

package/token/repositories/token-repository-documentdb.js

@@ -10,6 +10,7 @@ const {
     deleteMany,
 } = require('../../database/documentdb-utils');
 const { TokenRepositoryInterface } = require('./token-repository-interface');
+const { ClientSafeError } = require('../../errors');
 
 const BCRYPT_ROUNDS = 10;
 
@@ -30,25 +31,36 @@ class TokenRepositoryDocumentDB extends TokenRepositoryInterface {
             created: now,
         };
         const insertedId = await insertOne(this.prisma, 'Token', document);
-        const created = await findOne(this.prisma, 'Token', { _id: insertedId });
+        const created = await findOne(this.prisma, 'Token', {
+            _id: insertedId,
+        });
         return this._mapToken(created);
     }
 
     async validateAndGetToken(tokenObj) {
         const objectId = toObjectId(tokenObj.id);
         if (!objectId) {
-            throw new Error('Invalid Token: Token does not exist');
+            throw new ClientSafeError(
+                'Invalid Token: Token does not exist',
+                401
+            );
         }
         const record = await findOne(this.prisma, 'Token', { _id: objectId });
         if (!record) {
-            throw new Error('Invalid Token: Token does not exist');
+            throw new ClientSafeError(
+                'Invalid Token: Token does not exist',
+                401
+            );
         }
         const isValid = await bcrypt.compare(tokenObj.token, record.token);
         if (!isValid) {
-            throw new Error('Invalid Token: Token does not match');
+            throw new ClientSafeError(
+                'Invalid Token: Token does not match',
+                401
+            );
         }
         if (record.expires && new Date(record.expires) < new Date()) {
-            throw new Error('Invalid Token: Token is expired');
+            throw new ClientSafeError('Invalid Token: Token is expired', 401);
         }
         return this._mapToken(record);
     }
@@ -86,7 +98,9 @@ class TokenRepositoryDocumentDB extends TokenRepositoryInterface {
     async deleteTokensByUserId(userId) {
         const objectId = toObjectId(userId);
         if (!objectId) return { acknowledged: true, deletedCount: 0 };
-        const result = await deleteMany(this.prisma, 'Token', { userId: objectId });
+        const result = await deleteMany(this.prisma, 'Token', {
+            userId: objectId,
+        });
         const deleted = result?.n ?? 0;
         return { acknowledged: true, deletedCount: deleted };
     }
@@ -121,5 +135,3 @@ class TokenRepositoryDocumentDB extends TokenRepositoryInterface {
 }
 
 module.exports = { TokenRepositoryDocumentDB };
-
-

package/token/repositories/token-repository-mongo.js

@@ -1,6 +1,7 @@
 const { prisma } = require('../../database/prisma');
 const bcrypt = require('bcryptjs');
 const { TokenRepositoryInterface } = require('./token-repository-interface');
+const { ClientSafeError } = require('../../errors');
 
 const BCRYPT_ROUNDS = 10;
 
@@ -58,7 +59,10 @@ class TokenRepositoryMongo extends TokenRepositoryInterface {
         });
 
         if (!sessionToken) {
-            throw new Error('Invalid Token: Token does not exist');
+            throw new ClientSafeError(
+                'Invalid Token: Token does not exist',
+                401
+            );
         }
 
         // Verify token hash matches
@@ -67,7 +71,10 @@ class TokenRepositoryMongo extends TokenRepositoryInterface {
             sessionToken.token
         );
         if (!isValid) {
-            throw new Error('Invalid Token: Token does not match');
+            throw new ClientSafeError(
+                'Invalid Token: Token does not match',
+                401
+            );
         }
 
         // Check if token is expired
@@ -75,7 +82,7 @@ class TokenRepositoryMongo extends TokenRepositoryInterface {
             sessionToken.expires &&
             new Date(sessionToken.expires) < new Date()
         ) {
-            throw new Error('Invalid Token: Token is expired');
+            throw new ClientSafeError('Invalid Token: Token is expired', 401);
         }
 
         return sessionToken;

package/token/repositories/token-repository-postgres.js

@@ -1,6 +1,7 @@
 const { prisma } = require('../../database/prisma');
 const bcrypt = require('bcryptjs');
 const { TokenRepositoryInterface } = require('./token-repository-interface');
+const { ClientSafeError } = require('../../errors');
 
 const BCRYPT_ROUNDS = 10;
 
@@ -92,7 +93,10 @@ class TokenRepositoryPostgres extends TokenRepositoryInterface {
         });
 
         if (!sessionToken) {
-            throw new Error('Invalid Token: Token does not exist');
+            throw new ClientSafeError(
+                'Invalid Token: Token does not exist',
+                401
+            );
         }
 
         // Verify token hash matches
@@ -101,7 +105,10 @@ class TokenRepositoryPostgres extends TokenRepositoryInterface {
             sessionToken.token
         );
         if (!isValid) {
-            throw new Error('Invalid Token: Token does not match');
+            throw new ClientSafeError(
+                'Invalid Token: Token does not match',
+                401
+            );
         }
 
         // Check if token is expired
@@ -109,7 +116,7 @@ class TokenRepositoryPostgres extends TokenRepositoryInterface {
             sessionToken.expires &&
             new Date(sessionToken.expires) < new Date()
         ) {
-            throw new Error('Invalid Token: Token is expired');
+            throw new ClientSafeError('Invalid Token: Token is expired', 401);
         }
 
         return this._convertTokenIds(sessionToken);