Added debug case for auth errors

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ulms/api-clients",
-  "version": "5.14.1",
+  "version": "5.15.0",
   "description": "JavaScript API clients for ULMS platform",
   "keywords": [],
   "homepage": "https://github.com/foxford/ulms-api-clients-js#readme",

src/basic-client.js

@@ -29,6 +29,7 @@ class BasicClient {
     this.httpClient = httpClient
     this.tokenProvider = tokenProvider
     this.labels = {}
+    this.trackEvent = undefined
   }
 
   url(endpoint, parameters) {
@@ -76,6 +77,10 @@ class BasicClient {
     }
   }
 
+  setTrackEventFunction(trackEvent) {
+    this.trackEvent = trackEvent
+  }
+
   clearLabels() {
     this.labels = {}
   }
@@ -110,6 +115,34 @@ class BasicClient {
     }
     const requestOptions = { ...options, headers }
 
+    // [debug section] start
+    if (this.trackEvent) {
+      const { exp } = JSON.parse(atob(token.split('.')[1]))
+      const requestStart = Date.now()
+      const expiresAtLocal = this.tokenProvider.tokenData
+        ? this.tokenProvider.tokenData.expires_ts
+        : undefined
+      const result = this.httpClient.post(url, data, requestOptions)
+
+      result.catch((error) => {
+        const responseEnd = Date.now()
+
+        const eventPayload = {
+          exp: exp * 1000,
+          expiresAtLocal,
+          requestStart,
+          responseEnd,
+        }
+
+        if (error && error.type === 'invalid_authentication') {
+          this.trackEvent(eventPayload)
+        }
+      })
+
+      return result
+    }
+    // [debug section] end
+
     return this.httpClient.post(url, data, requestOptions)
   }
 

src/dispatcher.js

@@ -147,8 +147,16 @@ class Dispatcher extends BasicClient {
    * @returns {Promise}
    */
   updatePosition(kind, classId, position) {
-    return this.post(`${this.baseUrl}/${kind}/${classId}/timestamps`, {
-      position,
+    const controller = new AbortController()
+    const { signal } = controller
+    const timeoutId = setTimeout(() => controller.abort(), 10 * 1000)
+
+    return this.post(
+      `${this.baseUrl}/${kind}/${classId}/timestamps`,
+      { position },
+      { signal }
+    ).finally(() => {
+      clearTimeout(timeoutId)
     })
   }
 }

src/token-provider.js

@@ -9,6 +9,7 @@ class TokenProvider {
     this.httpClient = httpClient
     this.tokenData = undefined
     this.tokenP = undefined
+    this.tokenRequestStart = undefined
   }
 
   setContext(context) {
@@ -27,6 +28,7 @@ class TokenProvider {
 
     if (isTokenDataEmpty || isAccessTokenExpired) {
       this.tokenP = makeDeferred()
+      this.tokenRequestStart = Date.now()
 
       this.fetchTokenData()
         .then((response) => {
@@ -44,10 +46,20 @@ class TokenProvider {
   }
 
   fetchTokenData() {
+    const controller = new AbortController()
+    const { signal } = controller
+    const timeoutId = setTimeout(() => controller.abort(), 10 * 1000)
     const qs = this.context ? `?context=${this.context}` : ''
     const url = `${this.baseUrl}/api/user/ulms_token${qs}`
 
-    return this.httpClient.post(url, undefined, { credentials: 'include' })
+    return this.httpClient
+      .post(url, undefined, {
+        credentials: 'include',
+        signal,
+      })
+      .finally(() => {
+        clearTimeout(timeoutId)
+      })
   }
 
   rejectAndReset(error) {
@@ -85,17 +97,19 @@ class TokenProvider {
     this.tokenP.reject(transformedError)
 
     this.tokenP = undefined
+    this.tokenRequestStart = undefined
   }
 
   resolveAndReset() {
     this.tokenP.resolve(this.tokenData.access_token)
 
     this.tokenP = undefined
+    this.tokenRequestStart = undefined
   }
 
   updateTokenData(updates) {
     const { expires_in } = updates
-    const expires_ts = Date.now() + expires_in * 1e3 - 10e3
+    const expires_ts = this.tokenRequestStart + expires_in * 1e3 - 20e3
 
     this.tokenData = {
       ...this.tokenData,