Skip to content

Commit 5ff5f05

Browse files
authored
feat: Pass validation_result through (#249)
1 parent 13aa6fa commit 5ff5f05

File tree

4 files changed

+42
-2
lines changed

4 files changed

+42
-2
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@contentauth/toolkit",
5+
"comment": "Pass validation results through",
6+
"type": "patch"
7+
}
8+
],
9+
"packageName": "@contentauth/toolkit"
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "c2pa",
5+
"comment": "Pass validation results through",
6+
"type": "patch"
7+
}
8+
],
9+
"packageName": "c2pa"
10+
}

packages/c2pa/src/manifestStore.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import {
1111
Manifest as ToolkitManifest,
1212
ManifestStore as ToolkitManifestStore,
13+
ValidationResults,
1314
ValidationStatus,
1415
} from '@contentauth/toolkit';
1516
import debug from 'debug';
@@ -32,6 +33,8 @@ export interface ManifestStore {
3233
* List of validation errors
3334
*/
3435
validationStatus: ValidationStatus[];
36+
37+
validationResults: ValidationResults;
3538
}
3639

3740
export interface ManifestMap {
@@ -96,6 +99,7 @@ export function createManifestStore(
9699
manifests,
97100
activeManifest: manifests[manifestStoreData.active_manifest],
98101
validationStatus: manifestStoreData?.validation_status ?? [],
102+
validationResults: manifestStoreData?.validation_results ?? null,
99103
};
100104
}
101105

@@ -115,7 +119,6 @@ function createManifests(
115119
active_manifest: toolkitActiveManifestId,
116120
} = manifestStoreData;
117121
dbg('Received manifest store from toolkit', manifestStoreData, cawgData);
118-
119122
// Perform a post-order traversal of the manifest tree (leaves-to-root) to guarantee that a manifest's ingredient
120123
// manifests are already available when it is created.
121124

packages/toolkit/types/index.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,24 @@ export interface AssetReport {
2626
export interface ManifestStore {
2727
active_manifest: string;
2828
manifests: Record<string, Manifest>;
29-
validation_status?: ValidationStatus[];
29+
validation_status: ValidationStatus[];
30+
validation_results: ValidationResults;
31+
}
32+
33+
export interface ValidationResults {
34+
activeManifest: ValidationResultData;
35+
ingredientDeltas: IngredientDelta[];
36+
}
37+
38+
export interface IngredientDelta {
39+
ingredientAssertionUri: string;
40+
validationDeltas: ValidationResultData;
41+
}
42+
43+
export interface ValidationResultData {
44+
failure: ValidationStatus[];
45+
informational: ValidationStatus[];
46+
success: ValidationStatus[];
3047
}
3148

3249
export interface ValidationStatus {

0 commit comments

Comments
 (0)