pryv 2.1.9 → 2.3.1

package/src/index.js

@@ -1,3 +1,20 @@
-const Pryv = require('./Pryv');
-
-module.exports = Pryv;
+/**
+ * @license
+ * [BSD-3-Clause](https://github.com/pryv/lib-js/blob/master/LICENSE)
+ */
+/**
+ * `pryv` library
+ * @exports pryv
+ * @property {pryv.Service} Service - To interact with Pryv.io at a "Platform level"
+ * @property {pryv.Connection} Connection - To interact with an individual's (user) data set
+ * @property {pryv.Browser} Browser - Browser Tools - Access request helpers and visuals (button)
+ * @property {pryv.utils} utils - Exposes **superagent** for HTTP calls and tools to manipulate Pryv's API Endpoints
+ */
+module.exports = {
+  Service: require('./Service'),
+  Connection: require('./Connection'),
+  Auth: require('./Auth'),
+  Browser: require('./Browser'),
+  utils: require('./utils'),
+  version: require('../package.json').version
+};

package/src/lib/browser-getEventStreamed.js

@@ -1,12 +1,18 @@
+/**
+ * @license
+ * [BSD-3-Clause](https://github.com/pryv/lib-js/blob/master/LICENSE)
+ */
+/* global fetch */
+
+module.exports = getEventStreamed;
 
 /**
  * @private
  * Replacement for getEventStreamed for Browser
  * To be used as long as superagent does not propose it.
- * 
+ *
  */
