Change approach to fix validation error of protocol not beeing returned

Fixes #830 Change the solution based on the review
web-push-libs · Aug 31, 2023 · d11c300 · d11c300
1 parent a630d81
commit d11c300
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/vapid-helper.js b/src/vapid-helper.js
@@ -77,17 +77,17 @@ function validateSubject(subject) {
 
   try {
     const subjectParseResult = new URL(subject);
-    if (!['https:', 'mailto:'].includes(subjectParseResult.protocol)) {
-      throw new Error('Vapid subject is not an https: or mailto: URL. ' + subject);
-    }
-    if (subjectParseResult.hostname === 'localhost') {
-      console.warn('Vapid subject points to a localhost web URI, which is unsupported by '
-        + 'Apple\'s push notification server and will result in a BadJwtToken error when '
-        + 'sending notifications.');
     }
   } catch (err) {
-    throw new Error('Vapid subject is not a valid URL. ' + subject, { cause: err });
+    throw new Error('Vapid subject is not a valid URL. ' + subject);
+  }
+  if (!['https:', 'mailto:'].includes(subjectParseResult.protocol)) {
+    throw new Error('Vapid subject is not an https: or mailto: URL. ' + subject);
   }
+  if (subjectParseResult.hostname === 'localhost') {
+    console.warn('Vapid subject points to a localhost web URI, which is unsupported by '
+      + 'Apple\'s push notification server and will result in a BadJwtToken error when '
+      + 'sending notifications.');
 }
 
 function validatePublicKey(publicKey) {