"refactoring"

mahmishr · mahmishr · commit 0070f3397f7c · 2025-03-07T13:00:09.000+05:30
diff --git a/lib/Authentication/Util/Cache.php b/lib/Authentication/Util/Cache.php
@@ -28,11 +28,11 @@ public function updateCache($filePath, $merchantConfig)
 
         if (openssl_pkcs12_read($certStore, $certs, $keyPass)) {
             $privateKey = $certs['pkey'];
-            if (!empty($merchantConfig->getKeyAlias())) {
-            $publicKey = Utility::findCertByAlias($certs, $merchantConfig->getKeyAlias());
-            } else {
-            $publicKey = $certs['cert'];
+            $keyAlias = $merchantConfig->getKeyAlias();
+            if (empty($keyAlias)) {
+                $keyAlias = $merchantConfig->getMerchantID();
             }
+            $publicKey = Utility::findCertByAlias($certs, $keyAlias);
             $publicKey = $this->PemToDer($publicKey);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ public function updateCache($filePath, $merchantConfig)`
`28`	`28`
`29`	`29`	`if (openssl_pkcs12_read($certStore, $certs, $keyPass)) {`
`30`	`30`	`$privateKey = $certs['pkey'];`
`31`		`- if (!empty($merchantConfig->getKeyAlias())) {`
`32`		`- $publicKey = Utility::findCertByAlias($certs, $merchantConfig->getKeyAlias());`
`33`		`- } else {`
`34`		`- $publicKey = $certs['cert'];`
	`31`	`+ $keyAlias = $merchantConfig->getKeyAlias();`
	`32`	`+ if (empty($keyAlias)) {`
	`33`	`+ $keyAlias = $merchantConfig->getMerchantID();`
`35`	`34`	`}`
	`35`	`+ $publicKey = Utility::findCertByAlias($certs, $keyAlias);`
`36`	`36`	`$publicKey = $this->PemToDer($publicKey);`
`37`	`37`	`}`
`38`	`38`