refactor

Author: Dobrunia

README.md

@@ -142,9 +142,6 @@ hawk.setContext({
   version: '2.1.0',
   environment: 'production',
 });
-
-// Clear context data
-hawk.clearContext();
 ```
 
 ## Source maps consuming

example/index.html

@@ -100,8 +100,6 @@ <h1>Hawk JavaScript Catcher</h1>
     <section>
       <h2>Send test event</h2>
       <button onclick="window.hawk.test()">hawk.test()</button>
-      <br /><br />
-      <button id="btn-test-without-user">Test without user</button>
     </section>
     <section>
       <h2>Send real error</h2>
@@ -175,7 +173,6 @@ <h2>Context Management</h2>
       <input type="text" id="contextValue" placeholder="user-dashboard" />
       <br /><br />
       <button id="btn-set-context">Set Context</button>
-      <button id="btn-clear-context">Clear Context</button>
     </section>
     <script src="https://unpkg.com/vue@2"></script>
     <section>

example/sample-errors.js

@@ -107,7 +107,6 @@ buttonClearUser.addEventListener('click', () => {
  * Context Management
  */
 const buttonSetContext = document.getElementById('btn-set-context');
-const buttonClearContext = document.getElementById('btn-clear-context');
 
 buttonSetContext.addEventListener('click', () => {
   const contextKey = document.getElementById('contextKey').value;
@@ -124,20 +123,3 @@ buttonSetContext.addEventListener('click', () => {
 
   window.hawk.setContext(context);
 });
-
-buttonClearContext.addEventListener('click', () => {
-  window.hawk.clearContext();
-});
-
-/**
- * Test without user
- */
-const buttonTestWithoutUser = document.getElementById('btn-test-without-user');
-
-buttonTestWithoutUser.addEventListener('click', () => {
-  // Clear user first to ensure no user is set
-  window.hawk.clearUser();
-
-  // Send error without user
-  window.hawk.send(new Error('Test error without user'));
-});

src/catcher.ts

@@ -17,7 +17,7 @@ import { EventRejectedError } from './errors';
 import type { HawkJavaScriptEvent } from './types';
 import { isErrorProcessed, markErrorAsProcessed } from './utils/event';
 import { addErrorEvent, getConsoleLogStack, initConsoleCatcher } from './addons/consoleCatcher';
-import { validateUser, validateContext, logValidationErrors } from './utils/validation';
+import { validateUser, validateContext } from './utils/validation';
 
 /**
  * Allow to use global VERSION, that will be overwritten by Webpack
@@ -238,15 +238,11 @@ export default class Catcher {
    * @param user - New user information
    */
   public setUser(user: AffectedUser): void {
-    const validation = validateUser(user);
-
-    if (!validation.isValid) {
-      logValidationErrors('setUser', validation.errors);
-
+    if (!validateUser(user)) {
       return;
     }
 
-    this.user = validation.data!;
+    this.user = user;
   }
 
   /**
@@ -262,22 +258,11 @@ export default class Catcher {
    * @param context - New context data
    */
   public setContext(context: EventContext): void {
-    const validation = validateContext(context);
-
-    if (!validation.isValid) {
-      logValidationErrors('setContext', validation.errors);
-
+    if (!validateContext(context)) {
       return;
     }
 
-    this.context = validation.data!;
-  }
-
-  /**
-   * Clear current context data
-   */
-  public clearContext(): void {
-    this.context = undefined;
+    this.context = context;
   }
 
   /**

src/utils/validation.ts

@@ -1,92 +1,40 @@
+import log from './log';
 import type { AffectedUser, EventContext } from '@hawk.so/types';
 import Sanitizer from '../modules/sanitizer';
 
-/**
- * Validation result interface
- */
-interface ValidationResult<T> {
-  isValid: boolean;
-  data?: T;
-  errors: string[];
-}
-
 /**
  * Validates user data - basic security checks
  *
  * @param user
  */
-export function validateUser(user: AffectedUser): ValidationResult<AffectedUser> {
-  const errors: string[] = [];
-
+export function validateUser(user: AffectedUser): boolean {
   if (!user || !Sanitizer.isObject(user)) {
-    errors.push('User must be an object');
+    log('validateUser: User must be an object', 'warn');
 
-    return { isValid: false,
-      errors };
+    return false;
   }
 
   // Validate required ID
   if (!user.id || typeof user.id !== 'string' || user.id.trim() === '') {
-    errors.push('User ID is required and must be a non-empty string');
-
-    return { isValid: false,
-      errors };
-  }
-
-  const validatedUser: AffectedUser = {
-    id: user.id.trim(),
-  };
-
-  // Add optional fields if they exist and are strings
-  if (user.name && typeof user.name === 'string') {
-    validatedUser.name = user.name.trim();
-  }
-
-  if (user.url && typeof user.url === 'string') {
-    validatedUser.url = user.url.trim();
-  }
+    log('validateUser: User ID is required and must be a non-empty string', 'warn');
 
-  if (user.image && typeof user.image === 'string') {
-    validatedUser.image = user.image.trim();
+    return false;
   }
 
-  return {
-    isValid: true,
-    data: validatedUser,
-    errors,
-  };
+  return true;
 }
 
 /**
  * Validates context data - basic security checks
  *
  * @param context
  */
-export function validateContext(context: EventContext): ValidationResult<EventContext> {
-  const errors: string[] = [];
-
+export function validateContext(context: EventContext): boolean {
   if (!context || !Sanitizer.isObject(context)) {
-    errors.push('Context must be an object');
+    log('validateContext: Context must be an object', 'warn');
 
-    return { isValid: false,
-      errors };
+    return false;
   }
 
-  return {
-    isValid: true,
-    data: context,
-    errors,
-  };
-}
-
-/**
- * Logs validation errors
- *
- * @param prefix
- * @param errors
- */
-export function logValidationErrors(prefix: string, errors: string[]): void {
-  errors.forEach((error) => {
-    console.warn(`${prefix}: ${error}`);
-  });
+  return true;
 }