@friggframework/core 2.0.0--canary.499.832ff75.0 → 2.0.0--canary.499.e23a5e0.1

package/database/documentdb-encryption-service.js

@@ -1,5 +1,5 @@
 const { Cryptor } = require('../encrypt/Cryptor');
-const { getEncryptedFields } = require('./encryption/encryption-schema-registry');
+const { getEncryptedFields, loadCustomEncryptionSchema } = require('./encryption/encryption-schema-registry');
 
 /**
  * Encryption service specifically for DocumentDB repositories
@@ -43,12 +43,13 @@ class DocumentDBEncryptionService {
      * Encryption is bypassed in dev/test/local stages.
      * Production uses AWS KMS (if available) or AES encryption.
      *
-     * Note: Custom encryption schema is loaded eagerly at module initialization
-     * (see encryption-schema-registry.js), so it's already available here.
-     *
      * @private
      */
     _initializeCryptor() {
+        // Load custom encryption schema from app definition BEFORE checking configuration
+        // This ensures custom fields (like User.username) are registered before any encryption operations
+        loadCustomEncryptionSchema();
+
         // Match logic from packages/core/database/prisma.js
         const stage = process.env.STAGE || process.env.NODE_ENV || 'development';
         const bypassEncryption = ['dev', 'test', 'local'].includes(stage.toLowerCase());

package/database/encryption/encryption-schema-registry.js

@@ -116,8 +116,7 @@ function registerCustomSchema(schema) {
  * This ensures that custom encryption schemas defined in the backend's index.js
  * are registered before any repositories attempt to encrypt data.
  *
- * Called eagerly when this module is first imported to avoid race conditions.
- * Safe to call multiple times (registerCustomSchema checks for duplicates).
+ * Used by both Prisma (MongoDB/PostgreSQL) and DocumentDB encryption services.
  */
 function loadCustomEncryptionSchema() {
     try {
@@ -140,10 +139,10 @@ function loadCustomEncryptionSchema() {
             return; // No app definition found
         }
 
-        const customSchemaFromApp = appDefinition.encryption?.schema;
+        const customSchema = appDefinition.encryption?.schema;
 
-        if (customSchemaFromApp && Object.keys(customSchemaFromApp).length > 0) {
-            registerCustomSchema(customSchemaFromApp);
+        if (customSchema && Object.keys(customSchema).length > 0) {
+            registerCustomSchema(customSchema);
         }
     } catch (error) {
         // Silently ignore errors - custom schema is optional
@@ -176,11 +175,6 @@ function resetCustomSchema() {
     customSchema = {};
 }
 
-// Eagerly load custom encryption schema when module is first imported
-// This ensures the schema is available before any encryption operations occur,
-// preventing race conditions in concurrent execution environments (e.g., Lambda)
-loadCustomEncryptionSchema();
-
 module.exports = {
     CORE_ENCRYPTION_SCHEMA,
     getEncryptedFields,

package/database/prisma.js

@@ -1,6 +1,7 @@
 const {
     createEncryptionExtension,
 } = require('./encryption/prisma-encryption-extension');
+const { loadCustomEncryptionSchema } = require('./encryption/encryption-schema-registry');
 const { logger } = require('./encryption/logger');
 const { Cryptor } = require('../encrypt/Cryptor');
 const config = require('./config');
@@ -106,8 +107,8 @@ const prismaClientSingleton = () => {
 
     if (encryptionConfig.enabled) {
         try {
-            // Note: Custom encryption schema is loaded eagerly at module initialization
-            // (see encryption-schema-registry.js), so it's already available here
+            // Load custom encryption schema from appDefinition before creating extension
+            loadCustomEncryptionSchema();
 
             const cryptor = new Cryptor({
                 shouldUseAws: encryptionConfig.method === 'kms',

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.499.832ff75.0",
+    "version": "2.0.0--canary.499.e23a5e0.1",
     "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--canary.499.832ff75.0",
-        "@friggframework/prettier-config": "2.0.0--canary.499.832ff75.0",
-        "@friggframework/test": "2.0.0--canary.499.832ff75.0",
+        "@friggframework/eslint-config": "2.0.0--canary.499.e23a5e0.1",
+        "@friggframework/prettier-config": "2.0.0--canary.499.e23a5e0.1",
+        "@friggframework/test": "2.0.0--canary.499.e23a5e0.1",
         "@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": "832ff7541c2649e3d64212bd098f9f79cbb9bb95"
+    "gitHead": "e23a5e04522d8b828cbd41db65f9b00e80949119"
 }