@forge/egress 1.1.2 → 1.1.3-next.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/egress
 
+## 1.1.3-next.0
+
+### Patch Changes
+
+- 0da2b48: Removed support for the CLI running on node 14
+
 ## 1.1.2
 
 ### Patch Changes

package/out/egress/egress-filtering-service.d.ts

@@ -2,10 +2,10 @@ export declare class EgressFilteringService {
     private readonly URLs;
     private readonly wildcardDomains;
     private readonly allowsEverything;
+    private readonly DEFAULT_PROTOCOL;
     constructor(allowList: string[]);
-    private safeURL;
+    private parseUrl;
     isValidUrl(url: string): boolean;
-    private domainCheck;
-    private domainIsAllowed;
+    private allowedDomain;
 }
 //# sourceMappingURL=egress-filtering-service.d.ts.map

package/out/egress/egress-filtering-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"egress-filtering-service.d.ts","sourceRoot":"","sources":["../../src/egress/egress-filtering-service.ts"],"names":[],"mappings":"AAGA,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;IACxC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAU;gBAE/B,SAAS,EAAE,MAAM,EAAE;IAU/B,OAAO,CAAC,OAAO;IAQR,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAQvC,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,eAAe;CAWxB"}
+{"version":3,"file":"egress-filtering-service.d.ts","sourceRoot":"","sources":["../../src/egress/egress-filtering-service.ts"],"names":[],"mappings":"AAGA,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;IACxC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAU;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAc;gBAEnC,SAAS,EAAE,MAAM,EAAE;IAU/B,OAAO,CAAC,QAAQ;IAQT,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IASvC,OAAO,CAAC,aAAa;CAKtB"}

package/out/egress/egress-filtering-service.js

@@ -6,37 +6,30 @@ const minimatch_1 = tslib_1.__importDefault(require("minimatch"));
 const url_1 = require("url");
 class EgressFilteringService {
     constructor(allowList) {
-        this.URLs = allowList.filter((domainOrURL) => !domainOrURL.startsWith('*')).map((url) => this.safeURL(url));
+        this.DEFAULT_PROTOCOL = 'https://';
+        this.URLs = allowList.filter((domainOrURL) => !domainOrURL.startsWith('*')).map((url) => this.parseUrl(url));
         this.wildcardDomains = allowList
             .filter((domainOrURL) => domainOrURL !== '*')
-            .map((url) => this.safeURL(url))
+            .map((url) => this.parseUrl(url))
             .filter((url) => decodeURIComponent(url.hostname).startsWith('*'));
         this.allowsEverything = allowList.includes('*');
     }
-    safeURL(url, defaultProtocol = 'https://') {
+    parseUrl(url) {
         const protocolRegex = /^(.*:\/\/)/;
         const urlParser = url_1.URL !== null && url_1.URL !== void 0 ? url_1.URL : window.URL;
-        return new urlParser(protocolRegex.test(url) ? url : `${defaultProtocol}${url}`);
+        return new urlParser(protocolRegex.test(url) ? url : `${this.DEFAULT_PROTOCOL}${url}`);
     }
     isValidUrl(url) {
         if (this.allowsEverything) {
             return true;
         }
-        return this.domainIsAllowed(this.safeURL(url));
+        const parsedUrl = this.parseUrl(url);
+        return this.allowedDomain(parsedUrl, this.URLs) || this.allowedDomain(parsedUrl, this.wildcardDomains);
     }
-    domainCheck(domain, allowList) {
+    allowedDomain(domain, allowList) {
         return allowList
             .filter((allowed) => allowed.protocol === domain.protocol)
             .some((url) => (0, minimatch_1.default)(domain.hostname, decodeURIComponent(url.hostname)));
     }
-    domainIsAllowed(domain) {
-        if (this.domainCheck(domain, this.URLs)) {
-            return true;
-        }
-        if (this.domainCheck(domain, this.wildcardDomains)) {
-            return true;
-        }
-        return false;
-    }
 }
 exports.EgressFilteringService = EgressFilteringService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/egress",
-  "version": "1.1.2",
+  "version": "1.1.3-next.0",
   "description": "Helpers and utils for egress implementation in Forge apps",
   "main": "out/index.js",
   "author": "Atlassian",