@friggframework/core 2.0.0--canary.522.cbd3d5a.0 → 2.0.0--canary.517.35ee143.0

package/modules/test/mock-api/definition.js

@@ -1,7 +1,7 @@
 require('dotenv').config();
 const { Api } = require('./api');
 const { get } = require('../../../assertions');
-const config = { name: 'anapi' };
+const config = { name: 'anapi' }
 
 const Definition = {
     API: Api,
@@ -9,9 +9,7 @@ const Definition = {
         url: 'http://localhost:3000/redirect/anapi',
         type: 'oauth2',
     }),
-    getName: function () {
-        return config.name;
-    },
+    getName: function () { return config.name },
     moduleName: config.name,
     modelName: 'AnApi',
     requiredAuthMethods: {
@@ -19,31 +17,28 @@ const Definition = {
             const code = get(params.data, 'code');
             return api.getTokenFromCode(code);
         },
-        getEntityDetails: async function (
-            api,
-            callbackParams,
-            tokenResponse,
-            userId
-        ) {
+        getEntityDetails: async function (api, callbackParams, tokenResponse, userId) {
             const userDetails = await api.getUserDetails();
             return {
                 identifiers: { externalId: userDetails.portalId, user: userId },
                 details: { name: userDetails.hub_domain },
-            };
+            }
         },
         apiPropertiesToPersist: {
-            credential: ['access_token', 'refresh_token'],
+            credential: [
+                'access_token', 'refresh_token'
+            ],
             entity: [],
         },
         getCredentialDetails: async function (api, userId) {
             const userDetails = await api.getUserDetails();
             return {
                 identifiers: { externalId: userDetails.portalId, user: userId },
-                details: {},
+                details: {}
             };
         },
         testAuthRequest: async function (api) {
-            return api.getUserDetails();
+            return api.getUserDetails()
         },
     },
     env: {
@@ -51,7 +46,7 @@ const Definition = {
         client_secret: 'test',
         scope: 'test',
         redirect_uri: `http://localhost:3000/redirect/anapi`,
-    },
+    }
 };
 
 module.exports = { Definition };

package/modules/test/mock-api/mocks/hubspot.js

@@ -1,43 +1,43 @@
 const authorizeResponse = {
-    base: '/redirect/hubspot',
-    data: {
-        code: 'test-code',
-        state: 'null',
-    },
-};
+    "base": "/redirect/hubspot",
+    "data": {
+        "code": "test-code",
+        "state": "null"
+    }
+}
 
 const tokenResponse = {
-    token_type: 'bearer',
-    refresh_token: 'test-refresh-token',
-    access_token: 'test-access-token',
-    expires_in: 1800,
-};
+    "token_type": "bearer",
+    "refresh_token": "test-refresh-token",
+    "access_token": "test-access-token",
+    "expires_in": 1800
+}
 
 const userDetailsResponse = {
-    portalId: 111111111,
-    timeZone: 'US/Eastern',
-    accountType: 'DEVELOPER_TEST',
-    currency: 'USD',
-    utcOffset: '-05:00',
-    utcOffsetMilliseconds: -18000000,
-    token: 'test-token',
-    user: 'projectteam@lefthook.co',
-    hub_domain: 'Testing Object Things-dev-44613847.com',
-    scopes: [
-        'content',
-        'oauth',
-        'crm.objects.contacts.read',
-        'crm.objects.contacts.write',
-        'crm.objects.companies.write',
-        'crm.objects.companies.read',
-        'crm.objects.deals.read',
-        'crm.schemas.deals.read',
+    "portalId": 111111111,
+    "timeZone": "US/Eastern",
+    "accountType": "DEVELOPER_TEST",
+    "currency": "USD",
+    "utcOffset": "-05:00",
+    "utcOffsetMilliseconds": -18000000,
+    "token": "test-token",
+    "user": "projectteam@lefthook.co",
+    "hub_domain": "Testing Object Things-dev-44613847.com",
+    "scopes": [
+        "content",
+        "oauth",
+        "crm.objects.contacts.read",
+        "crm.objects.contacts.write",
+        "crm.objects.companies.write",
+        "crm.objects.companies.read",
+        "crm.objects.deals.read",
+        "crm.schemas.deals.read"
     ],
-    hub_id: 111111111,
-    app_id: 22222222,
-    expires_in: 1704,
-    user_id: 33333333,
-    token_type: 'access',
-};
+    "hub_id": 111111111,
+    "app_id": 22222222,
+    "expires_in": 1704,
+    "user_id": 33333333,
+    "token_type": "access"
+}
 
