Skip to content

SK-2131 fix expiry date validation #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raushan-skyflow merged 2 commits into from
Jul 8, 2025
Merged

SK-2131 fix expiry date validation #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
071dabd
SK-2131 fix expiry date validation
raushan-skyflow Jul 7, 2025
4b763fa
SK-2131 fix invalid month validation in expiry date
raushan-skyflow Jul 8, 2025
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
36 changes: 36 additions & 0 deletions __tests__/core-utils/element-validations.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
validatePin,
validateRevealElementRecords,
validateGetInput,
validateExpiryDate,
} from '../../src/core-utils/element-validations';
import SKYFLOW_ERROR_CODE from '../../src/utils/skyflow-error-code';
import { parameterizedString } from '../../src/utils/logs-helper';
Expand Down Expand Up @@ -186,6 +187,41 @@ describe('test validatePin function', () => {
});
});

describe('test validateExpiryDate function with various format', () => {
it('should return true for current month/year', () => {
const today = new Date();
const month = (today.getMonth() + 1).toString().padStart(2, '0');
const year = today.getFullYear();
expect(validateExpiryDate(`${month}/${year}`, 'MM/YYYY')).toBe(true);
expect(validateExpiryDate(`${year}/${month}`, 'YYYY/MM')).toBe(true);

const yearTwoDigit = year % 100;
expect(validateExpiryDate(`${month}/${yearTwoDigit}`, 'MM/YY')).toBe(true);
expect(validateExpiryDate(`${yearTwoDigit}/${month}`, 'YY/MM')).toBe(true);
});

it('should return true for valid future date', () => {
expect(validateExpiryDate('07/2074', 'MM/YYYY')).toBe(true);
expect(validateExpiryDate('2074/04', 'YYYY/MM')).toBe(true);
expect(validateExpiryDate('01/35', 'MM/YY')).toBe(true);
expect(validateExpiryDate('35/04', 'YY/MM')).toBe(true);
});

it('should return false for expired dates', () => {
expect(validateExpiryDate('01/2020', 'MM/YYYY')).toBe(false);
expect(validateExpiryDate('2000/04', 'YYYY/MM')).toBe(false);
expect(validateExpiryDate('04/20', 'MM/YY')).toBe(false);
expect(validateExpiryDate('20/04', 'YY/MM')).toBe(false);
});

it('should return false for invalid month for expired date', () => {
expect(validateExpiryDate('15/2040', 'MM/YYYY')).toBe(false);
expect(validateExpiryDate('2040/16', 'YYYY/MM')).toBe(false);
expect(validateExpiryDate('14/20', 'MM/YY')).toBe(false);
expect(validateExpiryDate('40/14', 'YY/MM')).toBe(false);
});
});

describe('test validateRevealElementRecords', () => {
it('should throw error when invalid redaction type is passed', (done) => {
try {
Expand Down
11 changes: 9 additions & 2 deletions src/core-utils/element-validations/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,20 @@ export const validateExpiryDate = (date: string, format: string) => {
if (date.trim().length === 0) return true;
if (!date.includes('/')) return false;
const { month, year } = getYearAndMonthBasedOnFormat(date, format);
const expiryDate = new Date(`${year}-${month}-01`);

if (month < 1 || month > 12) return false;

const expiryDate = new Date(Number(year), Number(month) - 1, 1);
const today = new Date();
today.setDate(1);
today.setHours(0, 0, 0, 0);

const maxDate = new Date();
maxDate.setFullYear(today.getFullYear() + 50);
maxDate.setDate(1);
maxDate.setHours(0, 0, 0, 0);

return expiryDate > today && expiryDate <= maxDate;
return expiryDate >= today && expiryDate <= maxDate;
};

export const validateCreditCardNumber = (cardNumber: string) => {
Expand Down