Fix issues noted by eslint

marc1706 · Feb 27, 2024 · 4e03bf6 · 4e03bf6
1 parent 4f1abdd
commit 4e03bf6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/PushApiModel.js b/src/PushApiModel.js
@@ -162,10 +162,10 @@ class PushApiModel {
 	 * @returns {void}
 	 */
 	expireSubscription(clientHash) {
-		if (typeof this.subscriptions[clientHash] !== 'undefined') {
-			this.subscriptions[clientHash].isExpired = true;
-		} else {
+		if (typeof this.subscriptions[clientHash] === 'undefined') {
 			throw new RangeError('Subscription with specified client hash does not exist');
+		} else {
+			this.subscriptions[clientHash].isExpired = true;
 		}
 	}
 
@@ -346,6 +346,6 @@ class PushApiModel {
 }
 
 module.exports = {
-	PushApiModel: PushApiModel,
-	SubscriptionExpiredError: SubscriptionExpiredError,
+	PushApiModel,
+	SubscriptionExpiredError,
 };
diff --git a/src/server.js b/src/server.js
@@ -8,7 +8,7 @@
  * https://opensource.org/licenses/MIT.
  *
  */
-const {SubscriptionExpiredError} = require("./PushApiModel");
+const {SubscriptionExpiredError} = require('./PushApiModel');
 
 let apiModel = {};
 
@@ -134,7 +134,7 @@ class WebPushTestingServer {
 			res.status(400).send({
 				error: {
 					message: err.message,
-				}
+				},
 			});
 		}
 

diff --git a/test/PushApiModelTest.js b/test/PushApiModelTest.js
@@ -196,19 +196,20 @@ describe('Push API Model tests', () => {
 			assert.isTrue(model.isSubscriptionExpired(subscribeReturn.clientHash));
 		});
 
-		it ('Invalid subscription is properly handled', async () => {
+		it('Invalid subscription is properly handled', async () => {
 			const model = new PushApiModel();
 
 			assert.isFalse(model.isSubscriptionExpired('doesNotExist'));
 
 			try {
 				model.expireSubscription('doesNotExist');
-			} catch(err) {
+			} catch (err) {
 				assert.instanceOf(err, RangeError);
 				assert.equal(err.message, 'Subscription with specified client hash does not exist');
 			}
+
 			assert.isFalse(model.isSubscriptionExpired('doesNotExist'));
-		})
+		});
 	});
 
 	describe('Validate notification headers', () => {