-module.exports = { authorizeResponse, tokenResponse, userDetailsResponse };
+module.exports = { authorizeResponse, tokenResponse, userDetailsResponse }

package/modules/tests/doubles/test-module-factory.js

@@ -1,16 +1,10 @@
 class TestModuleFactory {
-    constructor() {
-        this.moduleRepository = {
-            findEntity: jest.fn().mockResolvedValue(null),
-            findEntitiesBy: jest.fn().mockResolvedValue([]),
-        };
-    }
+    constructor() { }
 
     async getModuleInstance(entityId, userId) {
+        // return minimal stub module with getName and api property
         return {
-            getName() {
-                return 'stubModule';
-            },
+            getName() { return 'stubModule'; },
             api: {},
             entityId,
             userId,
@@ -19,4 +13,4 @@ class TestModuleFactory {
     }
 }
 
-module.exports = { TestModuleFactory };
+module.exports = { TestModuleFactory }; 

package/modules/tests/doubles/test-module-repository.js

@@ -36,4 +36,4 @@ class TestModuleRepository {
     }
 }
 
-module.exports = { TestModuleRepository };
+module.exports = { TestModuleRepository }; 

package/modules/use-cases/get-entities-for-user.js

@@ -29,4 +29,4 @@ class GetEntitiesForUser {
     }
 }
 
-module.exports = { GetEntitiesForUser };
+module.exports = { GetEntitiesForUser }; 

package/modules/use-cases/get-entity-options-by-id.js

