@twin.org/rights-management-service 0.0.2-next.7 → 0.0.2-next.9

package/dist/cjs/index.cjs

@@ -4,13 +4,15 @@ var apiModels = require('@twin.org/api-models');
 var core = require('@twin.org/core');
 var standardsW3cOdrl = require('@twin.org/standards-w3c-odrl');
 var web = require('@twin.org/web');
+var rightsManagementModels = require('@twin.org/rights-management-models');
+var standardsW3cDid = require('@twin.org/standards-w3c-did');
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
  * The source used when communicating about these routes.
  */
-const ROUTES_SOURCE$3 = "policyAdministrationPointRoutes";
+const ROUTES_SOURCE$2 = "policyAdministrationPointRoutes";
 /**
  * The tag to associate with the routes.
  */
@@ -237,8 +239,8 @@ function generateRestRoutesPolicyAdministrationPoint(baseRouteName, componentNam
  * @returns The response object with additional http response properties.
  */
 async function papCreate(httpRequestContext, componentName, request) {
-    core.Guards.object(ROUTES_SOURCE$3, "request", request);
-    core.Guards.object(ROUTES_SOURCE$3, "request.body", request.body);
+    core.Guards.object(ROUTES_SOURCE$2, "request", request);
+    core.Guards.object(ROUTES_SOURCE$2, "request.body", request.body);
     const component = core.ComponentFactory.get(componentName);
     const policy = request.body;
     const uid = await component.create(policy);
@@ -257,10 +259,10 @@ async function papCreate(httpRequestContext, componentName, request) {
  * @returns The response object with additional http response properties.
  */
 async function papUpdate(httpRequestContext, componentName, request) {
-    core.Guards.object(ROUTES_SOURCE$3, "request", request);
-    core.Guards.object(ROUTES_SOURCE$3, "request.pathParams", request.pathParams);
-    core.Guards.stringValue(ROUTES_SOURCE$3, "request.pathParams.id", request.pathParams.id);
-    core.Guards.object(ROUTES_SOURCE$3, "request.body", request.body);
+    core.Guards.object(ROUTES_SOURCE$2, "request", request);
+    core.Guards.object(ROUTES_SOURCE$2, "request.pathParams", request.pathParams);
+    core.Guards.stringValue(ROUTES_SOURCE$2, "request.pathParams.id", request.pathParams.id);
+    core.Guards.object(ROUTES_SOURCE$2, "request.body", request.body);
     const component = core.ComponentFactory.get(componentName);
     await component.update(request.body);
     return {
@@ -275,9 +277,9 @@ async function papUpdate(httpRequestContext, componentName, request) {
  * @returns The response object with additional http response properties.
  */
 async function papGet(httpRequestContext, componentName, request) {
-    core.Guards.object(ROUTES_SOURCE$3, "request", request);
-    core.Guards.object(ROUTES_SOURCE$3, "request.pathParams", request.pathParams);
-    core.Guards.stringValue(ROUTES_SOURCE$3, "request.pathParams.id", request.pathParams.id);
+    core.Guards.object(ROUTES_SOURCE$2, "request", request);
+    core.Guards.object(ROUTES_SOURCE$2, "request.pathParams", request.pathParams);
+    core.Guards.stringValue(ROUTES_SOURCE$2, "request.pathParams.id", request.pathParams.id);
     const component = core.ComponentFactory.get(componentName);
     const policy = await component.get(request.pathParams.id);
     return {
@@ -292,9 +294,9 @@ async function papGet(httpRequestContext, componentName, request) {
  * @returns The response object with additional http response properties.
  */
 async function papRemove(httpRequestContext, componentName, request) {
-    core.Guards.object(ROUTES_SOURCE$3, "request", request);
-    core.Guards.object(ROUTES_SOURCE$3, "request.pathParams", request.pathParams);
-    core.Guards.stringValue(ROUTES_SOURCE$3, "request.pathParams.id", request.pathParams.id);
+    core.Guards.object(ROUTES_SOURCE$2, "request", request);
+    core.Guards.object(ROUTES_SOURCE$2, "request.pathParams", request.pathParams);
+    core.Guards.stringValue(ROUTES_SOURCE$2, "request.pathParams.id", request.pathParams.id);
     const component = core.ComponentFactory.get(componentName);
     await component.remove(request.pathParams.id);
     return {
@@ -309,7 +311,7 @@ async function papRemove(httpRequestContext, componentName, request) {
  * @returns The response object with additional http response properties.
  */
 async function papQuery(httpRequestContext, componentName, request) {
-    core.Guards.object(ROUTES_SOURCE$3, "request", request);
+    core.Guards.object(ROUTES_SOURCE$2, "request", request);
     const component = core.ComponentFactory.get(componentName);
     const result = await component.query(apiModels.HttpParameterHelper.objectFromString(request.query?.conditions), request.query?.cursor, core.Coerce.integer(request.query?.pageSize));
     return {
@@ -320,91 +322,6 @@ async function papQuery(httpRequestContext, componentName, request) {
     };
 }
 
-/**
- * The source used when communicating about these routes.
- */
-const ROUTES_SOURCE$2 = "policyEnforcementPointRoutes";
-/**
- * The tag to associate with the routes.
- */
-const pepTags = [
-    {
-        name: "Policy Enforcement Point",
-        description: "Endpoints for managing ODRL policies in the Policy Enforcement Point"
-    }
-];
-/**
- * The REST routes for the Policy Enforcement Point.
- * @param baseRouteName Prefix to prepend to the paths.
- * @param componentName The name of the component to use in the routes stored in the ComponentFactory.
- * @returns The generated routes.
- */
-function generateRestRoutesPolicyEnforcementPoint(baseRouteName, componentName) {
-    const pepInterceptRoute = {
-        operationId: "pepIntercept",
-        summary: "Intercept a request",
-        tag: pepTags[0].name,
-        method: "POST",
-        path: `${baseRouteName}/pep/intercept`,
-        handler: async (httpRequestContext, request) => pepIntercept(httpRequestContext, componentName, request),
-        requestType: {
-            type: "IPepInterceptRequest",
-            examples: [
-                {
-                    id: "pepInterceptRequestExample",
-                    request: {
-                        body: {
-                            assetType: "document",
-                            action: "view",
-                            data: {
-                                id: "document-1",
-                                param1: 1,
-                                param2: 2
-                            }
-                        }
-                    }
-                }
-            ]
-        },
-        responseType: [
-            {
-                type: "IPepInterceptResponse",
-                examples: [
-                    {
-                        id: "pepInterceptResponseExample",
-                        response: {
-                            body: {
-                                id: "document-1",
-                                param1: 1
-                            }
-                        }
-                    }
-                ]
-            }
-        ]
-    };
-    return [pepInterceptRoute];
-}
-/**
- * PEP: Intercept.
- * @param httpRequestContext The request context for the API.
- * @param componentName The name of the component to use in the routes.
- * @param request The request.
- * @returns The response object with additional http response properties.
- */
-async function pepIntercept(httpRequestContext, componentName, request) {
-    core.Guards.object(ROUTES_SOURCE$2, "request", request);
-    const component = core.ComponentFactory.get(componentName);
-    const result = await component.intercept(request.body.assetType, request.body.action, {
-        ...(request.body.context ?? {}),
-        userIdentity: httpRequestContext.userIdentity,
-        nodeIdentity: httpRequestContext.nodeIdentity
-    }, request.body.data);
-    return {
-        body: result
-    };
-}
-
 /**
  * The source used when communicating about these routes.
  */
@@ -456,7 +373,7 @@ function generateRestRoutesPolicyNegotiationAdminPoint(baseRouteName, componentN
                                 dateCreated: "2025-09-03T00:00:00.000Z",
                                 assetType: "document",
                                 action: "view",
-                                context: {}
+                                nodeIdentity: "urn:example:node:1"
                             }
                         }
                     }
@@ -484,7 +401,7 @@ function generateRestRoutesPolicyNegotiationAdminPoint(baseRouteName, componentN
                             dateCreated: "2025-09-03T00:00:00.000Z",
                             assetType: "document",
                             action: "view",
-                            context: {}
+                            nodeIdentity: "urn:example:node:1"
                         }
                     }
                 }
@@ -545,7 +462,7 @@ function generateRestRoutesPolicyNegotiationAdminPoint(baseRouteName, componentN
                                         dateCreated: "2025-09-03T00:00:00.000Z",
                                         assetType: "document",
                                         action: "view",
-                                        context: {}
+                                        nodeIdentity: "urn:example:node:1"
                                     }
                                 ],
                                 cursor: "next-cursor"
@@ -663,11 +580,11 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                     id: "pnpNegotiateRequestExample",
                     request: {
                         body: {
+                            "@context": [rightsManagementModels.RightsManagementContexts.ContextRoot, standardsW3cDid.DidContexts.ContextVCv2],
+                            type: rightsManagementModels.RightsManagementTypes.PolicyNegotiationRequest,
                             assetType: "document",
                             action: "view",
-                            context: {
-                                nodeIdentity: "urn:example:node:1"
-                            },
+                            nodeIdentity: "urn:example:node:1",
                             proof: {
                                 created: "2024-08-22T11:56:56.272Z",
                                 type: "DataIntegrityProof",
@@ -689,6 +606,8 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                         id: "IPnpNegotiateResponseExample",
                         response: {
                             body: {
+                                "@context": rightsManagementModels.RightsManagementContexts.ContextRoot,
+                                type: rightsManagementModels.RightsManagementTypes.PolicyState,
                                 id: "policy-1",
                                 status: "approved"
                             }
@@ -716,6 +635,8 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                             policyId: "policy-1"
                         },
                         body: {
+                            "@context": [rightsManagementModels.RightsManagementContexts.ContextRoot, standardsW3cDid.DidContexts.ContextVCv2],
+                            type: rightsManagementModels.RightsManagementTypes.PolicyRequest,
                             nodeIdentity: "urn:example:node:1",
                             proof: {
                                 created: "2024-08-22T11:56:56.272Z",
@@ -738,6 +659,8 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                         id: "IPnpNegotiationStateResponseExample",
                         response: {
                             body: {
+                                "@context": rightsManagementModels.RightsManagementContexts.ContextRoot,
+                                type: rightsManagementModels.RightsManagementTypes.PolicyState,
                                 id: "policy-1",
                                 status: "approved"
                             }
@@ -765,6 +688,8 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                             policyId: "policy-1"
                         },
                         body: {
+                            "@context": [rightsManagementModels.RightsManagementContexts.ContextRoot, standardsW3cDid.DidContexts.ContextVCv2],
+                            type: rightsManagementModels.RightsManagementTypes.PolicyRequest,
                             nodeIdentity: "urn:example:node:1",
                             proof: {
                                 created: "2024-08-22T11:56:56.272Z",
@@ -797,9 +722,13 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
  */
 async function pnpNegotiate(httpRequestContext, componentName, request) {
     core.Guards.object(ROUTES_SOURCE, "request", request);
+    const mimeType = request.headers?.[web.HeaderTypes.Accept] === web.MimeTypes.JsonLd ? "jsonld" : "json";
     const component = core.ComponentFactory.get(componentName);
-    const result = await component.negotiate(request.body.assetType, request.body.action, request.body.resourceId, request.body.context, request.body.requesterInformation, request.body.proof);
+    const result = await component.negotiate(request.body.assetType, request.body.action, request.body.resourceId, request.body.nodeIdentity, request.body.information, request.body.proof);
     return {
+        headers: {
+            [web.HeaderTypes.ContentType]: mimeType === "json" ? web.MimeTypes.Json : web.MimeTypes.JsonLd
+        },
         body: result
     };
 }
@@ -813,9 +742,13 @@ async function pnpNegotiate(httpRequestContext, componentName, request) {
 async function pnpNegotiationState(httpRequestContext, componentName, request) {
     core.Guards.object(ROUTES_SOURCE, "request", request);
     core.Guards.object(ROUTES_SOURCE, "request.body", request.body);
+    const mimeType = request.headers?.[web.HeaderTypes.Accept] === web.MimeTypes.JsonLd ? "jsonld" : "json";
     const component = core.ComponentFactory.get(componentName);
     const result = await component.negotiationState(request.pathParams.policyId, request.body.nodeIdentity, request.body.proof);
     return {
+        headers: {
+            [web.HeaderTypes.ContentType]: mimeType === "json" ? web.MimeTypes.Json : web.MimeTypes.JsonLd
+        },
         body: result
     };
 }
@@ -846,12 +779,6 @@ const restEntryPoints = [
         tags: papTags,
         generateRoutes: generateRestRoutesPolicyAdministrationPoint
     },
-    {
-        name: "policy-enforcement-point",
-        defaultBaseRoute: "rights-management",
-        tags: pepTags,
-        generateRoutes: generateRestRoutesPolicyEnforcementPoint
-    },
     {
         name: "policy-negotiation-point",
         defaultBaseRoute: "rights-management",
@@ -867,7 +794,6 @@ const restEntryPoints = [
 ];
 
 exports.generateRestRoutesPolicyAdministrationPoint = generateRestRoutesPolicyAdministrationPoint;
-exports.generateRestRoutesPolicyEnforcementPoint = generateRestRoutesPolicyEnforcementPoint;
 exports.generateRestRoutesPolicyNegotiationAdminPoint = generateRestRoutesPolicyNegotiationAdminPoint;
 exports.generateRestRoutesPolicyNegotiationPoint = generateRestRoutesPolicyNegotiationPoint;
 exports.papCreate = papCreate;
@@ -876,8 +802,6 @@ exports.papQuery = papQuery;
 exports.papRemove = papRemove;
 exports.papTags = papTags;
 exports.papUpdate = papUpdate;
-exports.pepIntercept = pepIntercept;
-exports.pepTags = pepTags;
 exports.pnapGet = pnapGet;
 exports.pnapQuery = pnapQuery;
 exports.pnapRemove = pnapRemove;

package/dist/esm/index.mjs

@@ -1,14 +1,16 @@
 import { HttpParameterHelper } from '@twin.org/api-models';
 import { Guards, ComponentFactory, Coerce } from '@twin.org/core';
 import { OdrlContexts } from '@twin.org/standards-w3c-odrl';
-import { HttpStatusCode, HttpMethod } from '@twin.org/web';
+import { HttpStatusCode, HttpMethod, HeaderTypes, MimeTypes } from '@twin.org/web';
+import { RightsManagementTypes, RightsManagementContexts } from '@twin.org/rights-management-models';
+import { DidContexts } from '@twin.org/standards-w3c-did';
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
  * The source used when communicating about these routes.
  */
-const ROUTES_SOURCE$3 = "policyAdministrationPointRoutes";
+const ROUTES_SOURCE$2 = "policyAdministrationPointRoutes";
 /**
  * The tag to associate with the routes.
  */
@@ -235,8 +237,8 @@ function generateRestRoutesPolicyAdministrationPoint(baseRouteName, componentNam
  * @returns The response object with additional http response properties.
  */
 async function papCreate(httpRequestContext, componentName, request) {
-    Guards.object(ROUTES_SOURCE$3, "request", request);
-    Guards.object(ROUTES_SOURCE$3, "request.body", request.body);
+    Guards.object(ROUTES_SOURCE$2, "request", request);
+    Guards.object(ROUTES_SOURCE$2, "request.body", request.body);
     const component = ComponentFactory.get(componentName);
     const policy = request.body;
     const uid = await component.create(policy);
@@ -255,10 +257,10 @@ async function papCreate(httpRequestContext, componentName, request) {
  * @returns The response object with additional http response properties.
  */
 async function papUpdate(httpRequestContext, componentName, request) {
-    Guards.object(ROUTES_SOURCE$3, "request", request);
-    Guards.object(ROUTES_SOURCE$3, "request.pathParams", request.pathParams);
-    Guards.stringValue(ROUTES_SOURCE$3, "request.pathParams.id", request.pathParams.id);
-    Guards.object(ROUTES_SOURCE$3, "request.body", request.body);
+    Guards.object(ROUTES_SOURCE$2, "request", request);
+    Guards.object(ROUTES_SOURCE$2, "request.pathParams", request.pathParams);
+    Guards.stringValue(ROUTES_SOURCE$2, "request.pathParams.id", request.pathParams.id);
+    Guards.object(ROUTES_SOURCE$2, "request.body", request.body);
     const component = ComponentFactory.get(componentName);
     await component.update(request.body);
     return {
@@ -273,9 +275,9 @@ async function papUpdate(httpRequestContext, componentName, request) {
  * @returns The response object with additional http response properties.
  */
 async function papGet(httpRequestContext, componentName, request) {
-    Guards.object(ROUTES_SOURCE$3, "request", request);
-    Guards.object(ROUTES_SOURCE$3, "request.pathParams", request.pathParams);
-    Guards.stringValue(ROUTES_SOURCE$3, "request.pathParams.id", request.pathParams.id);
+    Guards.object(ROUTES_SOURCE$2, "request", request);
+    Guards.object(ROUTES_SOURCE$2, "request.pathParams", request.pathParams);
+    Guards.stringValue(ROUTES_SOURCE$2, "request.pathParams.id", request.pathParams.id);
     const component = ComponentFactory.get(componentName);
     const policy = await component.get(request.pathParams.id);
     return {
@@ -290,9 +292,9 @@ async function papGet(httpRequestContext, componentName, request) {
  * @returns The response object with additional http response properties.
  */
 async function papRemove(httpRequestContext, componentName, request) {
-    Guards.object(ROUTES_SOURCE$3, "request", request);
-    Guards.object(ROUTES_SOURCE$3, "request.pathParams", request.pathParams);
-    Guards.stringValue(ROUTES_SOURCE$3, "request.pathParams.id", request.pathParams.id);
+    Guards.object(ROUTES_SOURCE$2, "request", request);
+    Guards.object(ROUTES_SOURCE$2, "request.pathParams", request.pathParams);
+    Guards.stringValue(ROUTES_SOURCE$2, "request.pathParams.id", request.pathParams.id);
     const component = ComponentFactory.get(componentName);
     await component.remove(request.pathParams.id);
     return {
@@ -307,7 +309,7 @@ async function papRemove(httpRequestContext, componentName, request) {
  * @returns The response object with additional http response properties.
  */
 async function papQuery(httpRequestContext, componentName, request) {
-    Guards.object(ROUTES_SOURCE$3, "request", request);
+    Guards.object(ROUTES_SOURCE$2, "request", request);
     const component = ComponentFactory.get(componentName);
     const result = await component.query(HttpParameterHelper.objectFromString(request.query?.conditions), request.query?.cursor, Coerce.integer(request.query?.pageSize));
     return {
@@ -318,91 +320,6 @@ async function papQuery(httpRequestContext, componentName, request) {
     };
 }
 
-/**
- * The source used when communicating about these routes.
- */
-const ROUTES_SOURCE$2 = "policyEnforcementPointRoutes";
-/**
- * The tag to associate with the routes.
- */
-const pepTags = [
-    {
-        name: "Policy Enforcement Point",
-        description: "Endpoints for managing ODRL policies in the Policy Enforcement Point"
-    }
-];
-/**
- * The REST routes for the Policy Enforcement Point.
- * @param baseRouteName Prefix to prepend to the paths.
- * @param componentName The name of the component to use in the routes stored in the ComponentFactory.
- * @returns The generated routes.
- */
-function generateRestRoutesPolicyEnforcementPoint(baseRouteName, componentName) {
-    const pepInterceptRoute = {
-        operationId: "pepIntercept",
-        summary: "Intercept a request",
-        tag: pepTags[0].name,
-        method: "POST",
-        path: `${baseRouteName}/pep/intercept`,
-        handler: async (httpRequestContext, request) => pepIntercept(httpRequestContext, componentName, request),
-        requestType: {
-            type: "IPepInterceptRequest",
-            examples: [
-                {
-                    id: "pepInterceptRequestExample",
-                    request: {
-                        body: {
-                            assetType: "document",
-                            action: "view",
-                            data: {
-                                id: "document-1",
-                                param1: 1,
-                                param2: 2
-                            }
-                        }
-                    }
-                }
-            ]
-        },
-        responseType: [
-            {
-                type: "IPepInterceptResponse",
-                examples: [
-                    {
-                        id: "pepInterceptResponseExample",
-                        response: {
-                            body: {
-                                id: "document-1",
-                                param1: 1
-                            }
-                        }
-                    }
-                ]
-            }
-        ]
-    };
-    return [pepInterceptRoute];
-}
-/**
- * PEP: Intercept.
- * @param httpRequestContext The request context for the API.
- * @param componentName The name of the component to use in the routes.
- * @param request The request.
- * @returns The response object with additional http response properties.
- */
-async function pepIntercept(httpRequestContext, componentName, request) {
-    Guards.object(ROUTES_SOURCE$2, "request", request);
-    const component = ComponentFactory.get(componentName);
-    const result = await component.intercept(request.body.assetType, request.body.action, {
-        ...(request.body.context ?? {}),
-        userIdentity: httpRequestContext.userIdentity,
-        nodeIdentity: httpRequestContext.nodeIdentity
-    }, request.body.data);
-    return {
-        body: result
-    };
-}
-
 /**
  * The source used when communicating about these routes.
  */
@@ -454,7 +371,7 @@ function generateRestRoutesPolicyNegotiationAdminPoint(baseRouteName, componentN
                                 dateCreated: "2025-09-03T00:00:00.000Z",
                                 assetType: "document",
                                 action: "view",
-                                context: {}
+                                nodeIdentity: "urn:example:node:1"
                             }
                         }
                     }
@@ -482,7 +399,7 @@ function generateRestRoutesPolicyNegotiationAdminPoint(baseRouteName, componentN
                             dateCreated: "2025-09-03T00:00:00.000Z",
                             assetType: "document",
                             action: "view",
-                            context: {}
+                            nodeIdentity: "urn:example:node:1"
                         }
                     }
                 }
@@ -543,7 +460,7 @@ function generateRestRoutesPolicyNegotiationAdminPoint(baseRouteName, componentN
                                         dateCreated: "2025-09-03T00:00:00.000Z",
                                         assetType: "document",
                                         action: "view",
-                                        context: {}
+                                        nodeIdentity: "urn:example:node:1"
                                     }
                                 ],
                                 cursor: "next-cursor"
@@ -661,11 +578,11 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                     id: "pnpNegotiateRequestExample",
                     request: {
                         body: {
+                            "@context": [RightsManagementContexts.ContextRoot, DidContexts.ContextVCv2],
+                            type: RightsManagementTypes.PolicyNegotiationRequest,
                             assetType: "document",
                             action: "view",
-                            context: {
-                                nodeIdentity: "urn:example:node:1"
-                            },
+                            nodeIdentity: "urn:example:node:1",
                             proof: {
                                 created: "2024-08-22T11:56:56.272Z",
                                 type: "DataIntegrityProof",
@@ -687,6 +604,8 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                         id: "IPnpNegotiateResponseExample",
                         response: {
                             body: {
+                                "@context": RightsManagementContexts.ContextRoot,
+                                type: RightsManagementTypes.PolicyState,
                                 id: "policy-1",
                                 status: "approved"
                             }
@@ -714,6 +633,8 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                             policyId: "policy-1"
                         },
                         body: {
+                            "@context": [RightsManagementContexts.ContextRoot, DidContexts.ContextVCv2],
+                            type: RightsManagementTypes.PolicyRequest,
                             nodeIdentity: "urn:example:node:1",
                             proof: {
                                 created: "2024-08-22T11:56:56.272Z",
@@ -736,6 +657,8 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                         id: "IPnpNegotiationStateResponseExample",
                         response: {
                             body: {
+                                "@context": RightsManagementContexts.ContextRoot,
+                                type: RightsManagementTypes.PolicyState,
                                 id: "policy-1",
                                 status: "approved"
                             }
@@ -763,6 +686,8 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
                             policyId: "policy-1"
                         },
                         body: {
+                            "@context": [RightsManagementContexts.ContextRoot, DidContexts.ContextVCv2],
+                            type: RightsManagementTypes.PolicyRequest,
                             nodeIdentity: "urn:example:node:1",
                             proof: {
                                 created: "2024-08-22T11:56:56.272Z",
@@ -795,9 +720,13 @@ function generateRestRoutesPolicyNegotiationPoint(baseRouteName, componentName)
  */
 async function pnpNegotiate(httpRequestContext, componentName, request) {
     Guards.object(ROUTES_SOURCE, "request", request);
+    const mimeType = request.headers?.[HeaderTypes.Accept] === MimeTypes.JsonLd ? "jsonld" : "json";
     const component = ComponentFactory.get(componentName);
-    const result = await component.negotiate(request.body.assetType, request.body.action, request.body.resourceId, request.body.context, request.body.requesterInformation, request.body.proof);
+    const result = await component.negotiate(request.body.assetType, request.body.action, request.body.resourceId, request.body.nodeIdentity, request.body.information, request.body.proof);
     return {
+        headers: {
+            [HeaderTypes.ContentType]: mimeType === "json" ? MimeTypes.Json : MimeTypes.JsonLd
+        },
         body: result
     };
 }
@@ -811,9 +740,13 @@ async function pnpNegotiate(httpRequestContext, componentName, request) {
 async function pnpNegotiationState(httpRequestContext, componentName, request) {
     Guards.object(ROUTES_SOURCE, "request", request);
     Guards.object(ROUTES_SOURCE, "request.body", request.body);
+    const mimeType = request.headers?.[HeaderTypes.Accept] === MimeTypes.JsonLd ? "jsonld" : "json";
     const component = ComponentFactory.get(componentName);
     const result = await component.negotiationState(request.pathParams.policyId, request.body.nodeIdentity, request.body.proof);
     return {
+        headers: {
+            [HeaderTypes.ContentType]: mimeType === "json" ? MimeTypes.Json : MimeTypes.JsonLd
+        },
         body: result
     };
 }
@@ -844,12 +777,6 @@ const restEntryPoints = [
         tags: papTags,
         generateRoutes: generateRestRoutesPolicyAdministrationPoint
     },
-    {
-        name: "policy-enforcement-point",
-        defaultBaseRoute: "rights-management",
-        tags: pepTags,
-        generateRoutes: generateRestRoutesPolicyEnforcementPoint
-    },
     {
         name: "policy-negotiation-point",
         defaultBaseRoute: "rights-management",
@@ -864,4 +791,4 @@ const restEntryPoints = [
     }
 ];
 
-export { generateRestRoutesPolicyAdministrationPoint, generateRestRoutesPolicyEnforcementPoint, generateRestRoutesPolicyNegotiationAdminPoint, generateRestRoutesPolicyNegotiationPoint, papCreate, papGet, papQuery, papRemove, papTags, papUpdate, pepIntercept, pepTags, pnapGet, pnapQuery, pnapRemove, pnapSet, pnapTags, pnpNegotiate, pnpNegotiationCancel, pnpNegotiationState, pnpTags, restEntryPoints };
+export { generateRestRoutesPolicyAdministrationPoint, generateRestRoutesPolicyNegotiationAdminPoint, generateRestRoutesPolicyNegotiationPoint, papCreate, papGet, papQuery, papRemove, papTags, papUpdate, pnapGet, pnapQuery, pnapRemove, pnapSet, pnapTags, pnpNegotiate, pnpNegotiationCancel, pnpNegotiationState, pnpTags, restEntryPoints };

package/dist/types/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./policyAdministrationPointRoutes";
-export * from "./policyEnforcementPointRoutes";
 export * from "./policyNegotiationAdminPointRoutes";
 export * from "./policyNegotiationPointRoutes";
 export * from "./restEntryPoints";

package/dist/types/policyNegotiationPointRoutes.d.ts

@@ -1,5 +1,5 @@
 import type { IHttpRequestContext, INoContentResponse, IRestRoute, ITag } from "@twin.org/api-models";
-import type { IPnpNegotiateRequest, IPnpNegotiateResponse, IPnpNegotiationCancelRequest, IPnpNegotiationStateRequest, IPnpNegotiationStateResponse } from "@twin.org/rights-management-models";
+import { type IPnpNegotiateRequest, type IPnpNegotiateResponse, type IPnpNegotiationCancelRequest, type IPnpNegotiationStateRequest, type IPnpNegotiationStateResponse } from "@twin.org/rights-management-models";
 /**
  * The tag to associate with the routes.
  */

package/docs/changelog.md

@@ -1,5 +1,49 @@
 # @twin.org/rights-management-pap-service - Changelog
 
+## [0.0.2-next.9](https://github.com/twinfoundation/rights-management/compare/rights-management-service-v0.0.2-next.8...rights-management-service-v0.0.2-next.9) (2025-09-08)
+
+
+### Features
+
+* add JSON-LD types for negotiation ([6be61f8](https://github.com/twinfoundation/rights-management/commit/6be61f890537cb9d22d4fad90092b858de2c9c2d))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/rights-management-models bumped from 0.0.2-next.8 to 0.0.2-next.9
+  * devDependencies
+    * @twin.org/rights-management-pap-service bumped from 0.0.2-next.8 to 0.0.2-next.9
+    * @twin.org/rights-management-pdp-service bumped from 0.0.2-next.8 to 0.0.2-next.9
+    * @twin.org/rights-management-pep-service bumped from 0.0.2-next.8 to 0.0.2-next.9
+    * @twin.org/rights-management-pip-service bumped from 0.0.2-next.8 to 0.0.2-next.9
+    * @twin.org/rights-management-pmp-service bumped from 0.0.2-next.8 to 0.0.2-next.9
+    * @twin.org/rights-management-pnp-service bumped from 0.0.2-next.8 to 0.0.2-next.9
+    * @twin.org/rights-management-pxp-service bumped from 0.0.2-next.8 to 0.0.2-next.9
+
+## [0.0.2-next.8](https://github.com/twinfoundation/rights-management/compare/rights-management-service-v0.0.2-next.7...rights-management-service-v0.0.2-next.8) (2025-09-05)
+
+
+### Miscellaneous Chores
+
+* **rights-management-service:** Synchronize repo versions
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/rights-management-models bumped from 0.0.2-next.7 to 0.0.2-next.8
+  * devDependencies
+    * @twin.org/rights-management-pap-service bumped from 0.0.2-next.7 to 0.0.2-next.8
+    * @twin.org/rights-management-pdp-service bumped from 0.0.2-next.7 to 0.0.2-next.8
+    * @twin.org/rights-management-pep-service bumped from 0.0.2-next.7 to 0.0.2-next.8
+    * @twin.org/rights-management-pip-service bumped from 0.0.2-next.7 to 0.0.2-next.8
+    * @twin.org/rights-management-pmp-service bumped from 0.0.2-next.7 to 0.0.2-next.8
+    * @twin.org/rights-management-pnp-service bumped from 0.0.2-next.7 to 0.0.2-next.8
+    * @twin.org/rights-management-pxp-service bumped from 0.0.2-next.7 to 0.0.2-next.8
+
 ## [0.0.2-next.7](https://github.com/twinfoundation/rights-management/compare/rights-management-service-v0.0.2-next.6...rights-management-service-v0.0.2-next.7) (2025-09-05)
 
 

package/docs/open-api/spec.json

@@ -19,10 +19,6 @@
 			"name": "Policy Administration Point",
 			"description": "Endpoints for managing ODRL policies in the Policy Administration Point"
 		},
-		{
-			"name": "Policy Enforcement Point",
-			"description": "Endpoints for managing ODRL policies in the Policy Enforcement Point"
-		},
 		{
 			"name": "Policy Negotiation Point",
 			"description": "Endpoints for managing ODRL policies in the Policy Negotiation Point"
@@ -589,121 +585,6 @@
 				}
 			}
 		},
-		"/rights-management/pep/intercept": {
-			"post": {
-				"operationId": "pepIntercept",
-				"summary": "Intercept a request",
-				"tags": [
-					"Policy Enforcement Point"
-				],
-				"security": [
-					{
-						"jwtBearerAuthScheme": []
-					}
-				],
-				"requestBody": {
-					"description": "The request structure for intercepting a request and enforcing a policy.",
-					"required": true,
-					"content": {
-						"application/json": {
-							"schema": {
-								"$ref": "#/components/schemas/PepInterceptRequest"
-							},
-							"examples": {
-								"pepInterceptRequestExample": {
-									"value": {
-										"assetType": "document",
-										"action": "view",
-										"data": {
-											"id": "document-1",
-											"param1": 1,
-											"param2": 2
-										}
-									}
-								}
-							}
-						}
-					}
-				},
-				"responses": {
-					"200": {
-						"description": "The response structure for intercepting a request and enforcing a policy.",
-						"content": {
-							"application/json": {
-								"schema": {
-									"$ref": "#/components/schemas/PepInterceptResponse"
-								},
-								"examples": {
-									"pepInterceptResponseExample": {
-										"value": {
-											"id": "document-1",
-											"param1": 1
-										}
-									}
-								}
-							}
-						}
-					},
-					"400": {
-						"description": "The server cannot process the request, see the content for more details.",
-						"content": {
-							"application/json": {
-								"schema": {
-									"$ref": "#/components/schemas/Error"
-								},
-								"examples": {
-									"exampleResponse": {
-										"value": {
-											"name": "GeneralError",
-											"message": "component.error",
-											"properties": {
-												"foo": "bar"
-											}
-										}
-									}
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "You are not authorized to use the API or no credentials were supplied, see the content for more details.",
-						"content": {
-							"application/json": {
-								"schema": {
-									"$ref": "#/components/schemas/Error"
-								},
-								"examples": {
-									"exampleResponse": {
-										"value": {
-											"name": "UnauthorizedError",
-											"message": "component.error"
-										}
-									}
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "The server has encountered a situation it does not know how to handle, see the content for more details.",
-						"content": {
-							"application/json": {
-								"schema": {
-									"$ref": "#/components/schemas/Error"
-								},
-								"examples": {
-									"exampleResponse": {
-										"value": {
-											"name": "InternalServerError",
-											"message": "component.error"
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		},
 		"/rights-management/pnp/negotiate": {
 			"post": {
 				"operationId": "pnpNegotiate",
@@ -711,22 +592,36 @@
 				"tags": [
 					"Policy Negotiation Point"
 				],
+				"parameters": [
+					{
+						"name": "accept",
+						"in": "header",
+						"required": true,
+						"schema": {
+							"type": "string"
+						},
+						"style": "simple"
+					}
+				],
 				"requestBody": {
 					"description": "The request structure for negotiating a policy.",
 					"required": true,
 					"content": {
 						"application/json": {
 							"schema": {
-								"$ref": "#/components/schemas/PnpNegotiateRequest"
+								"$ref": "#/components/schemas/PolicyNegotiationRequest"
 							},
 							"examples": {
 								"pnpNegotiateRequestExample": {
 									"value": {
+										"@context": [
+											"https://schema.twindev.org/rights-management",
+											"https://www.w3.org/ns/credentials/v2"
+										],
+										"type": "PolicyNegotiationRequest",
 										"assetType": "document",
 										"action": "view",
-										"context": {
-											"nodeIdentity": "urn:example:node:1"
-										},
+										"nodeIdentity": "urn:example:node:1",
 										"proof": {
 											"created": "2024-08-22T11:56:56.272Z",
 											"type": "DataIntegrityProof",
@@ -752,6 +647,8 @@
 								"examples": {
 									"IPnpNegotiateResponseExample": {
 										"value": {
+											"@context": "https://schema.twindev.org/rights-management",
+											"type": "PolicyState",
 											"id": "policy-1",
 											"status": "approved"
 										}
@@ -820,6 +717,15 @@
 						},
 						"style": "simple",
 						"example": "policy-1"
+					},
+					{
+						"name": "accept",
+						"in": "header",
+						"required": true,
+						"schema": {
+							"type": "string"
+						},
+						"style": "simple"
 					}
 				],
 				"requestBody": {
@@ -828,11 +734,16 @@
 					"content": {
 						"application/json": {
 							"schema": {
-								"$ref": "#/components/schemas/PnpNegotiationStateRequest"
+								"$ref": "#/components/schemas/PolicyRequest"
 							},
 							"examples": {
 								"pnpNegotiationStateRequestExample": {
 									"value": {
+										"@context": [
+											"https://schema.twindev.org/rights-management",
+											"https://www.w3.org/ns/credentials/v2"
+										],
+										"type": "PolicyRequest",
 										"nodeIdentity": "urn:example:node:1",
 										"proof": {
 											"created": "2024-08-22T11:56:56.272Z",
@@ -859,6 +770,8 @@
 								"examples": {
 									"IPnpNegotiationStateResponseExample": {
 										"value": {
+											"@context": "https://schema.twindev.org/rights-management",
+											"type": "PolicyState",
 											"id": "policy-1",
 											"status": "approved"
 										}
@@ -925,6 +838,15 @@
 						},
 						"style": "simple",
 						"example": "policy-1"
+					},
+					{
+						"name": "accept",
+						"in": "header",
+						"required": true,
+						"schema": {
+							"type": "string"
+						},
+						"style": "simple"
 					}
 				],
 				"requestBody": {
@@ -933,11 +855,16 @@
 					"content": {
 						"application/json": {
 							"schema": {
-								"$ref": "#/components/schemas/PnpNegotiationCancelRequest"
+								"$ref": "#/components/schemas/PolicyRequest"
 							},
 							"examples": {
 								"pnpNegotiationCancelRequestExample": {
 									"value": {
+										"@context": [
+											"https://schema.twindev.org/rights-management",
+											"https://www.w3.org/ns/credentials/v2"
+										],
+										"type": "PolicyRequest",
 										"nodeIdentity": "urn:example:node:1",
 										"proof": {
 											"created": "2024-08-22T11:56:56.272Z",
@@ -1040,7 +967,7 @@
 											"dateCreated": "2025-09-03T00:00:00.000Z",
 											"assetType": "document",
 											"action": "view",
-											"context": {}
+											"nodeIdentity": "urn:example:node:1"
 										}
 									}
 								}
@@ -1146,7 +1073,7 @@
 										"dateCreated": "2025-09-03T00:00:00.000Z",
 										"assetType": "document",
 										"action": "view",
-										"context": {}
+										"nodeIdentity": "urn:example:node:1"
 									}
 								}
 							}
@@ -1356,7 +1283,7 @@
 													"dateCreated": "2025-09-03T00:00:00.000Z",
 													"assetType": "document",
 													"action": "view",
-													"context": {}
+													"nodeIdentity": "urn:example:node:1"
 												}
 											],
 											"cursor": "next-cursor"
@@ -1912,34 +1839,6 @@
 				"additionalProperties": false,
 				"description": "The body of the response."
 			},
-			"PepInterceptRequest": {
-				"type": "object",
-				"properties": {
-					"assetType": {
-						"type": "string",
-						"description": "The type of the asset to enforce the policy on."
-					},
-					"action": {
-						"type": "string",
-						"description": "The action to perform on the asset."
-					},
-					"context": {
-						"description": "The context in which the action is being performed. userIdentity and nodeIdentity should not be passed as they will be populated by the authenticated context on the server side."
-					},
-					"data": {
-						"description": "The data to include in the request."
-					}
-				},
-				"required": [
-					"assetType",
-					"action"
-				],
-				"additionalProperties": false,
-				"description": "The body parameters of the request."
-			},
-			"PepInterceptResponse": {
-				"description": "The manipulated data with any policies applied."
-			},
 			"PnapQueryResponse": {
 				"type": "object",
 				"properties": {
@@ -1964,101 +1863,6 @@
 				"additionalProperties": false,
 				"description": "The body of the response."
 			},
-			"PnpNegotiateRequest": {
-				"type": "object",
-				"properties": {
-					"assetType": {
-						"type": "string",
-						"description": "The type of the asset being requested."
-					},
-					"action": {
-						"type": "string",
-						"description": "The action being performed on the asset."
-					},
-					"resourceId": {
-						"type": "string",
-						"description": "The id of the item being requested."
-					},
-					"context": {
-						"$ref": "#/components/schemas/PolicyContext"
-					},
-					"requesterInformation": {
-						"type": "object",
-						"additionalProperties": {
-							"type": "array",
-							"items": false,
-							"prefixItems": [
-								{
-									"$ref": "https://schema.twindev.org/json-ld/JsonLdNodeObject"
-								}
-							]
-						},
-						"description": "Additional information provided by the requester to determine if a policy can be created."
-					},
-					"proof": {
-						"$ref": "https://schema.twindev.org/w3c-did/Proof"
-					}
-				},
-				"required": [
-					"assetType",
-					"action",
-					"context",
-					"proof"
-				],
-				"additionalProperties": false,
-				"description": "The body parameters of the request."
-			},
-			"PnpNegotiationCancelRequest": {
-				"type": "object",
-				"properties": {
-					"nodeIdentity": {
-						"type": "string",
-						"description": "The node sending the request."
-					},
-					"proof": {
-						"$ref": "https://schema.twindev.org/w3c-did/Proof"
-					}
-				},
-				"required": [
-					"nodeIdentity",
-					"proof"
-				],
-				"additionalProperties": false,
-				"description": "The body of the request."
-			},
-			"PnpNegotiationStateRequest": {
-				"type": "object",
-				"properties": {
-					"nodeIdentity": {
-						"type": "string",
-						"description": "The node sending the request."
-					},
-					"proof": {
-						"$ref": "https://schema.twindev.org/w3c-did/Proof"
-					}
-				},
-				"required": [
-					"nodeIdentity",
-					"proof"
-				],
-				"additionalProperties": false,
-				"description": "The body of the request."
-			},
-			"PolicyContext": {
-				"type": "object",
-				"properties": {
-					"userIdentity": {
-						"type": "string",
-						"description": "The user identity to use in the decision making."
-					},
-					"nodeIdentity": {
-						"type": "string",
-						"description": "The node identity to use in the decision making."
-					}
-				},
-				"additionalProperties": false,
-				"description": "Context information to be used when making a policy decision."
-			},
 			"PolicyNegotiation": {
 				"type": "object",
 				"properties": {
@@ -2082,10 +1886,11 @@
 						"type": "string",
 						"description": "The resource id the negotiation is for."
 					},
-					"context": {
-						"$ref": "#/components/schemas/PolicyContext"
+					"nodeIdentity": {
+						"type": "string",
+						"description": "The identity of the node making the request."
 					},
-					"requesterInformation": {
+					"information": {
 						"type": "object",
 						"additionalProperties": {
 							"type": "array",
@@ -2115,7 +1920,7 @@
 					"dateCreated",
 					"assetType",
 					"action",
-					"context",
+					"nodeIdentity",
 					"status"
 				],
 				"additionalProperties": false,
@@ -2144,6 +1949,16 @@
 			"PolicyState": {
 				"type": "object",
 				"properties": {
+					"@context": {
+						"type": "string",
+						"const": "https://schema.twindev.org/rights-management",
+						"description": "The JSON-LD context."
+					},
+					"type": {
+						"type": "string",
+						"const": "PolicyState",
+						"description": "The type of the proof."
+					},
 					"id": {
 						"type": "string",
 						"description": "The id of the policy."
@@ -2161,6 +1976,8 @@
 					}
 				},
 				"required": [
+					"@context",
+					"type",
 					"id",
 					"status"
 				],

package/docs/reference/index.md

@@ -3,7 +3,6 @@
 ## Variables
 
 - [papTags](variables/papTags.md)
-- [pepTags](variables/pepTags.md)
 - [pnapTags](variables/pnapTags.md)
 - [pnpTags](variables/pnpTags.md)
 - [restEntryPoints](variables/restEntryPoints.md)
@@ -16,8 +15,6 @@
 - [papGet](functions/papGet.md)
 - [papRemove](functions/papRemove.md)
 - [papQuery](functions/papQuery.md)
-- [generateRestRoutesPolicyEnforcementPoint](functions/generateRestRoutesPolicyEnforcementPoint.md)
-- [pepIntercept](functions/pepIntercept.md)
 - [generateRestRoutesPolicyNegotiationAdminPoint](functions/generateRestRoutesPolicyNegotiationAdminPoint.md)
 - [pnapGet](functions/pnapGet.md)
 - [pnapSet](functions/pnapSet.md)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/rights-management-service",
-	"version": "0.0.2-next.7",
+	"version": "0.0.2-next.9",
 	"description": "Rights Management service implementation and REST endpoint definitions",
 	"repository": {
 		"type": "git",
@@ -19,7 +19,7 @@
 		"@twin.org/data-json-ld": "next",
 		"@twin.org/entity": "next",
 		"@twin.org/nameof": "next",
-		"@twin.org/rights-management-models": "0.0.2-next.7",
+		"@twin.org/rights-management-models": "0.0.2-next.9",
 		"@twin.org/standards-w3c-did": "next",
 		"@twin.org/standards-w3c-odrl": "next",
 		"@twin.org/web": "next"

package/dist/types/policyEnforcementPointRoutes.d.ts

@@ -1,21 +0,0 @@
-import type { IHttpRequestContext, IRestRoute, ITag } from "@twin.org/api-models";
-import type { IPepInterceptRequest, IPepInterceptResponse } from "@twin.org/rights-management-models";
-/**
- * The tag to associate with the routes.
- */
-export declare const pepTags: ITag[];
-/**
- * The REST routes for the Policy Enforcement Point.
- * @param baseRouteName Prefix to prepend to the paths.
- * @param componentName The name of the component to use in the routes stored in the ComponentFactory.
- * @returns The generated routes.
- */
-export declare function generateRestRoutesPolicyEnforcementPoint(baseRouteName: string, componentName: string): IRestRoute[];
-/**
- * PEP: Intercept.
- * @param httpRequestContext The request context for the API.
- * @param componentName The name of the component to use in the routes.
- * @param request The request.
- * @returns The response object with additional http response properties.
- */
-export declare function pepIntercept(httpRequestContext: IHttpRequestContext, componentName: string, request: IPepInterceptRequest): Promise<IPepInterceptResponse>;

package/docs/reference/functions/generateRestRoutesPolicyEnforcementPoint.md

@@ -1,25 +0,0 @@
-# Function: generateRestRoutesPolicyEnforcementPoint()
-
-> **generateRestRoutesPolicyEnforcementPoint**(`baseRouteName`, `componentName`): `IRestRoute`\<`any`, `any`\>[]
-
-The REST routes for the Policy Enforcement Point.
-
-## Parameters
-
-### baseRouteName
-
-`string`
-
-Prefix to prepend to the paths.
-
-### componentName
-
-`string`
-
-The name of the component to use in the routes stored in the ComponentFactory.
-
-## Returns
-
-`IRestRoute`\<`any`, `any`\>[]
-
-The generated routes.

package/docs/reference/functions/pepIntercept.md

@@ -1,31 +0,0 @@
-# Function: pepIntercept()
-
-> **pepIntercept**(`httpRequestContext`, `componentName`, `request`): `Promise`\<`IPepInterceptResponse`\>
-
-PEP: Intercept.
-
-## Parameters
-
-### httpRequestContext
-
-`IHttpRequestContext`
-
-The request context for the API.
-
-### componentName
-
-`string`
-
-The name of the component to use in the routes.
-
-### request
-
-`IPepInterceptRequest`
-
-The request.
-
-## Returns
-
-`Promise`\<`IPepInterceptResponse`\>
-
-The response object with additional http response properties.

package/docs/reference/variables/pepTags.md

@@ -1,5 +0,0 @@
-# Variable: pepTags
-
-> `const` **pepTags**: `ITag`[]
-
-The tag to associate with the routes.