Bug fixes and browser compilation

Splash-Inc · Jun 8, 2016 · 1df02c0 · 1df02c0
1 parent c3305af
commit 1df02c0
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 32 deletions.
diff --git a/browser/index.js b/browser/index.js
diff --git a/lib/index.js b/lib/index.js
@@ -4,7 +4,7 @@ if (typeof window !== 'undefined') {
 
 var methods = {
   // Private
-  __getCookieHeader:      require('./private/get_cookie_header'),
+  __setCookieHeader:      require('./private/set_cookie_header'),
   __isLoggedIn:           require('./private/is_logged_in'),
   __getRemoteURL:         require('./private/get_remote_url'),
   __hitWithSessionID:     require('./private/hit_with_session_id'),
@@ -32,8 +32,8 @@ var methods = {
  * */
 function Elvis(server) {
   this.elvisServerURL = server
-  this.sessionId = null
   this.cookieHeader = null
+  this.sessionID = null
   return this
 }
 

diff --git a/lib/private/request.js b/lib/private/request.js
@@ -36,6 +36,7 @@ module.exports = function request(payload) {
       if (data.errorcode) {
         if (data.errorcode === 401) {
           this.cookieHeader = null
+          this.sessionID = null
           payload.failure.call(this, { loggedOut: true })
         } else {
           payload.failure.call(this, data)

diff --git a/lib/private/get_cookie_header.js → lib/private/set_cookie_header.js b/lib/private/get_cookie_header.js → lib/private/set_cookie_header.js
@@ -1,19 +1,19 @@
 var cookie = require('cookie')
 /**
- * Get cookie header
- * @method __getCookieHeader
+ * Set cookie header
+ * @method __setCookieHeader
  * @memberof Elvis.prototype
  * @private
  * @param response {Object} - Response Object
  */
-module.exports = function getCookieHeader(response) {
-  this.cookieHeader = response.header['set-cookie']
+module.exports = function setCookieHeader(response) {
+  this.cookieHeader = typeof document === 'undefined' ? response.header['set-cookie'] : document.cookie
 
   if(this.cookieHeader && this.cookieHeader.forEach) {
     this.cookieHeader.forEach(header => {
       var parsedHeader = cookie.parse(header)
       if (parsedHeader['JSESSIONID']) {
-        this.sessionId = parsedHeader['JSESSIONID']
+        this.sessionID = parsedHeader['JSESSIONID']
       }
     })
   }

diff --git a/lib/public/login.js b/lib/public/login.js
@@ -22,7 +22,7 @@ module.exports = function login(params) {
       failure: reject,
       success: (data, response) => {
         if (data.loginSuccess) {
-          this.__getCookieHeader(response)
+          this.__setCookieHeader(response)
           resolve(data)
         } else {
           reject(data)

diff --git a/lib/public/logout.js b/lib/public/logout.js
@@ -22,6 +22,7 @@ module.exports = function logout() {
 
           } else {
             this.cookieHeader = null
+            this.sessionID = null
             var data = res.body
             resolve(data)
           }

diff --git a/tests/private/get_remote_url.js b/tests/private/get_remote_url.js
@@ -9,24 +9,9 @@ module.exports = function (test, utils, Elvis) {
     t.equal(
         client.__getRemoteURL('/some/path'),
         client.elvisServerURL + '/some/path',
-        'Just concats path with server url, unless logged in')
+        'Just concats path with server url')
 
-    client
-        .login({
-          username: utils.username,
-          password: utils.password
-        })
-        .then(() => {
-
-          t.equal(
-              client.__getRemoteURL('/foo/bar'),
-              client.elvisServerURL + '/foo/bar',
-              'Returns remote url with session id, after login')
-
-          t.end()
-
-        })
-        .catch(utils.catchError(t))
+    t.end()
   })
 
 }