AfRA/AfRApay
3
0
Fork 0
Code Issues 7 Pull requests Packages Projects Releases Wiki Activity

Remove unreliable card type detections

Browse source
This commit is contained in:
Laura Hausmann 2023-05-19 16:45:01 +02:00
parent b665d13184
commit 19f7075e8c
Signed by: zotan
GPG key ID: D044E84C5BE01605
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
AfRApay.Web/Controllers/CardController.cs
View file

@ -153,17 +153,19 @@ public class CardController : Controller {
}
private Card.CardType GetCardType(string? reader, string cardNumber) => reader switch {
"rdm6300" => Card.CardType.Rfid125KhzGeneric,
"pn532-iso14443a" when cardNumber.Length == 8 => Card.CardType.NfcMifareClassic,
"pn532-iso14443a" when cardNumber.Length == 12 && cardNumber.EndsWith("0218") => Card.CardType.NfcOvChipkaart,
"pn532-iso14443a" when cardNumber.Length == 14 && cardNumber.EndsWith("5e80") => Card.CardType.NfcTflOyster,
"pn532-iso14443a" when cardNumber.Length == 14 && cardNumber.StartsWith("04") && cardNumber.EndsWith("80") => Card.CardType.NfcItso,
"pn532-iso14443a" => Card.CardType.NfcGeneric,
"pn532-felica" when cardNumber.Length == 16 && cardNumber.StartsWith("0112") => Card.CardType.FeliCaSuica,
"pn532-felica" when cardNumber.Length == 16 && cardNumber.StartsWith("0101") => Card.CardType.FeliCaPasmo,
"pn532-felica" when cardNumber.Length == 16 && cardNumber.StartsWith("0139") => Card.CardType.FeliCaApplePay,
"pn532-felica" => Card.CardType.FeliCaGeneric,
_ => Card.CardType.Unknown
//"pn532-iso14443a" when [???] => Card.CardType.NfcContactless,
// these seem to not be accurate yet
//"pn532-iso14443a" when cardNumber.Length == 8 => Card.CardType.NfcMifareClassic,
//"pn532-iso14443a" when cardNumber.Length == 12 && cardNumber.EndsWith("0218") => Card.CardType.NfcOvChipkaart,
//"pn532-iso14443a" when cardNumber.Length == 14 && cardNumber.StartsWith("04") && cardNumber.EndsWith("80") => Card.CardType.NfcItso,
"pn532-iso14443a" when cardNumber.Length == 14 && (cardNumber.EndsWith("5e80") || cardNumber.EndsWith("4e80")) => Card.CardType.NfcTflOyster,
"pn532-iso14443a" => Card.CardType.NfcGeneric,
"pn532-felica" when cardNumber.Length == 16 && cardNumber.StartsWith("0112") => Card.CardType.FeliCaSuica,
"pn532-felica" when cardNumber.Length == 16 && cardNumber.StartsWith("0101") => Card.CardType.FeliCaPasmo,
"pn532-felica" when cardNumber.Length == 16 && cardNumber.StartsWith("0139") => Card.CardType.FeliCaApplePay,
"pn532-felica" => Card.CardType.FeliCaGeneric,
"rdm6300" => Card.CardType.Rfid125KhzGeneric,
_ => Card.CardType.Unknown
//"pn532-iso14443a" when [???] => Card.CardType.NfcContactless,
};
}