Skip to content

Bugfix FXIOS-14575 [Autofill] Credit Card doesn't validate in its last (=expiration) month #31558

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
lmarceau merged 3 commits into from
Jan 13, 2026
Merged

Bugfix FXIOS-14575 [Autofill] Credit Card doesn't validate in its last (=expiration) month #31558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b50f42
Include whole month for CC expiry validation
janbrasna Jan 7, 2026
5288473
Simplify CC validity month boundary
janbrasna Jan 8, 2026
1153e17
Expand tests for expiry validation
janbrasna Jan 9, 2026
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
23 changes: 11 additions & 12 deletions firefox-ios/Client/Frontend/Autofill/CreditCard/Logic/CreditCardValidator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,25 +78,24 @@ struct CreditCardValidator {
}

func isExpirationValidFor(date: String) -> Bool {
Copy link
Contributor

@lmarceau lmarceau Jan 9, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should see some tests added in CreditCardValidatorTests ? This logic should be tested

Copy link
Contributor Author

@janbrasna janbrasna Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some hard-coded ones — would you want me to add one that dynamically tries "this month", too? (Perhaps a few more — a month before this, this one, and the month after I can imagine…)

Copy link
Contributor

@lmarceau lmarceau Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah a couple of use cases like you said would be perfect!

Copy link
Contributor Author

@janbrasna janbrasna Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would 1153e17 be alright for a test, or it should be more smart, or be mocking some logic?

(I'm never comfortable around testing live values as a form of "moving target" inside tests;D)

This comment was marked as resolved.

Sign in to view

Copy link
Contributor

@lmarceau lmarceau Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @janbrasna ! It's green I'll merge

let userCalendar = Calendar(identifier: .gregorian)

guard date.count == 4,
let inputMonth = Int(date.prefix(2)),
let inputYear = Int(date.suffix(2)),
let currentYear = Calendar(identifier: .gregorian).dateComponents([.year], from: Date()).year,
inputMonth < 13 && inputMonth > 0,
(inputYear + 2000) < currentYear + 100 && (inputYear + 2000) >= currentYear else {
let currentMonth = userCalendar.dateComponents([.month], from: Date()).month,
let currentYear = userCalendar.dateComponents([.year], from: Date()).year,
inputMonth >= 1 && inputMonth <= 12 else {
return false
}

var userInputtedDate = DateComponents()
userInputtedDate.year = inputYear + 2000
userInputtedDate.month = inputMonth
let userCalendar = Calendar(identifier: .gregorian)

guard let userCardExpirationDate = userCalendar.date(from: userInputtedDate),
userCardExpirationDate >= Date() else {
let expiryYear = inputYear + 2000
if expiryYear < currentYear {
return false
} else if expiryYear == currentYear {
return inputMonth >= currentMonth
} else {
return true
}

return true
}
}
25 changes: 22 additions & 3 deletions firefox-ios/firefox-ios-tests/Tests/ClientTests/CreditCard/CreditCardValidatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,19 +126,38 @@ class CreditCardValidatorTests: XCTestCase {
var result = creditCardValidator.isExpirationValidFor(date: "1230")
XCTAssert(result)

result = creditCardValidator.isExpirationValidFor(date: "0926")
result = creditCardValidator.isExpirationValidFor(date: "0928")
XCTAssert(result)
}

func testExpirationIsValidForCurrentMonth() {
let t = Date()
let c = Calendar(identifier: .gregorian)
let f = DateFormatter()
f.dateFormat = "MMyy"

// Uses current month e.g. 0125
var result = creditCardValidator.isExpirationValidFor(date: f.string(from: t))
XCTAssert(result)

// Next month too for year boundary corner cases
result = creditCardValidator.isExpirationValidFor(date: f.string(from: c.date(byAdding: .month, value: 1, to: t)!))
XCTAssert(result)

// Previous month e.g. 1224 should not pass
result = creditCardValidator.isExpirationValidFor(date: f.string(from: c.date(byAdding: .month, value: -1, to: t)!))
XCTAssertFalse(result)
}

func testExpirationIsInvalidOnIncorrectInput() {
var result = creditCardValidator.isExpirationValidFor(date: "0000")
XCTAssertFalse(result)

result = creditCardValidator.isExpirationValidFor(date: "1525")
result = creditCardValidator.isExpirationValidFor(date: "1545")
XCTAssertFalse(result)
}

func tetsExpirationIsInvalidOnBlankInput() {
func testExpirationIsInvalidOnBlankInput() {
let result = creditCardValidator.isExpirationValidFor(date: "")
XCTAssertFalse(result)
}
Expand Down