-async function getEventStreamed(conn, queryParam, parser) {
-
+async function getEventStreamed (conn, queryParam, parser) {
   /**
    * Holds Parser's settings
    */
@@ -14,19 +20,19 @@ async function getEventStreamed(conn, queryParam, parser) {
     ondata: null,
     onend: null,
     encoding: 'utf8'
-  }
+  };
 
   /**
    * Mock Response
    */
   const fakeRes = {
-    setEncoding : function(encoding) {
+    setEncoding: function (encoding) {
       parserSettings.encoding = encoding;
     }, // will receive 'data' and 'end' callbacks
-    on: function(key, f) { 
+    on: function (key, f) {
       parserSettings['on' + key] = f;
     }
-  }
+  };
 
   /**
    * Holds results from the parser
@@ -34,23 +40,22 @@ async function getEventStreamed(conn, queryParam, parser) {
   let errResult;
   let bodyObjectResult;
   /**
-   * 
+   *
    */
-  parser(fakeRes, function (err, bodyObject) { 
+  parser(fakeRes, function (err, bodyObject) {
     errResult = err;
     bodyObjectResult = bodyObject;
   });
 
-
   // ------------   fetch ------------------- //
-  let url = new URL(conn.endpoint + 'events');
+  const url = new URL(conn.endpoint + 'events');
   url.search = new URLSearchParams(queryParam);
-  let fetchParams = {method: 'GET', headers: {Accept: 'application/json'}};
+  const fetchParams = { method: 'GET', headers: { Accept: 'application/json' } };
   if (conn.token) fetchParams.headers.Authorization = conn.token;
 
-  let response = await fetch(url,fetchParams);
+  const response = await fetch(url, fetchParams);
   const reader = response.body.getReader();
-  
+
   while (true) {
     const { done, value } = await reader.read();
     parserSettings.ondata(new TextDecoder(parserSettings.encoding).decode(value));
@@ -67,14 +72,11 @@ async function getEventStreamed(conn, queryParam, parser) {
     body: bodyObjectResult, // from the parser
     statusCode: response.status,
     headers: {}
-  }
+  };
   // add headers to result
-  for (var pair of response.headers.entries()) {
+  for (const pair of response.headers.entries()) {
     result.headers[pair[0]] = pair[1];
   }
 
   return result;
 }
-
-
-module.exports = getEventStreamed;

package/src/lib/json-parser.js

@@ -1,3 +1,7 @@
+/**
+ * @license
+ * [BSD-3-Clause](https://github.com/pryv/lib-js/blob/master/LICENSE)
+ */
 // there two steps 1 find events, then eventDeletions
 const EVENTMARKERS = ['"events":[', '"eventDeletions":['];
 
@@ -10,9 +14,9 @@ module.exports = function (foreachEvent, includeDeletions) {
   let buffer = ''; // temp data
   let body = null; // to be returned
 
-  //IN EVENTS VARS
-  let depth = 0; // level of depth in brackets 
-  let inString = false; // cursor is in a String 
+  // IN EVENTS VARS
+  let depth = 0; // level of depth in brackets
+  let inString = false; // cursor is in a String
   let skipNextOne = false; // when a backslash is found
   let cursorPos = 0; // position of Character Cursor
 
@@ -24,11 +28,11 @@ module.exports = function (foreachEvent, includeDeletions) {
     A_BEFORE_EVENTS: 0,
     B_IN_EVENTS: 1,
     D_AFTER_EVENTS: 2
-  }
+  };
 
   let state = states.A_BEFORE_EVENTS;
 
-  function processBuffer() {
+  function processBuffer () {
     switch (state) {
       case states.A_BEFORE_EVENTS:
         searchStartEvents();
@@ -42,10 +46,9 @@ module.exports = function (foreachEvent, includeDeletions) {
     }
   }
 
-
-  function searchStartEvents() {
-    // search for "events": and happend any info before to the body 
-    var n = buffer.indexOf(EVENTMARKERS[eventOrEventDeletions]);
+  function searchStartEvents () {
+    // search for "events": and happend any info before to the body
+    const n = buffer.indexOf(EVENTMARKERS[eventOrEventDeletions]);
     if (n > 0) {
       if (eventOrEventDeletions === 0) { // do only once
         body = buffer.substring(0, n);
@@ -56,8 +59,7 @@ module.exports = function (foreachEvent, includeDeletions) {
     }
   }
 
-
-  function processEvents() {
+  function processEvents () {
     /// ---- in Event
     while (cursorPos < buffer.length && (state === states.B_IN_EVENTS)) {
       if (skipNextOne) { // ignore next character
@@ -66,7 +68,7 @@ module.exports = function (foreachEvent, includeDeletions) {
         continue;
       }
       switch (buffer.charCodeAt(cursorPos)) {
-        case 93:  // ]
+        case 93: // ]
           if (depth === 0) { // end of events
             if (cursorPos !== 0) {
               throw new Error('Found trailling ] in mid-course');
@@ -75,20 +77,20 @@ module.exports = function (foreachEvent, includeDeletions) {
               state = states.A_BEFORE_EVENTS;
               eventOrEventDeletions = 1; // now look for eventDeletions
               return;
-            } else { // done 
+            } else { // done
               state = states.D_AFTER_EVENTS;
               let eventsOrDeletionMsg = '';
               if (eventOrEventDeletions === 1) {
-                eventsOrDeletionMsg = '"eventDeletionsCount":' + eventDeletionsCount + ','
+                eventsOrDeletionMsg = '"eventDeletionsCount":' + eventDeletionsCount + ',';
               }
               buffer = eventsOrDeletionMsg + '"eventsCount":' + eventsCount + '' + buffer.substr(1);
             }
           }
           break;
-        case 92:  // \
+        case 92: // \
           skipNextOne = true;
           break;
-        case 123:  // {
+        case 123: // {
           if (!inString) depth++;
           break;
         case 34: // "
@@ -100,13 +102,13 @@ module.exports = function (foreachEvent, includeDeletions) {
             // ignore possible coma ',' if first char
             const ignoreComa = (buffer.charCodeAt(0) === 44) ? 1 : 0;
             const eventStr = buffer.substring(ignoreComa, cursorPos + 1);
-            
+
             if (eventOrEventDeletions === 0) {
               eventsCount++;
             } else {
               eventDeletionsCount++;
             }
-            buffer = buffer.substr(cursorPos + 1 );
+            buffer = buffer.substr(cursorPos + 1);
             addEvent(eventStr);
             cursorPos = -1;
           }
@@ -116,11 +118,10 @@ module.exports = function (foreachEvent, includeDeletions) {
     }
   }
 
-  function afterEvents() {
+  function afterEvents () {
     // just happend the end of message;
     body += buffer;
     buffer = '';
-    return;
   }
 
   return function (res, fn) {
@@ -147,10 +148,8 @@ module.exports = function (foreachEvent, includeDeletions) {
     });
   };
 
-
   /// --- Direct Push
-  function addEvent(strEvent) {
+  function addEvent (strEvent) {
     foreachEvent(JSON.parse(strEvent));
   }
-
-};
+};

package/src/utils.js

@@ -1,52 +1,53 @@
-
+/**
+ * @license
+ * [BSD-3-Clause](https://github.com/pryv/lib-js/blob/master/LICENSE)
+ */
 const regexAPIandToken = /(.+):\/\/(.+)@(.+)/gm;
 const regexSchemaAndPath = /(.+):\/\/(.+)/gm;
 
 /**
  * Utilities to access Pryv API.
- * Exposes superagent and methods to manipulate Pryv's api endpoints 
- * @memberof Pryv
- * @namespace Pryv.utils
+ * Exposes superagent and methods to manipulate API endpoints
+ * @memberof pryv
+ * @namespace pryv.utils
  */
-const utils = {
-
+const utils = module.exports = {
   /**
    * Exposes superagent https://visionmedia.github.io/superagent/
-   * @memberof Pryv.utils
-   * @property {Superagent} superagent 
+   * @memberof pryv.utils
+   * @property {Superagent} superagent
    */
   superagent: require('superagent'),
 
   /**
    * Returns true is run in a browser
-   * @memberof Pryv.utils
+   * @memberof pryv.utils
    * @returns {boolean}
    */
-  isBrowser: function() {
-      return typeof window !== 'undefined' && typeof document !== 'undefined';
+  isBrowser: function () {
+    return typeof window !== 'undefined' && typeof document !== 'undefined';
   },
 
-
   /**
-   * From a PryvApiEndpoint URL, return an object (TokenAndAPI) with two properties
-   * @memberof Pryv.utils
-   * @param {PryvApiEndpoint} pryvApiEndpoint
+   * From a APIEndpoint URL, return an object (TokenAndAPI) with two properties
+   * @memberof pryv.utils
+   * @param {APIEndpoint} apiEndpoint
    * @returns {TokenAndEndpoint}
    */
-  extractTokenAndApiEndpoint: function (pryvApiEndpoint) {
+  extractTokenAndAPIEndpoint: function (apiEndpoint) {
     regexAPIandToken.lastIndex = 0;
-    const res = regexAPIandToken.exec(pryvApiEndpoint);
+    const res = regexAPIandToken.exec(apiEndpoint);
 
-    if (res !== null) { // has token
+    if (res !== null) { // has token
       // add a trailing '/' to end point if missing
       if (!res[3].endsWith('/')) {
         res[3] += '/';
       }
-      return { endpoint: res[1] + '://' + res[3], token: res[2] }
+      return { endpoint: res[1] + '://' + res[3], token: res[2] };
     }
     // else check if valid url
     regexSchemaAndPath.lastIndex = 0;
-    const res2 = regexSchemaAndPath.exec(pryvApiEndpoint);
+    const res2 = regexSchemaAndPath.exec(apiEndpoint);
     if (res2 === null) {
       throw new Error('Cannot find endpoint, invalid URL format');
     }
@@ -55,41 +56,42 @@ const utils = {
       res2[2] += '/';
     }
 
-    return { endpoint: res2[1] + '://' + res2[2] , token: null }
+    return { endpoint: res2[1] + '://' + res2[2], token: null };
   },
 
   /**
-   * Get a PryvApiEndpoint URL from a TokenAndAPI object
-   * @memberof Pryv.utils
-   * @param {TokenAndEndpoint} tokenAndApi
-   * @returns {PryvApiEndpoint}
+   * Get a APIEndpoint URL from a TokenAndAPI object
+   * @memberof pryv.utils
+   * @param {TokenAndEndpoint} tokenAndAPI
+   * @returns {APIEndpoint}
    */
-  buildPryvApiEndpoint: function (tokenAndApi) {
-    if (! tokenAndApi.token) { 
-      let res = tokenAndApi.endpoint + '';
-      if (!tokenAndApi.endpoint.endsWith('/')) {
+  buildAPIEndpoint: function (tokenAndAPI) {
+    if (!tokenAndAPI.token) {
+      let res = tokenAndAPI.endpoint + '';
+      if (!tokenAndAPI.endpoint.endsWith('/')) {
         res += '/';
       }
-      return res; 
+      return res;
     }
     regexSchemaAndPath.lastIndex = 0;
-    let res = regexSchemaAndPath.exec(tokenAndApi.endpoint);
+    const res = regexSchemaAndPath.exec(tokenAndAPI.endpoint);
     // add a trailing '/' to end point if missing
     if (!res[2].endsWith('/')) {
       res[2] += '/';
     }
-    return res[1] + '://' + tokenAndApi.token + '@' + res[2];
+    return res[1] + '://' + tokenAndAPI.token + '@' + res[2];
   },
 
   /**
-   * 
-   * @param {Object} [navigatorForTests] mock navigator var only for testing purposes 
+   *
+   * @param {Object} [navigatorForTests] mock navigator var only for testing purposes
    */
   browserIsMobileOrTablet: function (navigator) {
     if (navigator == null) {
       return false;
     }
     let check = false;
+    // eslint-disable-next-line no-useless-escape
     (function (a) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true; })(navigator.userAgent || navigator.vendor || navigator.opera);
     return check;
   },
@@ -100,37 +102,47 @@ const utils = {
   },
 
   getQueryParamsFromURL: function (url) {
-    let vars = {};
+    const vars = {};
     const QUERY_REGEXP = /[?#&]+([^=&]+)=([^&]*)/g;
     url.replace(QUERY_REGEXP,
       function (m, key, value) {
         vars[key] = decodeURIComponent(value);
       });
     return vars;
-  }  
-}
+  }
+};
 
-module.exports = utils;
+// TODO: remove following deprecated aliases with next major version
+
+/**
+ * @deprecated Renamed to `extractTokenAndAPIEndpoint()`
+ */
+utils.extractTokenAndApiEndpoint = utils.extractTokenAndAPIEndpoint;
+
+/**
+ * @deprecated Renamed to `buildAPIEndpoint()`
+ */
+// TODO: remove deprecated alias with next major version
+utils.buildPryvApiEndpoint = utils.buildAPIEndpoint;
 
 // --------------- typedfs ------------------------------- //
 
 /**
  * An object with two properties: token & apiEndpoint
  * @typedef {Object} TokenAndEndpoint
- * @property {string}  [token] Authorization token
- * @property {string}  endpoint url of Pryv api endpoint
+ * @property {string} [token] Authorization token
+ * @property {string} endpoint url of API endpoint
  */
 
 /**
  * A String url of the form http(s)://{token}@{apiEndpoint}
- * @typedef {string} PryvApiEndpoint
+ * @typedef {string} APIEndpoint
  */
 
-
 /**
  * Common Meta are returned by each standard call on the API https://api.pryv.com/reference/#in-method-results
  * @typedef {Object} CommonMeta
  * @property {string} apiVersion The version of the API in the form {major}.{minor}.{revision}. Mirrored in HTTP header API-Version.
  * @property {number} serverTime The current server time as a timestamp in second. Keeping track of server time is necessary to properly handle time in API calls.
  * @property {string} serial The serial will change every time the core or register is updated. If you compare it with the serial of a previous response and notice a difference, you should reload the service information.
- */
+ */

package/test/Browser.AuthController.test.js

@@ -1,34 +1,38 @@
-const expect = chai.expect;
+/**
+ * @license
+ * [BSD-3-Clause](https://github.com/pryv/lib-js/blob/master/LICENSE)
+ */
+/* global describe, it, before, after, expect, testData, Browser */
+/* eslint-disable no-unused-expressions */
 
 const utils = require('../src/utils.js');
 const Service = require('../src/Service');
 const AuthController = require('../src/Auth/AuthController.js');
-const testData = require('./test-data.js');
 
-describe('Browser.LoginButton', function() {
-  this.timeout(5000); 
+describe('Browser.LoginButton', function () {
+  this.timeout(5000);
 
   let auth;
   let removeZombie = false;
-  before(async function() {
+  before(async function () {
     if (typeof document !== 'undefined') return; // in browser
     removeZombie = true;
     const browser = new Browser();
-    browser.visit('./?pryvServiceInfoUrl=https://zouzou.com/service/info');
+    browser.visit('./?pryvServiceInfoUrl=https://zou.zou/service/info');
     global.document = browser.document;
     global.window = browser.window;
     global.location = browser.location;
     global.navigator = { userAgent: 'Safari' };
   });
 
-  after(async function() {
+  after(async function () {
     if (!removeZombie) return; // in browser
     delete global.document;
     delete global.window;
     delete global.location;
   });
-  before(async function() {
-    let service = new Service(testData.serviceInfoUrl);
+  before(async function () {
+    const service = new Service(testData.serviceInfoUrl);
     await service.info();
     auth = new AuthController({
       authRequest: {
@@ -38,8 +42,8 @@ describe('Browser.LoginButton', function() {
     }, service);
     await auth.init();
   });
-  
-  it('getReturnURL()', async function() {
+
+  it('getReturnURL()', async function () {
     const myUrl = 'https://mysite.com/bobby';
     let error = null;
     try {
@@ -57,24 +61,22 @@ describe('Browser.LoginButton', function() {
 
     expect(auth.getReturnURL('http://zou.zou/toto#', myUrl, fakeNavigator)).to.equal('http://zou.zou/toto#');
 
-    fakeNavigator =  { userAgent: 'Safari' };
+    fakeNavigator = { userAgent: 'Safari' };
     expect(auth.getReturnURL('auto#', myUrl, fakeNavigator)).to.equal(false);
     expect(auth.getReturnURL('auto?', myUrl, fakeNavigator)).to.equal(false);
     expect(auth.getReturnURL(false, myUrl, fakeNavigator)).to.equal(false);
     expect(auth.getReturnURL('self?', myUrl, fakeNavigator)).to.equal(myUrl + '?');
     expect(auth.getReturnURL('http://zou.zou/toto#', myUrl, fakeNavigator)).to.equal('http://zou.zou/toto#');
-    global.window = { location: { href: myUrl + '?prYvstatus=zouzou'} }
+    global.window = { location: { href: myUrl + '?prYvstatus=zouzou' } };
     expect(auth.getReturnURL('self?', myUrl, fakeNavigator)).to.equal(myUrl + '?');
   });
 
-  it('browserIsMobileOrTablet()', async function() {
+  it('browserIsMobileOrTablet()', async function () {
     expect(utils.browserIsMobileOrTablet({ userAgent: 'android' })).to.be.true;
     expect(utils.browserIsMobileOrTablet({ userAgent: 'Safari' })).to.be.false;
   });
 
-
-  it('cleanURLFromPrYvParams()', async function() {
-
+  it('cleanURLFromPrYvParams()', async function () {
     expect('https://my.Url.com/?bobby=2').to.equal(utils.cleanURLFromPrYvParams(
       'https://my.Url.com/?bobby=2&prYvZoutOu=1&prYvstatus=2jsadh'));
 
@@ -89,9 +91,5 @@ describe('Browser.LoginButton', function() {
 
     expect('https://my.Url.com/#bobby=2').to.equal(utils.cleanURLFromPrYvParams(
       'https://my.Url.com/#bobby=2&prYvZoutOu=1&prYvstatus=2jsadh'));
-    
   });
-
 });
-
-

package/test/Browser.test.js

@@ -1,24 +1,25 @@
+/**
+ * @license
+ * [BSD-3-Clause](https://github.com/pryv/lib-js/blob/master/LICENSE)
+ */
+/* global describe, it, before, after, expect, Browser, pryv, testData */
+/* eslint-disable no-unused-expressions */
 
-const should = chai.should();
-const expect = chai.expect;
-
-const testData = require('./test-data.js');
-
-function genSettings() {
-  function defaultStateChange(state) { 
-    console.log('Test unimplemented on state change', state); 
+function genSettings () {
+  function defaultStateChange (state) {
+    console.log('Test unimplemented on state change', state);
   }
   return {
     authRequest: {
       requestingAppId: 'lib-js-test',
-      requestedPermissions: [{ streamId: '*', level: 'read' }],
+      requestedPermissions: [{ streamId: '*', level: 'read' }]
     },
     onStateChange: defaultStateChange
   };
 }
 
 describe('Browser', function () {
-  this.timeout(5000); 
+  this.timeout(5000);
 
   before(async function () {
     this.timeout(5000);
@@ -31,11 +32,11 @@ describe('Browser', function () {
     if (typeof document !== 'undefined') return; // in browser
     removeZombie = true;
     const browser = new Browser();
-    browser.visit('./?pryvServiceInfoUrl=https://zouzou.com/service/info');
+    browser.visit('./?pryvServiceInfoUrl=https://zou.zou/service/info');
     global.document = browser.document;
     global.window = browser.window;
     global.location = browser.location;
-    global.navigator = {userAgent: 'Safari'};
+    global.navigator = { userAgent: 'Safari' };
   });
 
   after(async () => {
@@ -49,31 +50,27 @@ describe('Browser', function () {
     const settings = genSettings();
     let AuthLoaded = false;
     settings.onStateChange = function (state) {
-      should.exist(state.id);
-      if (state.id == Pryv.Auth.AuthStates.LOADING) {
+      expect(state.id).to.exist;
+      if (state.id === pryv.Auth.AuthStates.LOADING) {
         AuthLoaded = true;
       }
-      if (state.id == Pryv.Auth.AuthStates.INITIALIZED) {
+      if (state.id === pryv.Auth.AuthStates.INITIALIZED) {
         expect(AuthLoaded).to.true;
       }
-    }
+    };
 
     try {
-      const service = await Pryv.Auth.setupAuth(settings, testData.serviceInfoUrl);
+      const service = await pryv.Auth.setupAuth(settings, testData.serviceInfoUrl);
       const serviceInfo = service.infoSync();
-      should.exist(serviceInfo.access);
-      should.exist(serviceInfo.serial);
-    } catch(error) {
+      expect(serviceInfo.access).to.exist;
+      expect(serviceInfo.serial).to.exist;
+    } catch (error) {
       console.log(error);
-      should.not.exist(error);
+      expect(error).to.not.exist;
     }
   });
 
-
   it('serviceInfoFromUrl()', async () => {
-    expect('https://zouzou.com/service/info').to.equal(Pryv.Browser.serviceInfoFromUrl());
+    expect('https://zou.zou/service/info').to.equal(pryv.Browser.serviceInfoFromUrl());
   });
-
 });
-
-