francis94c / ci-jwt

libraries/JWT.php

Spacing +13 added lines, -13 removed lines

@@ -69,7 +69,7 @@ 
    * @date  2020-03-28
    * @param [type]     $params [description]
    */
-  public function __construct(?array $params=null)
+  public function __construct(?array $params = null)
   {
     if ($params != null) $this->init($params);
     get_instance()->load->splint("francis94c/ci-jwt", "%base64");
@@ -90,7 +90,7 @@ 
    * @param  string     $key   Key of the item. e.g "alg", "typ".
    * @param  string|int $value Value of the item.
    */
-  public function header(string $key, $value=null) {
+  public function header(string $key, $value = null) {
     if ($value === null) return $this->header[$key];
     $this->header[$key] = $value;
   }
@@ -108,7 +108,7 @@ 
    * @return mixed|none         Value of $key if $value == null, else
    *                            returns none[NOTHING].
    */
-  public function payload(string $key, $value=null) {
+  public function payload(string $key, $value = null) {
     if ($value === null) return $this->payload[$key];
     $this->payload[$key] = $value;
   }
@@ -118,7 +118,7 @@ 
    * @return mixed|none      Value of the 'iss' claim, if the $iss argument wasn't
    *                         supplied. Otherwise, null.
    */
-  public function iss(string $iss=null) {
+  public function iss(string $iss = null) {
     if ($iss === null) return $this->payload['iss'];
     $this->payload['iss'] = $iss;
   }
@@ -142,9 +142,9 @@ 
    * @param  [type] $secret [description]
    * @return [type]         [description]
    */
-  public function sign(string $secret=null):?string {
+  public function sign(string $secret = null): ?string {
     // Checks.
-    if  (count($this->payload) == 0) return null;
+    if (count($this->payload) == 0) return null;
     // $key is $secret.
     $key = $secret ?? $this->secret;
     $this->header["alg"] = $this->header["alg"] ?? ($this->algorithm ?? self::HS512);
@@ -165,9 +165,9 @@ 
    * [token description]
    * @return string [description]
    */
-  public function token():?string {
+  public function token(): ?string {
     // Checks.
-    if  (count($this->payload) == 0) return null;
+    if (count($this->payload) == 0) return null;
     // Begin.
     $this->header["alg"] = self::NONE;
     if ($this->set_iat) $this->payload["iat"] = $this->payload["iat"] ?? time();
@@ -181,14 +181,14 @@ 
    * @param  string $secret [description]
    * @return bool           [description]
    */
-  public function verify(string $jwt, string $secret=null):bool {
+  public function verify(string $jwt, string $secret = null):bool {
     if (substr_count($jwt, ".") != 2) return false; // Invalid JWT.
     $key = $secret ?? $this->secret;
     $parts = explode(".", $jwt);
-    $header = json_decode(base64url_decode($parts[0]) ,true);
+    $header = json_decode(base64url_decode($parts[0]), true);
     if ($header == null) return false;
     $alg = $this->algorithm ?? $header["alg"] ?? self::HS256;
-    $payload = json_decode(base64url_decode($parts[1]) ,true);
+    $payload = json_decode(base64url_decode($parts[1]), true);
     if ($payload == null) return false;
     if ($parts[2] == "") {
       return $this->allow_unsigned;
@@ -225,7 +225,7 @@ 
    * @param  string $jwt [description]
    * @return bool        [description]
    */
-  public function expired(string $jwt=null):bool {
+  public function expired(string $jwt = null):bool {
     $exp = $jwt == null ? ($this->payload["exp"] ?? time()) : $this->get_expired($jwt);
     return time() >= $exp;
   }
@@ -247,7 +247,7 @@ 
    */
   private function get_expired(string $jwt):int {
     $parts = explode(".", $jwt);
-    return json_decode(base64url_decode($parts[1]) ,true)["exp"] ?? time();
+    return json_decode(base64url_decode($parts[1]), true)["exp"] ?? time();
   }
   /**
    * [sign_token Sign JWT]

Braces +58 added lines, -19 removed lines

@@ -71,7 +71,9 @@ 
    */
   public function __construct(?array $params=null)
   {
-    if ($params != null) $this->init($params);
+    if ($params != null) {
+     $this->init($params);
+    }
     get_instance()->load->splint("francis94c/ci-jwt", "%base64");
   }
   /**
@@ -91,7 +93,9 @@ 
    * @param  string|int $value Value of the item.
    */
   public function header(string $key, $value=null) {
-    if ($value === null) return $this->header[$key];
+    if ($value === null) {
+     return $this->header[$key];
+    }
     $this->header[$key] = $value;
   }
   /**
@@ -109,7 +113,9 @@ 
    *                            returns none[NOTHING].
    */
   public function payload(string $key, $value=null) {
-    if ($value === null) return $this->payload[$key];
+    if ($value === null) {
+     return $this->payload[$key];
+    }
     $this->payload[$key] = $value;
   }
   /**
@@ -119,7 +125,9 @@ 
    *                         supplied. Otherwise, null.
    */
   public function iss(string $iss=null) {
-    if ($iss === null) return $this->payload['iss'];
+    if ($iss === null) {
+     return $this->payload['iss'];
+    }
     $this->payload['iss'] = $iss;
   }
   /**
@@ -144,21 +152,33 @@ 
    */
   public function sign(string $secret=null):?string {
     // Checks.
-    if  (count($this->payload) == 0) return null;
+    if  (count($this->payload) == 0) {
+     return null;
+    }
     // $key is $secret.
     $key = $secret ?? $this->secret;
     $this->header["alg"] = $this->header["alg"] ?? ($this->algorithm ?? self::HS512);
     $this->header["typ"] = $this->header["typ"] ?? self::JWT;
     // Generate Issued At Time.
-    if ($this->set_iat) $this->payload["iat"] = $this->payload["iat"] ?? time();
+    if ($this->set_iat) {
+     $this->payload["iat"] = $this->payload["iat"] ?? time();
+    }
     // Auto Expire.
-    if ($this->auto_expire != null && !isset($this->payload["exp"])) $this->payload["exp"] = strtotime($this->auto_expire);
+    if ($this->auto_expire != null && !isset($this->payload["exp"])) {
+     $this->payload["exp"] = strtotime($this->auto_expire);
+    }
     $jwt = base64url_encode(json_encode($this->header));
-    if ($jwt === false) return null;
-    if ($jwt != "") $jwt .= ".";
+    if ($jwt === false) {
+     return null;
+    }
+    if ($jwt != "") {
+     $jwt .= ".";
+    }
     $payload = base64url_encode(json_encode($this->payload));
     $jwt .= $payload;
-    if ($key != "") return $this->sign_token($jwt, $key, $this->header["alg"]);
+    if ($key != "") {
+     return $this->sign_token($jwt, $key, $this->header["alg"]);
+    }
     return $jwt . ".";
   }
   /**
@@ -167,11 +187,17 @@ 
    */
   public function token():?string {
     // Checks.
-    if  (count($this->payload) == 0) return null;
+    if  (count($this->payload) == 0) {
+     return null;
+    }
     // Begin.
     $this->header["alg"] = self::NONE;
-    if ($this->set_iat) $this->payload["iat"] = $this->payload["iat"] ?? time();
-    if ($this->auto_expire != null) $this->payload["exp"] = strtotime($this->auto_expire);
+    if ($this->set_iat) {
+     $this->payload["iat"] = $this->payload["iat"] ?? time();
+    }
+    if ($this->auto_expire != null) {
+     $this->payload["exp"] = strtotime($this->auto_expire);
+    }
     return base64url_encode(json_encode($this->header)) . "." . base64url_encode(json_encode($this->payload)) . ".";
   }
 
@@ -182,14 +208,21 @@ 
    * @return bool           [description]
    */
   public function verify(string $jwt, string $secret=null):bool {
-    if (substr_count($jwt, ".") != 2) return false; // Invalid JWT.
+    if (substr_count($jwt, ".") != 2) {
+     return false;
+    }
+    // Invalid JWT.
     $key = $secret ?? $this->secret;
     $parts = explode(".", $jwt);
     $header = json_decode(base64url_decode($parts[0]) ,true);
-    if ($header == null) return false;
+    if ($header == null) {
+     return false;
+    }
     $alg = $this->algorithm ?? $header["alg"] ?? self::HS256;
     $payload = json_decode(base64url_decode($parts[1]) ,true);
-    if ($payload == null) return false;
+    if ($payload == null) {
+     return false;
+    }
     if ($parts[2] == "") {
       return $this->allow_unsigned;
     }
@@ -213,9 +246,13 @@ 
   public function decode(string $jwt):bool {
     $parts = explode(".", $jwt);
     $header = json_decode(base64url_decode($parts[0]), true);
-    if ($header === false) return false;
+    if ($header === false) {
+     return false;
+    }
     $payload = json_decode(base64url_decode($parts[1]), true);
-    if ($payload === false) return false;
+    if ($payload === false) {
+     return false;
+    }
     $this->header = $header;
     $this->payload = $payload;
     return true;
@@ -257,7 +294,9 @@ 
    * @return string        Complete JWT.
    */
   private function sign_token(string $token, string $key, string $alg):string {
-    if ($alg == self::NONE) return $token . ".";
+    if ($alg == self::NONE) {
+     return $token . ".";
+    }
     $token = rtrim($token, ".");
     $signature = hash_hmac(self::ALGOS[$alg], $token, $key);
     return $token . "." . $signature;