From 0403ccb3d103df1a11f8007a6cc21b745a276882 Mon Sep 17 00:00:00 2001
From: Ernest Okot <okot08@gmail.com>
Date: Sun, 17 Mar 2019 15:22:50 +0300
Subject: [PATCH] fix: remove moment dependency

---
 README.md                 | 12 ++----------
 examples/disbursements.js |  6 +-----
 package-lock.json         |  5 -----
 package.json              |  4 ++--
 src/auth.ts               | 10 ++++------
 5 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index a421f13..9f654ff 100644
--- a/README.md
+++ b/README.md
@@ -128,11 +128,7 @@ collections
   })
   .then(accountBalance => console.log({ accountBalance }))
   .catch(error => {
-    if (error.response) {
-      return console.log(error.response.data, error.response.config);
-    }
-
-    return console.log(error.message);
+    console.log(error);
   });
 ```
 
@@ -211,10 +207,6 @@ disbursements
   })
   .then(accountBalance => console.log({ accountBalance }))
   .catch(error => {
-    if (error.response) {
-      console.log(error.response.data, error.response.config);
-    }
-
-    console.log(error.message);
+    console.log(error);
   });
 ```
diff --git a/examples/disbursements.js b/examples/disbursements.js
index 8a2d8cb..1fa9fc4 100644
--- a/examples/disbursements.js
+++ b/examples/disbursements.js
@@ -37,9 +37,5 @@ disbursements
   })
   .then(accountBalance => console.log({ accountBalance }))
   .catch(error => {
-    if (error.response) {
-      console.log(error.response.data, error.response.config);
-    }
-
-    console.log(error.message);
+    console.log(error);
   });
diff --git a/package-lock.json b/package-lock.json
index 4354d66..7384dab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3454,11 +3454,6 @@
       "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
       "dev": true
     },
-    "moment": {
-      "version": "2.22.2",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
-      "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
diff --git a/package.json b/package.json
index dd7a2fc..7eaefa4 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
   },
   "keywords": [
     "MTN",
-    "Mobile Money",
+    "Mobile",
+    "Money",
     "Momo",
     "TypeScript",
     "NodeJS"
@@ -37,7 +38,6 @@
   "dependencies": {
     "axios": "^0.18.0",
     "commander": "^2.19.0",
-    "moment": "^2.22.2",
     "uuid": "^3.3.2"
   },
   "devDependencies": {
diff --git a/src/auth.ts b/src/auth.ts
index 49db9b2..9d07ea2 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -1,5 +1,4 @@
 import { AxiosInstance } from "axios";
-import moment from "moment";
 
 import { createClient } from "./client";
 
@@ -14,7 +13,7 @@ export type Authorizer = (
 
 interface OAuthCredentials {
   accessToken: string;
-  expires: Date;
+  expires: number;
 }
 
 export function createTokenRefresher(
@@ -27,11 +26,10 @@ export function createTokenRefresher(
       return authorize(config)
         .then((accessToken: AccessToken) => {
           const { access_token, expires_in }: AccessToken = accessToken;
+          const expires: number = Date.now() + expires_in * 1000 - 60000;
           return {
             accessToken: access_token,
-            expires: moment()
-              .add(expires_in, "seconds")
-              .toDate()
+            expires
           };
         })
         .then(freshCredentials => {
@@ -83,5 +81,5 @@ function isExpired(credentials: OAuthCredentials): boolean {
     return true;
   }
 
-  return moment().isAfter(credentials.expires);
+  return Date.now() > credentials.expires;
 }