@@ -20,10 +20,9 @@ class GetEntityOptionsById {
      */
     async execute(entityId, userIdOrUser) {
         // Support both userId (backward compatible) and User object (new pattern)
-        const userId =
-            typeof userIdOrUser === 'object' && userIdOrUser?.getId
-                ? userIdOrUser.getId()
-                : userIdOrUser;
+        const userId = typeof userIdOrUser === 'object' && userIdOrUser?.getId
+            ? userIdOrUser.getId()
+            : userIdOrUser;
 
         const entity = await this.moduleRepository.findEntityById(
             entityId,
@@ -35,10 +34,9 @@ class GetEntityOptionsById {
         }
 
         // Validate entity ownership
-        const isOwned =
-            typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-                ? userIdOrUser.ownsUserId(entity.userId)
-                : entity.userId?.toString() === userId?.toString();
+        const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
+            ? userIdOrUser.ownsUserId(entity.userId)
+            : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
             throw new Error(

package/modules/use-cases/get-module.js

@@ -15,10 +15,9 @@ class GetModule {
      */
     async execute(entityId, userIdOrUser) {
         // Support both userId (backward compatible) and User object (new pattern)
-        const userId =
-            typeof userIdOrUser === 'object' && userIdOrUser?.getId
-                ? userIdOrUser.getId()
-                : userIdOrUser;
+        const userId = typeof userIdOrUser === 'object' && userIdOrUser?.getId
+            ? userIdOrUser.getId()
+            : userIdOrUser;
 
         const entity = await this.moduleRepository.findEntityById(
             entityId,
@@ -32,10 +31,9 @@ class GetModule {
         // Validate entity ownership
         // If User object provided, use ownsUserId to check linked users
         // Otherwise fall back to simple equality check
-        const isOwned =
-            typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-                ? userIdOrUser.ownsUserId(entity.userId)
-                : entity.userId?.toString() === userId?.toString();
+        const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
+            ? userIdOrUser.ownsUserId(entity.userId)
+            : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
             throw new Error(
@@ -45,8 +43,7 @@ class GetModule {
 
         const entityType = entity.moduleName;
         const moduleDefinition = this.moduleDefinitions.find((def) => {
-            const modelName =
-                Module.getEntityModelFromDefinition(def).modelName;
+            const modelName = Module.getEntityModelFromDefinition(def).modelName;
             return entityType === modelName;
         });
 
@@ -70,8 +67,8 @@ class GetModule {
             credential: module.credential,
             externalId: module.entity.externalId,
             userId: module.entity.user.toString(),
-        };
+        }
     }
 }
 
-module.exports = { GetModule };
+module.exports = { GetModule };

package/modules/use-cases/process-authorization-callback.js

@@ -14,7 +14,7 @@ class ProcessAuthorizationCallback {
         this.moduleDefinitions = moduleDefinitions;
     }
 
-    async execute(userId, entityType, params, isGlobal = false) {
+    async execute(userId, entityType, params) {
         const moduleDefinition = this.moduleDefinitions.find((def) => {
             return entityType === def.moduleName;
         });
@@ -70,8 +70,7 @@ class ProcessAuthorizationCallback {
         const persistedEntity = await this.findOrCreateEntity(
             entityDetails,
             entityType,
-            module.credential.id,
-            isGlobal
+            module.credential.id
         );
 
         return {
@@ -94,22 +93,18 @@ class ProcessAuthorizationCallback {
         );
         credentialDetails.details.authIsValid = true;
 
-        const persisted = await this.credentialRepository.upsertCredential(
-            credentialDetails
-        );
+        const persisted = await this.credentialRepository.upsertCredential(credentialDetails);
         module.credential = persisted;
     }
 
-    async findOrCreateEntity(entityDetails, moduleName, credentialId, isGlobal = false) {
+    async findOrCreateEntity(entityDetails, moduleName, credentialId) {
         const { identifiers, details } = entityDetails;
 
         // Support both 'user' and 'userId' field names from module definitions
         // Some modules use 'user' (legacy), others use 'userId' (newer pattern)
         const userId = identifiers.user || identifiers.userId;
 
-        // For global entities, userId is not required (it will be null)
-        // For user-specific entities, userId must be provided for security
-        if (!isGlobal && !userId) {
+        if (!userId) {
             throw new Error(
                 `Module definition for ${moduleName} must return 'user' or 'userId' in identifiers from getEntityDetails(). ` +
                     `Without userId, entity lookup would match across all users (security issue).`
@@ -118,7 +113,7 @@ class ProcessAuthorizationCallback {
 
         const existingEntity = await this.moduleRepository.findEntity({
             externalId: identifiers.externalId,
-            user: isGlobal ? null : userId,
+            user: userId,
             moduleName: moduleName,
         });
 
@@ -131,7 +126,6 @@ class ProcessAuthorizationCallback {
             ...details,
             moduleName: moduleName,
             credential: credentialId,
-            isGlobal,
         });
     }
 }

package/modules/use-cases/refresh-entity-options.js

@@ -21,10 +21,9 @@ class RefreshEntityOptions {
      */
     async execute(entityId, userIdOrUser, options) {
         // Support both userId (backward compatible) and User object (new pattern)
-        const userId =
-            typeof userIdOrUser === 'object' && userIdOrUser?.getId
-                ? userIdOrUser.getId()
-                : userIdOrUser;
+        const userId = typeof userIdOrUser === 'object' && userIdOrUser?.getId
+            ? userIdOrUser.getId()
+            : userIdOrUser;
 
         const entity = await this.moduleRepository.findEntityById(
             entityId,
@@ -36,10 +35,9 @@ class RefreshEntityOptions {
         }
 
         // Validate entity ownership
-        const isOwned =
-            typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-                ? userIdOrUser.ownsUserId(entity.userId)
-                : entity.userId?.toString() === userId?.toString();
+        const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
+            ? userIdOrUser.ownsUserId(entity.userId)
+            : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
             throw new Error(

package/modules/use-cases/test-module-auth.js

@@ -20,10 +20,9 @@ class TestModuleAuth {
      */
     async execute(entityId, userIdOrUser) {
         // Support both userId (backward compatible) and User object (new pattern)
-        const userId =
-            typeof userIdOrUser === 'object' && userIdOrUser?.getId
-                ? userIdOrUser.getId()
-                : userIdOrUser;
+        const userId = typeof userIdOrUser === 'object' && userIdOrUser?.getId
+            ? userIdOrUser.getId()
+            : userIdOrUser;
 
         const entity = await this.moduleRepository.findEntityById(
             entityId,
@@ -35,10 +34,9 @@ class TestModuleAuth {
         }
 
         // Validate entity ownership
-        const isOwned =
-            typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-                ? userIdOrUser.ownsUserId(entity.userId)
-                : entity.userId?.toString() === userId?.toString();
+        const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
+            ? userIdOrUser.ownsUserId(entity.userId)
+            : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
             throw new Error(

package/modules/utils/map-module-dto.js

@@ -11,8 +11,8 @@ function mapModuleClassToModuleDTO(moduleInstance) {
         userId: moduleInstance.userId,
         entity: moduleInstance.entity,
         credentialId: moduleInstance.credential?._id?.toString(),
-        type: moduleInstance.getName(),
+        type: moduleInstance.getName()
     };
 }
 
-module.exports = { mapModuleClassToModuleDTO };
+module.exports = { mapModuleClassToModuleDTO }; 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.522.cbd3d5a.0",
+    "version": "2.0.0--canary.517.35ee143.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -18,7 +18,6 @@
         "express-async-handler": "^1.2.0",
         "form-data": "^4.0.0",
         "fs-extra": "^11.2.0",
-        "js-yaml": "^4.1.0",
         "lodash": "4.17.21",
         "lodash.get": "^4.4.2",
         "mongoose": "6.11.6",
@@ -39,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.522.cbd3d5a.0",
-        "@friggframework/prettier-config": "2.0.0--canary.522.cbd3d5a.0",
-        "@friggframework/test": "2.0.0--canary.522.cbd3d5a.0",
+        "@friggframework/eslint-config": "2.0.0--canary.517.35ee143.0",
+        "@friggframework/prettier-config": "2.0.0--canary.517.35ee143.0",
+        "@friggframework/test": "2.0.0--canary.517.35ee143.0",
         "@prisma/client": "^6.17.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -54,7 +53,6 @@
         "prettier": "^2.7.1",
         "prisma": "^6.17.0",
         "sinon": "^16.1.1",
-        "supertest": "^7.1.4",
         "typescript": "^5.0.2"
     },
     "scripts": {
@@ -82,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "cbd3d5a81315519842f308fc0bd786a3f8786b79"
+    "gitHead": "35ee143ec0654d0935aee59bf62b882f5f27d8b7"
 }

package/prisma-mongodb/schema.prisma

@@ -80,26 +80,6 @@ model Token {
   @@map("Token")
 }
 
-/// Multi-step authorization session tracking
-/// Supports OTP flows and multi-stage authentication (e.g., Nagaris)
-model AuthorizationSession {
-  id          String   @id @default(auto()) @map("_id") @db.ObjectId
-  sessionId   String   @unique
-  userId      String
-  entityType  String
-  currentStep Int      @default(1)
-  maxSteps    Int
-  stepData    Json     @default("{}")
-  expiresAt   DateTime
-  completed   Boolean  @default(false)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-
-  @@index([userId, entityType])
-  @@index([expiresAt])
-  @@map("AuthorizationSession")
-}
-
 // ============================================================================
 // CREDENTIAL & ENTITY MODELS
 // ============================================================================
@@ -138,7 +118,6 @@ model Entity {
   name         String?
   moduleName   String?
   externalId   String?
-  isGlobal     Boolean     @default(false)
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -157,8 +136,6 @@ model Entity {
   @@index([externalId])
   @@index([moduleName])
   @@index([credentialId])
-  @@index([isGlobal])
-  @@index([isGlobal, moduleName])
   @@map("Entity")
 }
 
@@ -383,70 +360,51 @@ model WebsocketConnection {
 }
 
 // ============================================================================
-// ADMIN SCRIPT RUNNER MODELS
+// ADMIN PROCESS MODELS
 // ============================================================================
 
-enum ScriptExecutionStatus {
+/// Admin process state machine
+enum AdminProcessState {
   PENDING
   RUNNING
   COMPLETED
   FAILED
-  TIMEOUT
-  CANCELLED
 }
 
-enum ScriptTrigger {
+/// Admin trigger types
+enum AdminTrigger {
   MANUAL
   SCHEDULED
   QUEUE
   WEBHOOK
 }
 
-/// Admin API keys for script execution authentication
-/// Key hashes stored with bcrypt
-model AdminApiKey {
-  id         String    @id @default(auto()) @map("_id") @db.ObjectId
-  keyHash    String    @unique // bcrypt hashed
-  keyLast4   String // Last 4 chars for display
-  name       String // Human-readable name
-  scopes     String[] // ['scripts:execute', 'scripts:read']
-  expiresAt  DateTime?
-  createdBy  String? // User/admin who created
-  lastUsedAt DateTime?
-  isActive   Boolean   @default(true)
-  createdAt  DateTime  @default(now())
-  updatedAt  DateTime  @updatedAt
-
-  @@index([isActive])
-  @@map("AdminApiKey")
-}
+/// Admin process tracking (like Process but without user/integration FK)
+/// Used for: admin scripts, db migrations, system maintenance tasks
+model AdminProcess {
+  id   String @id @default(auto()) @map("_id") @db.ObjectId
+  name String // e.g., "oauth-token-refresh", "db-migration-xyz"
+  type String // e.g., "ADMIN_SCRIPT", "DB_MIGRATION"
 
-/// Script execution tracking and audit log
-model ScriptExecution {
-  id                String                @id @default(auto()) @map("_id") @db.ObjectId
-  scriptName        String
-  scriptVersion     String?
-  status            ScriptExecutionStatus @default(PENDING)
-  trigger           ScriptTrigger
-  mode              String                @default("async") // "sync" | "async"
-  input             Json?
-  output            Json?
-  logs              Json[] // [{level, message, data, timestamp}]
-  metricsStartTime  DateTime?
-  metricsEndTime    DateTime?
-  metricsDurationMs Int?
-  errorName         String?
-  errorMessage      String?
-  errorStack        String?
-  auditApiKeyName   String?
-  auditApiKeyLast4  String?
-  auditIpAddress    String?
-  createdAt         DateTime              @default(now())
-  updatedAt         DateTime              @updatedAt
-
-  @@index([scriptName, createdAt(sort: Desc)])
-  @@index([status])
-  @@map("ScriptExecution")
+  // State machine
+  state AdminProcessState @default(PENDING)
+
+  // Flexible storage (mirrors Process model pattern)
+  context Json @default("{}") // input, trigger, audit info, script version
+  results Json @default("{}") // output, logs, metrics, errors
+
+  // Hierarchy support
+  childProcesses  String[] @db.ObjectId
+  parentProcessId String?  @db.ObjectId
+
+  // Timestamps
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([name, createdAt(sort: Desc)])
+  @@index([state])
+  @@index([type])
+  @@map("AdminProcess")
 }
 
 /// Script scheduling configuration for hybrid scheduling (SQS + EventBridge)
@@ -459,9 +417,9 @@ model ScriptSchedule {
   lastTriggeredAt DateTime?
   nextTriggerAt   DateTime?
 
-  // AWS EventBridge Schedule (if provisioned)
-  awsScheduleArn  String?
-  awsScheduleName String?
+  // External Scheduler (e.g., AWS EventBridge Scheduler)
+  externalScheduleId   String?
+  externalScheduleName String?
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt