@forge/egress 1.2.13 → 1.3.0-next.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @forge/egress
2
2
 
3
+ ## 1.3.0-next.0
4
+
5
+ ### Minor Changes
6
+
7
+ - 2e198f0: Adding new logic to retrieve egress permissions from a list of duplicates and with override filters
8
+
3
9
  ## 1.2.13
4
10
 
5
11
  ### Patch Changes
@@ -4,6 +4,9 @@ exports.EgressFilteringService = void 0;
4
4
  const minimatch_1 = require("minimatch");
5
5
  const url_parser_1 = require("./url-parser");
6
6
  class EgressFilteringService {
7
+ URLs;
8
+ wildcardDomains;
9
+ allowsEverything;
7
10
  constructor(allowList) {
8
11
  this.URLs = allowList.filter((domainOrURL) => !domainOrURL.startsWith('*')).map((url) => this.parseUrl(url));
9
12
  this.wildcardDomains = allowList
@@ -2,8 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.parseUrl = void 0;
4
4
  function parseUrl(url) {
5
- var _a, _b;
6
- const protocol = (_b = (_a = url.match(/^(.*?:)/)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : 'https:';
5
+ const protocol = url.match(/^(.*?:)/)?.[0] ?? 'https:';
7
6
  const hostname = url
8
7
  .replace(protocol, '')
9
8
  .replace(/^\/*/, '')
@@ -1,3 +1,31 @@
1
1
  declare const sortAndGroupEgressPermissionsByDomain: (egressAddresses: string[]) => Array<string>;
2
- export { sortAndGroupEgressPermissionsByDomain };
2
+ export declare enum EgressType {
3
+ FetchBackendSide = "FETCH_BACKEND_SIDE",
4
+ FetchClientSide = "FETCH_CLIENT_SIDE",
5
+ Fonts = "FONTS",
6
+ Frames = "FRAMES",
7
+ Images = "IMAGES",
8
+ Media = "MEDIA",
9
+ Navigation = "NAVIGATION",
10
+ Scripts = "SCRIPTS",
11
+ Styles = "STYLES"
12
+ }
13
+ export declare enum EgressCategory {
14
+ ANALYTICS = "analytics"
15
+ }
16
+ export declare type EgressPermissions = {
17
+ type: EgressType;
18
+ addresses: string[];
19
+ category?: EgressCategory;
20
+ inScopeEUD?: boolean;
21
+ };
22
+ export declare type EgressPermissionsSimplified = Omit<EgressPermissions, 'inScopeEUD' | 'enabled' | 'category'>;
23
+ interface ConfigOverrides {
24
+ ALLOW_EGRESS_ANALYTICS?: boolean;
25
+ }
26
+ declare const getEgressesBasedOnToggles: (input: {
27
+ overrides: ConfigOverrides;
28
+ egress: EgressPermissions[];
29
+ }) => EgressPermissionsSimplified[];
30
+ export { sortAndGroupEgressPermissionsByDomain, getEgressesBasedOnToggles };
3
31
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/egress/utils.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,qCAAqC,oBAAqB,MAAM,EAAE,KAAG,MAAM,MAAM,CA6BtF,CAAC;AAEF,OAAO,EAAE,qCAAqC,EAAE,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/egress/utils.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,qCAAqC,oBAAqB,MAAM,EAAE,KAAG,MAAM,MAAM,CA6BtF,CAAC;AAEF,oBAAY,UAAU;IACpB,gBAAgB,uBAAuB;IACvC,eAAe,sBAAsB;IACrC,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,UAAU,eAAe;IACzB,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB;AAED,oBAAY,cAAc;IACxB,SAAS,cAAc;CACxB;AAED,oBAAY,iBAAiB,GAAG;IAC9B,IAAI,EAAE,UAAU,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,oBAAY,2BAA2B,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC;AAEzG,UAAU,eAAe;IACvB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,QAAA,MAAM,yBAAyB,UAAW;IACxC,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,EAAE,iBAAiB,EAAE,CAAC;CAC7B,KAAG,2BAA2B,EAqB9B,CAAC;AAEF,OAAO,EAAE,qCAAqC,EAAE,yBAAyB,EAAE,CAAC"}
@@ -1,10 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.sortAndGroupEgressPermissionsByDomain = void 0;
3
+ exports.getEgressesBasedOnToggles = exports.sortAndGroupEgressPermissionsByDomain = exports.EgressCategory = exports.EgressType = void 0;
4
4
  const minimatch_1 = require("minimatch");
5
5
  const url_parser_1 = require("./url-parser");
6
6
  const sortAndGroupEgressPermissionsByDomain = (egressAddresses) => {
7
- if ((egressAddresses === null || egressAddresses === void 0 ? void 0 : egressAddresses.length) === 0) {
7
+ if (egressAddresses?.length === 0) {
8
8
  return [];
9
9
  }
10
10
  const protocolRegex = /^(.*?:\/\/)/;
@@ -29,3 +29,39 @@ const sortAndGroupEgressPermissionsByDomain = (egressAddresses) => {
29
29
  }, []);
30
30
  };
31
31
  exports.sortAndGroupEgressPermissionsByDomain = sortAndGroupEgressPermissionsByDomain;
32
+ var EgressType;
33
+ (function (EgressType) {
34
+ EgressType["FetchBackendSide"] = "FETCH_BACKEND_SIDE";
35
+ EgressType["FetchClientSide"] = "FETCH_CLIENT_SIDE";
36
+ EgressType["Fonts"] = "FONTS";
37
+ EgressType["Frames"] = "FRAMES";
38
+ EgressType["Images"] = "IMAGES";
39
+ EgressType["Media"] = "MEDIA";
40
+ EgressType["Navigation"] = "NAVIGATION";
41
+ EgressType["Scripts"] = "SCRIPTS";
42
+ EgressType["Styles"] = "STYLES";
43
+ })(EgressType = exports.EgressType || (exports.EgressType = {}));
44
+ var EgressCategory;
45
+ (function (EgressCategory) {
46
+ EgressCategory["ANALYTICS"] = "analytics";
47
+ })(EgressCategory = exports.EgressCategory || (exports.EgressCategory = {}));
48
+ const getEgressesBasedOnToggles = (input) => {
49
+ const filteredEgresses = input.egress.filter((egress) => {
50
+ if (egress.category === EgressCategory.ANALYTICS) {
51
+ return input.overrides.ALLOW_EGRESS_ANALYTICS !== false;
52
+ }
53
+ return true;
54
+ });
55
+ const egressByType = new Map();
56
+ for (const egress of filteredEgresses) {
57
+ if (!egressByType.has(egress.type)) {
58
+ egressByType.set(egress.type, egress.addresses);
59
+ }
60
+ egressByType.set(egress.type, [...egressByType.get(egress.type), ...egress.addresses]);
61
+ }
62
+ return [...egressByType.entries()].map(([type, egresses]) => ({
63
+ type,
64
+ addresses: [...new Set(egresses)]
65
+ }));
66
+ };
67
+ exports.getEgressesBasedOnToggles = getEgressesBasedOnToggles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/egress",
3
- "version": "1.2.13",
3
+ "version": "1.3.0-next.0",
4
4
  "description": "Helpers and utils for egress implementation in Forge apps",
5
5
  "main": "out/index.js",
6
6
  "author": "Atlassian",