Fix validation error of protocol not being returned (#843)

Fixes #830
web-push-libs · Sep 1, 2023 · 15dc7b3 · 15dc7b3
1 parent bb168da
commit 15dc7b3
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/vapid-helper.js b/src/vapid-helper.js
@@ -75,19 +75,20 @@ function validateSubject(subject) {
     + 'mailto: address. ' + subject);
   }
 
+  let subjectParseResult = null;
   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.');
-    }
+    subjectParseResult = new URL(subject);
   } catch (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) {