Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@
"engines": {
"node": ">=15.0.0"
}
}
}
12 changes: 11 additions & 1 deletion backend/src/utils/helpers/validation.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// skipcq: JS-0323
function validateNumber(key: string, value: any) {
return Number.isNaN(value) || value <= 0
return isNaN(value) || value <= 0
? `${key} must be a valid positive number.`
: null;
}
Expand All @@ -17,6 +17,14 @@ function validateStringArray(key: string, value: any) {
? `${key} must be an array of non-empty strings.`
: null;
}

// skipcq: JS-0296 JS-0323
function validateString(key: String, value: unknown) {
return typeof value !== 'string' || value.trim() === ''
? `${key} must be a non-empty string.`
: null
}

// skipcq: JS-0323 - value can be of any type
export default function validateType(key: string, value: any, type: string) {
if (value === undefined || value === null) return `${key} is required.`;
Expand All @@ -28,6 +36,8 @@ export default function validateType(key: string, value: any, type: string) {
return validateBoolean(key, value);
case 'string[]':
return validateStringArray(key, value);
case 'string':
return validateString(key, value);
default:
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion backend/test/unit/enrichment-service/helpers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ describe('enrichFromCache', () => {
{ id: '2', user_id: 'leadminer-1', email: '[email protected]' }
];

getCache.mockResolvedValue([{} as any]);
getCache.mockResolvedValue([{} as never]);

const result = await enrichFromCache(getCache, enrichmentsDB, contacts);

Expand Down
60 changes: 60 additions & 0 deletions backend/test/unit/validation.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import { expect, test} from '@jest/globals';
import validateType from '../../src/utils/helpers/validation';


/* TESTING EMPTY VALUE */
test('null/undefined value triggers error', () => {
expect(validateType('port', null, 'number')).toEqual('port is required.');
});


/* TESTING NUMBER VALIDATION */
test('accepts a positive number properly', () => {
expect(validateType('port', 8808, 'number')).toBeNull();
});

test('rejects a negative number', () => {
expect(validateType('port', -1, 'number')).toEqual('port must be a valid positive number.');
});

test('rejects 0', () => {
expect(validateType('port', 0, 'number')).toEqual('port must be a valid positive number.');
});

test('rejects a value that is not a number', () => {
expect(validateType('port', 'error', 'number')).toEqual('port must be a valid positive number.');
});


/* TESTING BOOLEAN VALIDATION */
test('accepts a true boolean properly', () => {
expect(validateType('secure', true, 'boolean')).toBeNull();
});

test('accepts a false boolean properly', () => {
expect(validateType('secure', false, 'boolean')).toBeNull();
});

test('rejects nonboolean values', () => {
expect(validateType('secure', 'error', 'boolean')).toEqual('secure must be true or false.');
});


/* TESTING STRING[] VALIDATION */
test('accepts a string[] properly', () => {
expect(validateType('email', ['t','e','s','t','@','e','m','a','i','l','.','c','o','m'], 'string[]')).toBeNull();
});

test('rejects a nonstring array value', () => {
expect(validateType('email', [1, 2, 3], 'string[]')).toEqual('email must be an array of non-empty strings.');
});


/* TESTING STRING VALIDATION */
test('accepts a string properly', () => {
expect(validateType('email', '[email protected]', 'string')).toBeNull();
});

test('rejects a nonstring value', () => {
expect(validateType('email', [1, 2, 3], 'string')).toEqual('email must be a non-empty string.');
});
2 changes: 1 addition & 1 deletion frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions frontend/src/components/Mining/StepperPanels/MinePanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ const totalEmails = computed<number>(() => {
if (sourceType.value === 'boxes' && boxes.value[0]) {
return objectScan(['**.{total}'], {
joined: true,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
filterFn: ({ parent, property, value, context }: any) => {

filterFn: ({ parent, property, value, context }: never) => {
if (
property === 'total' &&
parent.key &&
Expand Down Expand Up @@ -196,7 +196,7 @@ onMounted(async () => {

try {
await $leadminerStore.fetchInbox();
} catch (error: any) {
} catch (error) {
if (error?.statusCode === 502 || error?.statusCode === 503) {
$stepper.prev();
} else {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"devDependencies": {
"supabase": "^2.19.7"
}
}
}
Loading