Merge pull request #17 from sysdevrun/claude/fix-extension-id-verification-wHgBj

Allow custom extension ID for Intercode issuing (e.g. +FRII1)

Author: chtitux

src/decoder.ts

@@ -283,7 +283,9 @@ function decodeIssuingDetail(iss: any): IssuingDetail {
     const ext = iss.extension;
     if (isIntercodeIssuingExtension(ext.extensionId)) {
       try {
-        result.intercodeIssuing = getIntercodeIssuingCodec().decode(ext.extensionData) as IntercodeIssuingData;
+        const decoded = getIntercodeIssuingCodec().decode(ext.extensionData) as IntercodeIssuingData;
+        decoded.extensionId = ext.extensionId;
+        result.intercodeIssuing = decoded;
       } catch {
         result.extension = { extensionId: ext.extensionId, extensionData: ext.extensionData };
       }

src/encoder.ts

@@ -171,7 +171,7 @@ function encodeRailTicket(fcbVersion: number, input: UicBarcodeTicketInput): Uin
       productRetailer: iss.intercodeIssuing.productRetailer,
     });
     extension = {
-      extensionId: `_${rics}II1`,
+      extensionId: iss.intercodeIssuing.extensionId ?? `_${rics}II1`,
       extensionData: issuingBytes,
     };
   }

src/types.ts

@@ -151,6 +151,8 @@ export interface ProductRetailerData {
 }
 
 export interface IntercodeIssuingData {
+  /** Original extension ID string (e.g. "_3703II1" or "+FRII1"). */
+  extensionId: string;
   intercodeVersion: number;
   intercodeInstanciation: number;
   networkId: Uint8Array;
@@ -362,6 +364,8 @@ export interface IssuingDetailInput {
 }
 
 export interface IntercodeIssuingDataInput {
+  /** Override the generated extension ID (e.g. "+FRII1"). When omitted, defaults to `_<RICS>II1`. */
+  extensionId?: string;
   intercodeVersion?: number;
   intercodeInstanciation?: number;
   networkId: Uint8Array;

tests/signer.test.ts

@@ -60,6 +60,7 @@ function decodedToInput(hex: string): UicBarcodeTicketInput {
         issuerPNR: rt.issuingDetail?.issuerPNR,
         intercodeIssuing: rt.issuingDetail?.intercodeIssuing
           ? {
+              extensionId: rt.issuingDetail.intercodeIssuing.extensionId,
               intercodeVersion: rt.issuingDetail.intercodeIssuing.intercodeVersion,
               intercodeInstanciation: rt.issuingDetail.intercodeIssuing.intercodeInstanciation,
               networkId: rt.issuingDetail.intercodeIssuing.networkId,

website/src/lib/convert.ts

@@ -43,6 +43,7 @@ export function ticketToInput(ticket: UicBarcodeTicket): UicBarcodeTicketInput {
   if (iss?.intercodeIssuing) {
     const ic = iss.intercodeIssuing;
     const intercodeIssuing: IntercodeIssuingDataInput = {
+      extensionId: ic.extensionId,
       intercodeVersion: ic.intercodeVersion,
       intercodeInstanciation: ic.intercodeInstanciation,
       networkId: ic.networkId,