feat(rsakey): support both with/without file:// protocol

adhocore · adhocore · commit f65415581c6a · 2018-07-14T21:03:20.000+07:00
diff --git a/src/ValidatesJWT.php b/src/ValidatesJWT.php
@@ -95,12 +95,12 @@ protected function validateTimestamps(array $payload)
      */
     protected function validateKey()
     {
-        if (\is_string($this->key)) {
-            if (!\is_file($this->key)) {
-                throw new JWTException('Invalid key: Should be file path of private key', static::ERROR_KEY_INVALID);
+        if (\is_string($key = $this->key)) {
+            if (\substr($key, 0, 7) !== 'file://') {
+                $key = 'file://' . $key;
             }
 
-            $this->key = \openssl_get_privatekey('file://' . $this->key, $this->passphrase ?? '');
+            $this->key = \openssl_get_privatekey($key, $this->passphrase ?? '');
         }
 
         if (!\is_resource($this->key)) {

Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,12 @@ protected function validateTimestamps(array $payload)`
`95`	`95`	`*/`
`96`	`96`	`protected function validateKey()`
`97`	`97`	`{`
`98`		`- if (\is_string($this->key)) {`
`99`		`- if (!\is_file($this->key)) {`
`100`		`- throw new JWTException('Invalid key: Should be file path of private key', static::ERROR_KEY_INVALID);`
	`98`	`+ if (\is_string($key = $this->key)) {`
	`99`	`+ if (\substr($key, 0, 7) !== 'file://') {`
	`100`	`+ $key = 'file://' . $key;`
`101`	`101`	`}`
`102`	`102`
`103`		`- $this->key = \openssl_get_privatekey('file://' . $this->key, $this->passphrase ?? '');`
	`103`	`+ $this->key = \openssl_get_privatekey($key, $this->passphrase ?? '');`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`if (!\is_resource($this->key)) {`