fix encoding

Author: Francesca-Bit

lib/utils.js

@@ -44,11 +44,12 @@ Utils.encodeURISegment = function (str) {
   if (typeof str !== 'string') return str;
   str = encodeURI(str);
   str = str.replace(/\?/g, '%3F');
+  // we not need = because the server does not encode it
   // str = str.replace(/=/g, '%3D');
-  // str = str.replace(/&/g, '%26');
+  // str = str.replace(/@/g, '%40');
+  str = str.replace(/&/g, '%26');
   str = str.replace(/\+/g, '%2B');
   str = str.replace(/#/g, '%23');
-  // str = str.replace(/@/g, '%40');
   return str;
 };
 

test/connectionConfing.spec.js

@@ -269,7 +269,7 @@ describe('connectionConfig tests', () => {
     it('check baseUrlEncode', function() {
         const db = "%6277&ˆˆˆ@ˆˆWˆTWTET#Y@&&GHHSHHS"
         connectionConfig.setDB(db)
-        const dbBase = 'http://localhost:6363/api/woql/123/%256277&%CB%86%CB%86%CB%86@%CB%86%CB%86W%CB%86TWTET%23Y@&&GHHSHHS'
+        const dbBase = 'http://localhost:6363/api/woql/123/%256277%26%CB%86%CB%86%CB%86@%CB%86%CB%86W%CB%86TWTET%23Y@%26%26GHHSHHS'
         expect(connectionConfig.dbBase('woql')).to.equal(dbBase)
         expect(connectionConfig.db()).to.equal(db)
 

test/utils.spec.js

@@ -120,11 +120,11 @@ describe('utils tests', () => {
   });
 
   it('encodeURISegment test &&26567 organization name', () => {
-    expect(UTILS.encodeURISegment("&&26567")).to.equal("&&26567");
+    expect(UTILS.encodeURISegment("&&26567")).to.equal("%26%2626567");
   });
 
   it('encodeURISegment test %6277&ˆˆˆ@ˆˆWˆTWTET#Y@&&GHHSHHS organization name', () => {
-    expect(UTILS.encodeURISegment("%6277&ˆˆˆ@ˆˆWˆTWTET#Y@&&GHHSHHS")).to.equal("%256277&%CB%86%CB%86%CB%86@%CB%86%CB%86W%CB%86TWTET%23Y@&&GHHSHHS");
+    expect(UTILS.encodeURISegment("%6277&ˆˆˆ@ˆˆWˆTWTET#Y@&&GHHSHHS")).to.equal("%256277%26%CB%86%CB%86%CB%86@%CB%86%CB%86W%CB%86TWTET%23Y@%26%26GHHSHHS");
   });
 
 /* it('check convertTimestampToXsd',function(){