v1.0.420

[Bot] push changes from Files.com

Author: files-opensource-bot

_VERSION

@@ -1 +1 @@
-1.0.419
+1.0.420

lib/Files.js

@@ -11,7 +11,7 @@ var endpointPrefix = '/api/rest/v1';
 var apiKey;
 var baseUrl = 'https://app.files.com';
 var sessionId = null;
-var version = "1.0.419";
+var version = "1.0.420";
 var userAgent = "Files.com JavaScript SDK v".concat(version);
 var logLevel = _Logger.LogLevel.INFO;
 var debugRequest = false;

lib/utils/pathNormalizer.js

@@ -198,7 +198,7 @@ var transliterate = function transliterate(str) {
 // converting the path to UTF-8 is not necessary in JS as it's the default
 var normalize = function normalize(path) {
   // Remove any characters with byte value of 0
-  var cleaned = (path || '').replace(/\0/g, '');
+  var cleaned = (typeof path === 'string' ? path : '').replace(/\0/g, '');
 
   // Convert any backslash (\) characters to a forward slash (/)
   cleaned = cleaned.replace(/\\/g, '/');
@@ -239,20 +239,21 @@ var normalizeForComparison = function normalizeForComparison(path) {
   return normalized;
 };
 var same = function same(path1, path2) {
-  return normalizeForComparison(path1) === normalizeForComparison(path2);
+  return typeof path1 === 'string' && typeof path2 === 'string' && normalizeForComparison(path1) === normalizeForComparison(path2);
 };
 var startsWith = function startsWith(path1, path2) {
-  return normalizeForComparison(path1).startsWith(normalizeForComparison(path2));
+  return typeof path1 === 'string' && typeof path2 === 'string' && normalizeForComparison(path1).startsWith(normalizeForComparison(path2));
 };
 var keyLookup = function keyLookup(object, path) {
-  var key = Object.keys(object).find(function (key) {
+  var key = Object.keys(object || {}).find(function (key) {
     return same(key, path);
   });
   return typeof key === 'string' ? object[key] : undefined;
 };
 var pathNormalizer = {
   keyLookup: keyLookup,
   normalize: normalize,
+  normalizeForComparison: normalizeForComparison,
   same: same,
   startsWith: startsWith
 };

lib/utils/pathNormalizer.test.js

@@ -15,6 +15,24 @@ describe('pathNormalizer', function () {
       expect(_pathNormalizer.default.startsWith(input, startOfExpected)).toBe(true);
     });
   });
+  it('handles non-string params', function () {
+    expect(_pathNormalizer.default.normalize([])).toBe('');
+    expect(_pathNormalizer.default.normalize({})).toBe('');
+    expect(_pathNormalizer.default.normalize(null)).toBe('');
+    expect(_pathNormalizer.default.normalize(undefined)).toBe('');
+    expect(_pathNormalizer.default.same([], '')).toBe(false);
+    expect(_pathNormalizer.default.same(null, '')).toBe(false);
+    expect(_pathNormalizer.default.same([], null)).toBe(false);
+    expect(_pathNormalizer.default.same(undefined, undefined)).toBe(false);
+    expect(_pathNormalizer.default.startsWith(null, '')).toBe(false);
+    expect(_pathNormalizer.default.startsWith(null, [])).toBe(false);
+    expect(_pathNormalizer.default.startsWith([], null)).toBe(false);
+    expect(_pathNormalizer.default.startsWith(undefined, undefined)).toBe(false);
+    expect(_pathNormalizer.default.keyLookup(null, '')).toBe(undefined);
+    expect(_pathNormalizer.default.keyLookup(null, [])).toBe(undefined);
+    expect(_pathNormalizer.default.keyLookup([], null)).toBe(undefined);
+    expect(_pathNormalizer.default.keyLookup(undefined, undefined)).toBe(undefined);
+  });
   it('looks up keys in a map', function () {
     var map = {
       '': {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "files.com",
-  "version": "1.0.419",
+  "version": "1.0.420",
   "description": "Files.com SDK for JavaScript",
   "keywords": [
     "files.com",

src/Files.js

@@ -5,7 +5,7 @@ const endpointPrefix = '/api/rest/v1'
 let apiKey
 let baseUrl = 'https://app.files.com'
 let sessionId = null
-let version = "1.0.419"
+let version = "1.0.420"
 let userAgent = `Files.com JavaScript SDK v${version}`
 
 let logLevel = LogLevel.INFO

src/utils/pathNormalizer.js

@@ -193,7 +193,7 @@ const transliterate = str =>
 // converting the path to UTF-8 is not necessary in JS as it's the default
 const normalize = path => {
   // Remove any characters with byte value of 0
-  let cleaned = (path || '').replace(/\0/g, '')
+  let cleaned = (typeof path === 'string' ? path : '').replace(/\0/g, '')
 
   // Convert any backslash (\) characters to a forward slash (/)
   cleaned = cleaned.replace(/\\/g, '/')
@@ -237,20 +237,21 @@ const normalizeForComparison = path => {
   return normalized
 }
 
-const same = (path1, path2) =>
-  normalizeForComparison(path1) === normalizeForComparison(path2)
+const same = (path1, path2) => typeof path1 === 'string' && typeof path2 === 'string'
+  && normalizeForComparison(path1) === normalizeForComparison(path2)
 
-const startsWith = (path1, path2) =>
-  normalizeForComparison(path1).startsWith(normalizeForComparison(path2))
+const startsWith = (path1, path2) => typeof path1 === 'string' && typeof path2 === 'string'
+  && normalizeForComparison(path1).startsWith(normalizeForComparison(path2))
 
 const keyLookup = (object, path) => {
-  const key = Object.keys(object).find(key => same(key, path))
+  const key = Object.keys(object || {}).find(key => same(key, path))
   return typeof key === 'string' ? object[key] : undefined
 }
 
 const pathNormalizer = {
   keyLookup,
   normalize,
+  normalizeForComparison,
   same,
   startsWith,
 }

src/utils/pathNormalizer.test.js

@@ -12,6 +12,28 @@ describe('pathNormalizer', () => {
     })
   })
 
+  it('handles non-string params', () => {
+    expect(pathNormalizer.normalize([])).toBe('')
+    expect(pathNormalizer.normalize({})).toBe('')
+    expect(pathNormalizer.normalize(null)).toBe('')
+    expect(pathNormalizer.normalize(undefined)).toBe('')
+
+    expect(pathNormalizer.same([], '')).toBe(false)
+    expect(pathNormalizer.same(null, '')).toBe(false)
+    expect(pathNormalizer.same([], null)).toBe(false)
+    expect(pathNormalizer.same(undefined, undefined)).toBe(false)
+
+    expect(pathNormalizer.startsWith(null, '')).toBe(false)
+    expect(pathNormalizer.startsWith(null, [])).toBe(false)
+    expect(pathNormalizer.startsWith([], null)).toBe(false)
+    expect(pathNormalizer.startsWith(undefined, undefined)).toBe(false)
+
+    expect(pathNormalizer.keyLookup(null, '')).toBe(undefined)
+    expect(pathNormalizer.keyLookup(null, [])).toBe(undefined)
+    expect(pathNormalizer.keyLookup([], null)).toBe(undefined)
+    expect(pathNormalizer.keyLookup(undefined, undefined)).toBe(undefined)
+  })
+
   it('looks up keys in a map', () => {
     const map = {
       '': { list: true },