npm package diff
Package: @forge/csp
Versions: 3.7.0-next.0-experimental-beb5acf - 3.7.0-next.1
Modified: package/out/csp/csp-processing-service.js
Index: package/out/csp/csp-processing-service.js
===================================================================
--- package/out/csp/csp-processing-service.js
+++ package/out/csp/csp-processing-service.js
@@ -50,19 +50,22 @@
}
}
}
}
+ egressesToStringMap(externalPermissions) {
+ return externalPermissions?.map((egress) => (typeof egress === 'object' ? egress.address : egress));
+ }
mapExternalPermissionsToCsp(externalPermissions) {
const { images, media, scripts, fetch, styles, fonts, frames } = externalPermissions;
this.assertValidFetchClient(fetch);
return {
- 'img-src': images ?? [],
- 'media-src': media ?? [],
- 'script-src': scripts ?? [],
- 'style-src': styles ?? [],
+ 'img-src': this.egressesToStringMap(images) ?? [],
+ 'media-src': this.egressesToStringMap(media) ?? [],
+ 'script-src': this.egressesToStringMap(scripts) ?? [],
+ 'style-src': this.egressesToStringMap(styles) ?? [],
'connect-src': fetch?.client ?? [],
- 'font-src': fonts ?? [],
- 'frame-src': frames ?? []
+ 'font-src': this.egressesToStringMap(fonts) ?? [],
+ 'frame-src': this.egressesToStringMap(frames) ?? []
};
}
getStyleSrc($, userStyleSrc) {
const quotedUserStyleSrc = userStyleSrc?.map((x) => `'${x}'`) ?? [];
Modified: package/package.json
Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"name": "@forge/csp",
- "version": "3.7.0-next.0-experimental-beb5acf",
+ "version": "3.7.0-next.1",
"description": "Contains the CSP configuration for Custom UI resources in Forge",
"main": "out/index.js",
"author": "Atlassian",
"license": "SEE LICENSE IN LICENSE.txt",
@@ -10,10 +10,10 @@
"compile": "tsc -b -v",
"clean": "rm -rf ./out && rm -f tsconfig.tsbuildinfo"
},
"devDependencies": {
- "@forge/cli-shared": "6.8.0-next.15-experimental-beb5acf",
- "@forge/manifest": "8.9.0-next.8-experimental-beb5acf",
+ "@forge/cli-shared": "6.8.0-next.24",
+ "@forge/manifest": "8.9.0-next.12",
"@types/jest": "^29.5.12",
"@types/node": "14.18.63"
},
"dependencies": {
Modified: package/out/csp/csp-processing-service.d.ts.map
Index: package/out/csp/csp-processing-service.d.ts.map
===================================================================
--- package/out/csp/csp-processing-service.d.ts.map
+++ package/out/csp/csp-processing-service.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"csp-processing-service.d.ts","sourceRoot":"","sources":["../../src/csp/csp-processing-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAS,MAAM,iBAAiB,CAAC;AAK1D,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,YAAY,EAAuB,MAAM,UAAU,CAAC;AAE7F,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAMD,qBAAa,oBAAoB;IAanB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXnC,OAAO,CAAC,mBAAmB,CAAuB;IAElD,OAAO,CAAC,2BAA2B,CAAqD;IACxF,OAAO,CAAC,6BAA6B,CAAa;IAClD,OAAO,CAAC,oBAAoB,CAAgF;IAE5G,OAAO,CAAC,qBAAqB,CAI3B;gBAC2B,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;IAElD,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,GAAG,UAAU;IAoBvE,wBAAwB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,MAAM,EAAE;IASjF,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,2BAA2B;IAgBnC,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,oBAAoB;CAa7B"}
\ No newline at end of file
+{"version":3,"file":"csp-processing-service.d.ts","sourceRoot":"","sources":["../../src/csp/csp-processing-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAS,MAAM,iBAAiB,CAAC;AAK1D,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,YAAY,EAAuB,MAAM,UAAU,CAAC;AAE7F,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAMD,qBAAa,oBAAoB;IAanB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXnC,OAAO,CAAC,mBAAmB,CAAuB;IAElD,OAAO,CAAC,2BAA2B,CAAqD;IACxF,OAAO,CAAC,6BAA6B,CAAa;IAClD,OAAO,CAAC,oBAAoB,CAAgF;IAE5G,OAAO,CAAC,qBAAqB,CAI3B;gBAC2B,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;IAElD,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,GAAG,UAAU;IAoBvE,wBAAwB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,MAAM,EAAE;IASjF,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,2BAA2B;IAgBnC,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,oBAAoB;CAa7B"}
\ No newline at end of file
Modified: package/CHANGELOG.md
Index: package/CHANGELOG.md
===================================================================
--- package/CHANGELOG.md
+++ package/CHANGELOG.md
@@ -1,11 +1,11 @@
# @forge/csp
-## 3.7.0-next.0-experimental-beb5acf
+## 3.7.0-next.1
-### Minor Changes
+### Patch Changes
-- a779dc3: Allow listing emoji API y default for Custom UI apps
+- 8c34ca3: Changed manifest to allow egress objects to be a list of string, egress objects containing at least the 'address' field, or a remote reference
## 3.7.0-next.0
### Minor Changes
Modified: package/out/csp/csp-processing-service.d.ts
Index: package/out/csp/csp-processing-service.d.ts
===================================================================
--- package/out/csp/csp-processing-service.d.ts
+++ package/out/csp/csp-processing-service.d.ts
@@ -14,8 +14,9 @@
constructor(logger: Pick<Logger, 'info'>);
getCspDetails(body: DocumentBody, permissions: Permissions): CSPDetails;
getInvalidCspPermissions(contentPermissions: ContentPermissions): string[];
private assertValidFetchClient;
+ private egressesToStringMap;
private mapExternalPermissionsToCsp;
private getStyleSrc;
private getScriptSrc;
private extractUniqueHashes;