Post migration cleanup

Author: Simon

README.md

@@ -33,8 +33,6 @@ composer require optiosteam/payconiq-client-php
 ```
 
 ## Migrating from 1.x to 2.x: Migration Payconiq > WERO/Bancontact
-On `2025-09-21 05:50:00 CET` the endpoints will be updated automatically to use the new endpoints according to https://docs.payconiq.be/guides/general/preprod072025v4
-
 The code has been updated for PHP 8 (constructor property promotion, enums, immutable with `readonly`, ...)
 
 All resources (`Payment`, `Creditor`, `Debtor`, `SearchResult`) are now immutable.

src/MigrationHelper.php

@@ -21,36 +21,21 @@ class PayconiqApiClient
 {
     public const  API_VERSION = 'v3';
 
-    // Legacy endpoints
-    public const  API_ENDPOINT_PRODUCTION_LEGACY = 'https://api.payconiq.com/';
-    public const  API_ENDPOINT_STAGING_LEGACY = 'https://api.ext.payconiq.com/';
-
-    // New endpoints
-    public const  API_ENDPOINT_PRODUCTION_NEW = 'https://merchant.api.bancontact.net/';
-    public const  API_ENDPOINT_STAGING_NEW = 'https://merchant.api.preprod.bancontact.net/';
+    public const  API_ENDPOINT_PRODUCTION = 'https://merchant.api.bancontact.net/';
+    public const  API_ENDPOINT_STAGING = 'https://merchant.api.preprod.bancontact.net/';
 
     private const TIMEOUT = 10;
     private const CONNECT_TIMEOUT = 2;
 
     private string $apiKey;
     private ClientInterface $httpClient;
     private bool $useProd;
-    private bool $useNewPreProductionEnv; // only used for the new pre-production testing
 
     public function __construct(
         string $apiKey,
         ?ClientInterface $httpClient = null,
         bool $useProd = true,
-        bool $useNewPreProductionEnv = false,
     ) {
-        if (
-            true === $useProd
-            && true === $useNewPreProductionEnv
-            && false === MigrationHelper::switchToNewEndpoints()
-        ) {
-            throw new \InvalidArgumentException('You can not use the new pre production env in production mode yet');
-        }
-
         if (null === $httpClient) {
             $httpClient = new Client([
                 RequestOptions::TIMEOUT => self::TIMEOUT,
@@ -62,7 +47,6 @@ public function __construct(
         $this->apiKey = $apiKey;
         $this->httpClient = $httpClient;
         $this->useProd = $useProd;
-        $this->useNewPreProductionEnv = $useNewPreProductionEnv;
     }
 
     public function getApiEndpointBase(): string
@@ -72,13 +56,7 @@ public function getApiEndpointBase(): string
 
     private function getEndpoint(): string
     {
-        if (true === $this->useNewPreProductionEnv || true === MigrationHelper::switchToNewEndpoints()) {
-            // new endpoints
-            return ($this->useProd ? self::API_ENDPOINT_PRODUCTION_NEW : self::API_ENDPOINT_STAGING_NEW);
-        }
-
-        // legacy endpoints
-        return ($this->useProd ? self::API_ENDPOINT_PRODUCTION_LEGACY : self::API_ENDPOINT_STAGING_LEGACY);
+        return $this->useProd ? self::API_ENDPOINT_PRODUCTION : self::API_ENDPOINT_STAGING;
     }
 
     /**

src/PayconiqApiClient.php

@@ -37,38 +37,23 @@
  */
 class PayconiqCallbackSignatureVerifier
 {
-    // Legacy endpoints
-    public const  CERTIFICATES_PRODUCTION_URL_LEGACY = 'https://payconiq.com/certificates';
-    public const  CERTIFICATES_STAGING_URL_LEGACY = 'https://ext.payconiq.com/certificates';
-
-    // New endpoints
-    public const  CERTIFICATES_PRODUCTION_URL_NEW = 'https://jwks.bancontact.net';
-    public const  CERTIFICATES_STAGING_URL_NEW = 'https://jwks.preprod.bancontact.net';
+    public const  CERTIFICATES_PRODUCTION_URL = 'https://jwks.bancontact.net';
+    public const  CERTIFICATES_STAGING_URL = 'https://jwks.preprod.bancontact.net';
 
     private const TIMEOUT = 10;
     private const CONNECT_TIMEOUT = 2;
 
     private ClientInterface $httpClient;
     private AdapterInterface $cache;
     private bool $useProd;
-    private bool $useNewPreProductionEnv; // only used for the new pre-production testing
     private JWSLoader $jwsLoader;
 
     public function __construct(
         string $paymentProfileId,
         ClientInterface $httpClient = null,
         AdapterInterface $cache = null,
         bool $useProd = true,
-        bool $useNewPreProductionEnv = false,
     ) {
-        if (
-            true === $useProd
-            && true === $useNewPreProductionEnv
-            && false === MigrationHelper::switchToNewEndpoints()
-        ) {
-            throw new \InvalidArgumentException('You can not use the new pre production env in production mode yet');
-        }
-
         if (null === $httpClient) {
             $httpClient = new Client([
                 RequestOptions::TIMEOUT => self::TIMEOUT,
@@ -83,20 +68,13 @@ public function __construct(
         $this->httpClient = $httpClient;
         $this->cache = $cache;
         $this->useProd = $useProd;
-        $this->useNewPreProductionEnv = $useNewPreProductionEnv;
 
         $this->jwsLoader = $this->initializeJwsLoader($paymentProfileId);
     }
 
     private function getCertificatesUrl(): string
     {
-        if (true === $this->useNewPreProductionEnv || true === MigrationHelper::switchToNewEndpoints()) {
-            // new endpoints
-            return ($this->useProd ? self::CERTIFICATES_PRODUCTION_URL_NEW : self::CERTIFICATES_STAGING_URL_NEW);
-        }
-
-        // legacy endpoints
-        return ($this->useProd ? self::CERTIFICATES_PRODUCTION_URL_LEGACY : self::CERTIFICATES_STAGING_URL_LEGACY);
+        return $this->useProd ? self::CERTIFICATES_PRODUCTION_URL : self::CERTIFICATES_STAGING_URL;
     }
 
     public function isValid(string $token, ?string $payload = null, ?int $signature = 0): bool
@@ -185,12 +163,12 @@ private static function normalizeEcdsaSigIfNeeded(string $compactJws, int $partL
 
         // Try DER → raw using phpseclib helpers
         try {
-            $rs  = EcdsaAsn1::load($sig);                              // ['r'=>BigInteger,'s'=>BigInteger]
+            $rs = EcdsaAsn1::load($sig); // ['r'=>BigInteger,'s'=>BigInteger]
             $raw = EcdsaP1363::save($rs['r'], $rs['s'], null, $partLen); // fixed-length P-1363
             $sB64u = rtrim(strtr(base64_encode($raw), '+/', '-_'), '=');
             return "$h.$p.$sB64u";
         } catch (\Throwable) {
-            // Not DER / not parseable — leave as-is and let the verifier decide
+            // Not DER / not parseable - leave as-is and let the verifier decide
             return $compactJws;
         }
     }

src/PayconiqCallbackSignatureVerifier.php

@@ -12,23 +12,11 @@
 
 class PayconiqQrCodeGenerator
 {
-    public const PORTAL_URL_LEGACY = 'https://portal.payconiq.com/qrcode';
-    public const PORTAL_URL_NEW = 'https://qrcodegenerator.api.bancontact.net/qrcode';
+    public const QRCODE_GENERATOR_URL = 'https://qrcodegenerator.api.bancontact.net/qrcode';
 
     public const LOCATION_URL_SCHEME_STATIC = 'https://payconiq.com/l/1/';
     public const LOCATION_URL_SCHEME_METADATA = 'https://payconiq.com/t/1/';
 
-    private static function getEndpoint(bool $useNewPreProductionEnv = false): string
-    {
-        if (true === $useNewPreProductionEnv || true === MigrationHelper::switchToNewEndpoints()) {
-            // new endpoints
-            return self::PORTAL_URL_NEW;
-        }
-
-        // legacy endpoints
-        return self::PORTAL_URL_LEGACY;
-    }
-
     /**
      * Used for customizing QR links returned in the Payment.
      * Optios\Payconiq\Resource\Payment\Payment->getQrLink()
@@ -63,11 +51,10 @@ public static function generateStaticQRCodeLink(
         QrImageFormat $format = QrImageFormat::PNG,
         QrImageSize $size = QrImageSize::SMALL,
         QrImageColor $color = QrImageColor::MAGENTA,
-        bool $useNewPreProductionEnv = false,
     ): string {
         $urlPayload = self::LOCATION_URL_SCHEME_STATIC . $paymentProfileId . '/' . $posId;
 
-        $uri = Modifier::from(Http::new(self::getEndpoint($useNewPreProductionEnv)))
+        $uri = Modifier::from(Http::new(self::QRCODE_GENERATOR_URL))
             ->mergeQueryParameters(['c' => $urlPayload])
             ->getUri();
 
@@ -90,7 +77,6 @@ public static function generateQRCodeWithMetadata(
         QrImageFormat $format = QrImageFormat::PNG,
         QrImageSize $size = QrImageSize::SMALL,
         QrImageColor $color = QrImageColor::MAGENTA,
-        bool $useNewPreProductionEnv = false,
     ): string {
         $payloadUri = Http::new(self::LOCATION_URL_SCHEME_METADATA . $paymentProfileId);
 
@@ -123,7 +109,7 @@ public static function generateQRCodeWithMetadata(
             $payloadUri = Modifier::from($payloadUri)->mergeQueryParameters($query)->getUri();
         }
 
-        $uri = Modifier::from(Http::new(self::getEndpoint($useNewPreProductionEnv)))
+        $uri = Modifier::from(Http::new(self::QRCODE_GENERATOR_URL))
             ->mergeQueryParameters(['c' => (string) $payloadUri])
             ->getUri();