Merge pull request #46 from amio-io/fix_reconnect

fix: fixed a case where we would get different session id after reconnect

package.json

@@ -1,6 +1,6 @@
 {
   "name": "amio-chat-sdk-web",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Amio Chat JavaScript SDK for custom webchat implementation. https://amio.io",
   "main": "lib/amio-chat-sdk-web.js",
   "module": "src/amio-chat-client.js",

src/connection/connection.js

@@ -87,6 +87,14 @@ class Connection {
         reject(`Connection rejected from server. Error: ${JSON.stringify(error)}`)
       })
 
+      this.socket.on('reconnect_attempt', () => {
+        // if we didn't set the sessionId here, we could end up with a new one after reconnect
+        const sessionId = session.getId()
+        if(sessionId) {
+          this.socket.io.opts.query.session_id = sessionId
+        }
+      })
+
       this.socket.on(SOCKET_IO_DISCONNECT, () => {
         this.online = false
         this.connectionStateChangedHandler(this.online)

src/connection/session.js

@@ -4,24 +4,23 @@ import {
 
 class Session {
 
-  constructor() {
+  _getStorage() {
     if(window.localStorage) {
-      this.storage = window.localStorage
-    } else {
-      this.storage = new TestStorage()
+      return window.localStorage
     }
+    return new TestStorage()
   }
 
   getId() {
-    return this.storage.getItem(STORAGE_SESSION_NAME)
+    return this._getStorage().getItem(STORAGE_SESSION_NAME)
   }
 
   setId(value) {
-    return this.storage.setItem(STORAGE_SESSION_NAME, value)
+    return this._getStorage().setItem(STORAGE_SESSION_NAME, value)
   }
 
   clear() {
-    return this.storage.removeItem(STORAGE_SESSION_NAME)
+    return this._getStorage().removeItem(STORAGE_SESSION_NAME)
   }
 }