Added the ability to exclude properties based on data exclusions :D.

Author: niemyjski

src/Utils-spec.ts

@@ -23,8 +23,29 @@ describe('Utils', () => {
     expect(Utils.stringify([{one: afoo, two: afoo}])).toBe('[{"one":{"a":"foo"}}]');
   });
 
+  it('should exclude properties', () => {
+    var user:any = {
+      id:1,
+      name: 'Blake',
+      password: '123456',
+      passwordResetToken: 'a reset token',
+      myPasswordValue: '123456',
+      myPassword: '123456',
+      customValue: 'Password',
+      value: {
+        Password: '123456'
+      }
+    };
+
+    expect(Utils.stringify(user)).toBe(JSON.stringify(user));
+    expect(Utils.stringify(user, ['pAssword'])).toBe('{"id":1,"name":"Blake","passwordResetToken":"a reset token","myPasswordValue":"123456","myPassword":"123456","customValue":"Password","value":{}}');
+    expect(Utils.stringify(user, ['*password'])).toBe('{"id":1,"name":"Blake","myPasswordValue":"123456","myPassword":"123456","customValue":"Password","value":{}}');
+    expect(Utils.stringify(user, ['password*'])).toBe('{"id":1,"name":"Blake","passwordResetToken":"a reset token","myPasswordValue":"123456","customValue":"Password","value":{}}');
+    expect(Utils.stringify(user, ['*password*'])).toBe('{"id":1,"name":"Blake","customValue":"Password","value":{}}');
+  });
+
   it('should stringify array', () => {
-    var error:IEvent = {
+    var error = {
       "type": "error",
       "data": {
         "@error": {
@@ -52,7 +73,8 @@ describe('Utils', () => {
               "column": 10
             }]
         }, "@submission_method": "onerror"
-      }, "tags": []
+      },
+      "tags": []
     };
 
     expect(Utils.stringify(error)).toBe(JSON.stringify(error));

src/Utils.ts

@@ -109,10 +109,46 @@ export class Utils {
     return Math.floor(Math.random() * 9007199254740992);
   }
 
-  public static stringify(data:any): string {
-    function stringifyImpl(data:any): string {
+  public static stringify(data:any, exclusions?:string[]): string {
+    function checkForMatch(pattern:string, value:string): boolean {
+      if (!pattern || !value || typeof value !== 'string') {
+        return false;
+      }
+
+      var startsWithWildcard:boolean = pattern[0] === '*';
+      if (startsWithWildcard) {
+        pattern = pattern.slice(1);
+      }
+
+      var endsWithWildcard:boolean = pattern[pattern.length - 1] === '*';
+      if (endsWithWildcard) {
+        pattern = pattern.substring(0, pattern.length - 1);
+      }
+
+      pattern = pattern.toLowerCase();
+      value = value.toLowerCase();
+
+      if (startsWithWildcard && endsWithWildcard)
+        return value.indexOf(pattern) !== -1;
+
+      if (startsWithWildcard)
+        return value.lastIndexOf(pattern, 0) !== -1;
+
+      if (endsWithWildcard)
+        return value.lastIndexOf(pattern) === (value.length - pattern.length);
+
+      return value === pattern;
+    }
+
+    function stringifyImpl(data:any, exclusions:string[]): string {
       var cache:string[] = [];
       return JSON.stringify(data, function(key:string, value:any) {
+        for (var index = 0; index < (exclusions || []).length; index++) {
+          if (checkForMatch(exclusions[index], key)){
+            return;
+          }
+        }
+
         if (typeof value === 'object' && !!value) {
           if (cache.indexOf(value) !== -1) {
             // Circular reference found, discard key
@@ -129,12 +165,12 @@ export class Utils {
     if (toString.call(data) === '[object Array]') {
       var result = [];
       for (var index = 0; index < data.length; index++) {
-        result[index] = JSON.parse(stringifyImpl(data[index]));
+        result[index] = JSON.parse(stringifyImpl(data[index], exclusions || []));
       }
 
       return JSON.stringify(result);
     }
 
-    return stringifyImpl(data);
+    return stringifyImpl(data, exclusions || []);
   }
 }

src/configuration/Configuration.ts

@@ -61,7 +61,7 @@ export class Configuration implements IConfigurationSettings {
    * Contains a dictionary of custom settings that can be used to control
    * the client and will be automatically updated from the server.
    */
-  public settings:Object;
+  public settings:Object = {};
 
   public storage:IStorage<Object>;
 

src/configuration/SettingsManager.ts

@@ -6,7 +6,7 @@ export class SettingsManager {
   private static _configPath:string = 'ex-server-settings.json';
 
   public static applySavedServerSettings(config:Configuration):void {
-    Utils.merge(config.settings, this.getSavedServerSettings(config));
+    config.settings = Utils.merge(config.settings, this.getSavedServerSettings(config));
     // TODO: Fire on changed event.
   }
 
@@ -37,7 +37,7 @@ export class SettingsManager {
       }
 
       var savedServerSettings = SettingsManager.getSavedServerSettings(config);
-      Utils.merge(config.settings, savedServerSettings);
+      config.settings = Utils.merge(config.settings, savedServerSettings);
 
       // TODO: Store snapshot of settings after reading from config and attributes and use that to revert to defaults.
       // Remove any existing server settings that are not in the new server settings.

src/submission/DefaultSubmissionClient.ts

@@ -39,15 +39,13 @@ export class DefaultSubmissionClient extends SubmissionClientBase {
       function parseResponseHeaders(headerStr) {
         var headers = {};
         var headerPairs = (headerStr || '').split('\u000d\u000a');
-        for (var index = 0; index < headerPairs.length; index++) {
+        for (var index:number = 0; index < headerPairs.length; index++) {
           var headerPair = headerPairs[index];
           // Can't use split() here because it does the wrong thing
           // if the header value has the string ": " in it.
-          var index = headerPair.indexOf('\u003a\u0020');
-          if (index > 0) {
-            var key = headerPair.substring(0, index);
-            var val = headerPair.substring(index + 2);
-            headers[key] = val;
+          var separator = headerPair.indexOf('\u003a\u0020');
+          if (separator > 0) {
+            headers[headerPair.substring(0, separator)] = headerPair.substring(separator + 2);
           }
         }
 

src/submission/SubmissionClientBase.ts

@@ -10,7 +10,7 @@ import { Utils } from '../Utils';
 
 export class SubmissionClientBase implements ISubmissionClient {
   public postEvents(events:IEvent[], config:Configuration, callback:(response:SubmissionResponse) => void):void {
-    return this.sendRequest(config, 'POST', '/api/v2/events', Utils.stringify(events), (status:number, message:string, data?:string, headers?:Object) => {
+    return this.sendRequest(config, 'POST', '/api/v2/events', Utils.stringify(events, config.dataExclusions), (status:number, message:string, data?:string, headers?:Object) => {
 
       var settingsVersion = (headers && parseInt(headers['X-Exceptionless-ConfigVersion'])) || -1;
       SettingsManager.checkVersion(settingsVersion, config);
@@ -21,7 +21,7 @@ export class SubmissionClientBase implements ISubmissionClient {
 
   public postUserDescription(referenceId:string, description:IUserDescription, config:Configuration, callback:(response:SubmissionResponse) => void):void {
     var path = `/api/v2/events/by-ref/${encodeURIComponent(referenceId)}/user-description`;
-    return this.sendRequest(config, 'POST', path, Utils.stringify(description), (status:number, message:string) => {
+    return this.sendRequest(config, 'POST', path, Utils.stringify(description, config.dataExclusions), (status:number, message:string) => {
       callback(new SubmissionResponse(status, message));
     });
   }