@friggframework/core 2.0.0--canary.690.08cd07e.0 → 2.0.0--canary.694.f66a64a.0

package/modules/use-cases/get-module-instance-from-type.js

@@ -23,7 +23,7 @@ class GetModuleInstanceFromType {
         if (!moduleDefinition) {
             throw new Error(`Module definition not found for type: ${type}`);
         }
-        return Module.create({
+        return new Module({
             userId,
             definition: moduleDefinition,
             state: options.state,

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

@@ -1,12 +1,9 @@
 const { Module } = require('../module');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class GetModule {
-    constructor({ moduleRepository, moduleDefinitions, scopePolicy }) {
+    constructor({ moduleRepository, moduleDefinitions }) {
         this.moduleRepository = moduleRepository;
         this.moduleDefinitions = moduleDefinitions;
-        // Who may load an entity follows its scope (ADR-056 §3.6).
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
     }
 
     /**
@@ -35,7 +32,7 @@ class GetModule {
         // If User object provided, use ownsUserId to check linked users
         // Otherwise fall back to simple equality check
         const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-            ? this.scopePolicy.canUseEntity(userIdOrUser, entity)
+            ? userIdOrUser.ownsUserId(entity.userId)
             : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
@@ -56,11 +53,8 @@ class GetModule {
             );
         }
 
-        // Built for the entity's OWNER, not the caller: a caller may use an
-        // organization's entity, and a token refresh during this call must
-        // update the owner's credential, not create one under the caller.
-        const module = await Module.create({
-            userId: entity.userId ?? userId,
+        const module = new Module({
+            userId,
             entity,
             definition: moduleDefinition,
         });

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

@@ -1,16 +1,5 @@
 const { Module } = require('../module');
 const { ModuleConstants } = require('../ModuleConstants');
-const { pickExistingEntity } = require('../scope-resolution');
-
-/**
- * What an entity belongs to when the caller says nothing: the person's own,
- * outside any organization.
- */
-const DEFAULT_TENANCY = Object.freeze({
-    scope: 'individual',
-    organizationId: null,
-    legacyOrgId: null,
-});
 const { getLogger } = require('../../logs');
 
 const log = getLogger('frigg.modules.authorization_callback');
@@ -41,17 +30,7 @@ class ProcessAuthorizationCallback {
         this.integrationRepository = integrationRepository;
     }
 
-    /**
-     * @param {string} userId - the OWNER of what this creates (ADR-056 §3.2): the
-     *   person for `individual`, the organization's user for `organization`.
-     *   Not necessarily the caller; callers resolve it from the scope.
-     * @param {string} entityType
-     * @param {Object} params - what the module's authorization needs
-     * @param {{scope: string, organizationId: (string|null), legacyOrgId: (string|null)}} [tenancy]
-     *   the entity's scope and organization (§3.6); default: the person's own,
-     *   with no organization
-     */
-    async execute(userId, entityType, params, tenancy = DEFAULT_TENANCY) {
+    async execute(userId, entityType, params) {
         log.debug('Authorization callback started', {
             eventName: `${log.name}.started`,
             userId,
@@ -78,7 +57,10 @@ class ProcessAuthorizationCallback {
                 userId,
                 entityType
             );
-        const existingEntity = pickExistingEntity(existingEntities, tenancy);
+        const existingEntity =
+            existingEntities && existingEntities.length > 0
+                ? existingEntities[0]
+                : null;
 
         if (existingEntity) {
             log.debug('Existing entity found', {
@@ -88,7 +70,7 @@ class ProcessAuthorizationCallback {
             });
         }
 
-        const module = await Module.create({
+        const module = new Module({
             userId,
             entity: existingEntity,
             definition: moduleDefinition,
@@ -174,8 +156,7 @@ class ProcessAuthorizationCallback {
         const persistedEntity = await this.findOrCreateEntity(
             entityDetails,
             entityType,
-            module.credential.id,
-            tenancy
+            module.credential.id
         );
         log.debug('Authorization callback completed', {
             eventName: `${log.name}.completed`,
@@ -252,12 +233,7 @@ class ProcessAuthorizationCallback {
         module.credential = persisted;
     }
 
-    async findOrCreateEntity(
-        entityDetails,
-        moduleName,
-        credentialId,
-        tenancy = DEFAULT_TENANCY
-    ) {
+    async findOrCreateEntity(entityDetails, moduleName, credentialId) {
         const { identifiers, details } = entityDetails;
 
         // Support both 'user' and 'userId' field names from module definitions
@@ -271,16 +247,11 @@ class ProcessAuthorizationCallback {
             );
         }
 
-        // The same provider account in two organizations is two entities
-        // (ADR-056 §3.6), so the match is per organization.
-        const existingEntity = pickExistingEntity(
-            await this.moduleRepository.findEntities({
-                externalId: identifiers.externalId,
-                user: userId,
-                moduleName: moduleName,
-            }),
-            tenancy
-        );
+        const existingEntity = await this.moduleRepository.findEntity({
+            externalId: identifiers.externalId,
+            user: userId,
+            moduleName: moduleName,
+        });
 
         if (existingEntity) {
             // Repoint the entity's credentialId when re-auth produced a
@@ -311,17 +282,12 @@ class ProcessAuthorizationCallback {
             return existingEntity;
         }
 
-        // `organizationId` is not part of the entity data: that carries provider
-        // fields, and one that happens to be called organizationId is theirs.
-        return await this.moduleRepository.createEntity(
-            {
-                ...identifiers,
-                ...details,
-                moduleName: moduleName,
-                credential: credentialId,
-            },
-            { organizationId: tenancy.organizationId ?? null }
-        );
+        return await this.moduleRepository.createEntity({
+            ...identifiers,
+            ...details,
+            moduleName: moduleName,
+            credential: credentialId,
+        });
     }
 }
 

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

@@ -1,5 +1,4 @@
 const { Module } = require('../module');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class RefreshEntityOptions {
     /**
@@ -7,11 +6,9 @@ class RefreshEntityOptions {
      * @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository
      * @param {} params.moduleDefinitions
      */
-    constructor({ moduleRepository, moduleDefinitions, scopePolicy }) {
+    constructor({ moduleRepository, moduleDefinitions }) {
         this.moduleRepository = moduleRepository;
         this.moduleDefinitions = moduleDefinitions;
-        // Who may load an entity follows its scope (ADR-056 §3.6).
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
     }
 
     /**
@@ -39,7 +36,7 @@ class RefreshEntityOptions {
 
         // Validate entity ownership
         const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-            ? this.scopePolicy.canUseEntity(userIdOrUser, entity)
+            ? userIdOrUser.ownsUserId(entity.userId)
             : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
@@ -61,11 +58,8 @@ class RefreshEntityOptions {
             );
         }
 
-        // Built for the entity's OWNER, not the caller: a caller may use an
-        // organization's entity, and a token refresh during this call must
-        // update the owner's credential, not create one under the caller.
-        const module = await Module.create({
-            userId: entity.userId ?? userId,
+        const module = new Module({
+            userId,
             entity,
             definition: moduleDefinition,
         });

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

@@ -1,5 +1,4 @@
 const { Module } = require('../module');
-const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class TestModuleAuth {
     /**
@@ -7,11 +6,9 @@ class TestModuleAuth {
      * @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository - Repository for module data operations.
      * @param {Array<Object>} params.moduleDefinitions - Array of module definitions.
      */
-    constructor({ moduleRepository, moduleDefinitions, scopePolicy }) {
+    constructor({ moduleRepository, moduleDefinitions }) {
         this.moduleRepository = moduleRepository;
         this.moduleDefinitions = moduleDefinitions;
-        // Who may load an entity follows its scope (ADR-056 §3.6).
-        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
     }
 
     /**
@@ -38,7 +35,7 @@ class TestModuleAuth {
 
         // Validate entity ownership
         const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-            ? this.scopePolicy.canUseEntity(userIdOrUser, entity)
+            ? userIdOrUser.ownsUserId(entity.userId)
             : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
@@ -60,11 +57,8 @@ class TestModuleAuth {
             );
         }
 
-        // Built for the entity's OWNER, not the caller: a caller may use an
-        // organization's entity, and a token refresh during this call must
-        // update the owner's credential, not create one under the caller.
-        const module = await Module.create({
-            userId: entity.userId ?? userId,
+        const module = new Module({
+            userId,
             entity,
             definition: moduleDefinition,
         });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.690.08cd07e.0",
+    "version": "2.0.0--canary.694.f66a64a.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -28,7 +28,6 @@
         "express-async-handler": "^1.2.0",
         "form-data": "^4.0.6",
         "fs-extra": "^11.2.0",
-        "jose": "^5.10.0",
         "lodash": "4.18.1",
         "lodash.get": "^4.4.2",
         "node-fetch": "^2.6.7",
@@ -48,9 +47,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.690.08cd07e.0",
-        "@friggframework/prettier-config": "2.0.0--canary.690.08cd07e.0",
-        "@friggframework/test": "2.0.0--canary.690.08cd07e.0",
+        "@friggframework/eslint-config": "2.0.0--canary.694.f66a64a.0",
+        "@friggframework/prettier-config": "2.0.0--canary.694.f66a64a.0",
+        "@friggframework/test": "2.0.0--canary.694.f66a64a.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -68,6 +67,7 @@
     "scripts": {
         "lint:fix": "prettier --write --loglevel error . && eslint . --fix",
         "test": "jest --passWithNoTests # TODO",
+        "validate:definitions": "node integrations/data-defined/scripts/validate.js",
         "prisma:generate:mongo": "npx prisma generate --schema ./prisma-mongodb/schema.prisma",
         "prisma:generate:postgres": "npx prisma generate --schema ./prisma-postgresql/schema.prisma",
         "prisma:generate": "npm run prisma:generate:mongo && npm run prisma:generate:postgres",
@@ -90,5 +90,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "08cd07ef5720ad7a0d5141a442613d56d82e3730"
+    "gitHead": "f66a64af4882d4da330f78e13bf570c4e22f6640"
 }

package/prisma-mongodb/schema.prisma

@@ -56,14 +56,6 @@ model User {
   integrations Integration[]
   processes    Process[]
 
-  // Organization memberships (ADR-056 §3.6). `organizationId` above is the legacy
-  // single-org pointer: set on a person's first link, never moved afterwards, and
-  // read as an implicit membership when no row exists for it.
-  // As an individual: the organizations this person belongs to.
-  memberships OrganizationMembership[] @relation("IndividualMemberships")
-  // As an organization: the people who belong to it.
-  orgMembers OrganizationMembership[] @relation("OrganizationMemberships")
-
   @@unique([username, appUserId])
   @@index([type])
   @@index([appUserId])
@@ -134,14 +126,6 @@ model Entity {
   moduleName   String?
   externalId   String?
 
-  // Organization this entity was connected in (ADR-056 §3.6): the active
-  // organization for `individual`, the owner for `organization`, null for
-  // `global`. Null on an `individual` entity is also what every row written
-  // before this column existed has, and what `individualAcross: 'all'` writes.
-  // Deliberately not a relation: a deleted organization must leave its rows
-  // invisible, not turn them into "unscoped" ones (SetNull would do that).
-  organizationId String? @db.ObjectId
-
   data Json @default("{}")
 
   createdAt DateTime @default(now())
@@ -158,7 +142,6 @@ model Entity {
   associationObjects AssociationObject[]
 
   @@index([userId])
-  @@index([userId, organizationId])
   @@index([externalId])
   @@index([moduleName])
   @@index([credentialId])
@@ -176,11 +159,6 @@ model Integration {
   user   User?             @relation(fields: [userId], references: [id], onDelete: Cascade)
   status IntegrationStatus @default(IN_CREATION)
 
-  // Organization this integration was created in (ADR-056 §3.6): the active
-  // organization at create time. Null for rows that predate the column. Not a
-  // relation, for the same reason as Entity.organizationId.
-  organizationId String? @db.ObjectId
-
   // Configuration and version
   config  Json? // Integration configuration object
   version String?
@@ -203,9 +181,9 @@ model Integration {
   syncs        Sync[]
   mappings     IntegrationMapping[]
   processes    Process[]
+  workflowRuns WorkflowRun[]
 
   @@index([userId])
-  @@index([userId, organizationId])
   @@index([status])
   @@map("Integration")
 }
@@ -477,71 +455,57 @@ model UsageCounter {
   @@map("UsageCounter")
 }
 
-// ============================================================================
-// MANAGEMENT API MODELS
-// ============================================================================
-
-/// Multi-step authorization state for Management API v2 (/api/v2/authorize,
-/// /api/v2/credentials/:id/reauthorize). Short-lived: expired documents are
-/// removed opportunistically. stepData is encrypted at rest.
-model AuthorizationSession {
-  id           String   @id @default(auto()) @map("_id") @db.ObjectId
-  sessionId    String   @unique
-  userId       String
-  entityType   String
-  credentialId 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")
+// Data-defined integrations (ADR-063): one immutable row per published definition version.
+enum DefinitionStatus {
+  DRAFT
+  PUBLISHED
+  DEPRECATED
+  RETIRED
 }
 
-// ============================================================================
-// ORGANIZATION MEMBERSHIP (ADR-056 §3.6)
-// ============================================================================
-
-/// One person's membership of one organization. Unique on the pair, so adding a
-/// membership is an idempotent upsert. `orgRole` is the organization role the
-/// adopter token carried when the membership was created (MEMBER when it named none). NoAction on delete
-/// because MongoDB gives no referential integrity: delete a user's memberships
-/// before the user.
-model OrganizationMembership {
-  id                 String   @id @default(auto()) @map("_id") @db.ObjectId
-  individualUserId   String   @db.ObjectId
-  organizationUserId String   @db.ObjectId
-  orgRole            String   @default("MEMBER")
-  createdAt          DateTime @default(now())
-
-  individualUser   User @relation("IndividualMemberships", fields: [individualUserId], references: [id], onDelete: NoAction, onUpdate: NoAction)
-  organizationUser User @relation("OrganizationMemberships", fields: [organizationUserId], references: [id], onDelete: NoAction, onUpdate: NoAction)
-
-  @@unique([individualUserId, organizationUserId])
-  @@index([organizationUserId])
-  @@map("OrganizationMembership")
+model IntegrationDefinitionVersion {
+  id              String           @id @default(auto()) @map("_id") @db.ObjectId
+  definitionId    String
+  version         String
+  schemaVersion   String
+  status          DefinitionStatus @default(DRAFT)
+  checksum        String
+  document        Json
+  changeLevel     String?
+  previousVersion String?
+  notes           String?
+  createdBy       String?
+  publishedAt     DateTime?
+  createdAt       DateTime         @default(now())
+  updatedAt       DateTime         @updatedAt
+
+  @@unique([definitionId, version])
+  @@index([definitionId, status])
+  @@map("IntegrationDefinitionVersion")
 }
 
-/// One-time scheduled jobs for poll-and-dispatch scheduling pattern.
-/// Used by providers without native one-time scheduling APIs (e.g., Netlify).
-/// A cron function queries for due jobs and dispatches them to a queue.
-model ScheduledJob {
-  id              String   @id @default(auto()) @map("_id") @db.ObjectId
-  scheduleName    String   @unique
-  scheduledAt     DateTime
-  queueResourceId String
-  payload         Json?
-  state           String   @default("PENDING")
-
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  @@index([state, scheduledAt])
-  @@map("ScheduledJob")
+// One row per data-defined workflow run. trace holds step ids, statuses, timings and error messages, never request or
+// response bodies.
+model WorkflowRun {
+  id                String      @id @default(auto()) @map("_id") @db.ObjectId
+  integrationId     String      @db.ObjectId
+  integration       Integration @relation(fields: [integrationId], references: [id], onDelete: Cascade)
+  definitionId      String
+  definitionVersion String
+  workflowId        String
+  triggerType       String
+  eventId           String?
+  status            String
+  reason            String?
+  error             String?
+  retryable         Boolean     @default(false)
+  trace             Json        @default("[]")
+  startedAt         DateTime
+  endedAt           DateTime?
+  createdAt         DateTime    @default(now())
+
+  @@index([integrationId, startedAt])
+  @@index([integrationId, workflowId, startedAt])
+  @@index([integrationId, status])
+  @@map("WorkflowRun")
 }

package/prisma-postgresql/migrations/20261018000000_add_data_defined_integrations/migration.sql

@@ -0,0 +1,66 @@
+-- Data-defined integrations (ADR-063): published definition versions and workflow runs.
+--
+-- Additive and non-destructive: one enum type and two tables. No existing table or row is touched; WorkflowRun
+-- references Integration with ON DELETE CASCADE, so deleting an installation removes its run history.
+
+-- CreateEnum
+CREATE TYPE "DefinitionStatus" AS ENUM ('DRAFT', 'PUBLISHED', 'DEPRECATED', 'RETIRED');
+
+-- CreateTable
+CREATE TABLE "IntegrationDefinitionVersion" (
+    "id" SERIAL NOT NULL,
+    "definitionId" TEXT NOT NULL,
+    "version" TEXT NOT NULL,
+    "schemaVersion" TEXT NOT NULL,
+    "status" "DefinitionStatus" NOT NULL DEFAULT 'DRAFT',
+    "checksum" TEXT NOT NULL,
+    "document" JSONB NOT NULL,
+    "changeLevel" TEXT,
+    "previousVersion" TEXT,
+    "notes" TEXT,
+    "createdBy" TEXT,
+    "publishedAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "IntegrationDefinitionVersion_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "WorkflowRun" (
+    "id" SERIAL NOT NULL,
+    "integrationId" INTEGER NOT NULL,
+    "definitionId" TEXT NOT NULL,
+    "definitionVersion" TEXT NOT NULL,
+    "workflowId" TEXT NOT NULL,
+    "triggerType" TEXT NOT NULL,
+    "eventId" TEXT,
+    "status" TEXT NOT NULL,
+    "reason" TEXT,
+    "error" TEXT,
+    "retryable" BOOLEAN NOT NULL DEFAULT false,
+    "trace" JSONB NOT NULL DEFAULT '[]',
+    "startedAt" TIMESTAMP(3) NOT NULL,
+    "endedAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "WorkflowRun_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "IntegrationDefinitionVersion_definitionId_version_key" ON "IntegrationDefinitionVersion"("definitionId", "version");
+
+-- CreateIndex
+CREATE INDEX "IntegrationDefinitionVersion_definitionId_status_idx" ON "IntegrationDefinitionVersion"("definitionId", "status");
+
+-- CreateIndex
+CREATE INDEX "WorkflowRun_integrationId_startedAt_idx" ON "WorkflowRun"("integrationId", "startedAt");
+
+-- CreateIndex
+CREATE INDEX "WorkflowRun_integrationId_workflowId_startedAt_idx" ON "WorkflowRun"("integrationId", "workflowId", "startedAt");
+
+-- CreateIndex
+CREATE INDEX "WorkflowRun_integrationId_status_idx" ON "WorkflowRun"("integrationId", "status");
+
+-- AddForeignKey
+ALTER TABLE "WorkflowRun" ADD CONSTRAINT "WorkflowRun_integrationId_fkey" FOREIGN KEY ("integrationId") REFERENCES "Integration"("id") ON DELETE CASCADE ON UPDATE CASCADE;