nilsteampassnet / TeamPass

api/Controller/Api/BaseController.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
     {
         $superGlobal = new SuperGlobal();
         $uri = parse_url($superGlobal->get('REQUEST_URI', 'SERVER'), PHP_URL_PATH);
-        $uri = explode( '/', $uri );
+        $uri = explode('/', $uri);
         return $this->sanitizeUrl(array_slice($uri, ((int) array_search('index.php', $uri) + 1)));
     }
 
@@ -71,7 +71,7 @@ 
     {
         $filters = [];
         $array_size = count($array);
-        for ($i=0; $i < $array_size; $i++) {
+        for ($i = 0; $i < $array_size; $i++) {
             array_push($filters, 'trim|escape');
         }
         
@@ -89,7 +89,7 @@ 
      * @param mixed  $data
      * @param string $httpHeader
      */
-    protected function sendOutput($data, $httpHeaders=array()): void
+    protected function sendOutput($data, $httpHeaders = array()): void
     {
         header_remove('Set-Cookie');
 

api/inc/jwt_utils.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	// build a signature based on the header and payload using the secret
 	$base64_url_header = base64url_encode($header);
 	$base64_url_payload = base64url_encode($payload);
-	$signature = hash_hmac('SHA256', $base64_url_header . "." . $base64_url_payload, DB_PASSWD, true);
+	$signature = hash_hmac('SHA256', $base64_url_header.".".$base64_url_payload, DB_PASSWD, true);
 	$base64_url_signature = base64url_encode($signature);
 
 	// verify it matches the signature provided in the jwt
@@ -69,7 +69,7 @@ 
     return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
 }
 
-function get_authorization_header(){
+function get_authorization_header() {
 	$superGlobal = new SuperGlobal();
 	$headers = null;
 	

Indentation +44 added lines, -44 removed lines

@@ -26,43 +26,43 @@ 
 use TeampassClasses\SuperGlobal\SuperGlobal;
 
 function generate_jwt($headers, $payload) {
-	$headers_encoded = base64url_encode(json_encode($headers));
+    $headers_encoded = base64url_encode(json_encode($headers));
 	
-	$payload_encoded = base64url_encode(json_encode($payload));
+    $payload_encoded = base64url_encode(json_encode($payload));
 	
-	$signature = hash_hmac('SHA256', "$headers_encoded.$payload_encoded", DB_PASSWD, true);
-	$signature_encoded = base64url_encode($signature);
+    $signature = hash_hmac('SHA256', "$headers_encoded.$payload_encoded", DB_PASSWD, true);
+    $signature_encoded = base64url_encode($signature);
 	
-	$jwt = "$headers_encoded.$payload_encoded.$signature_encoded";
+    $jwt = "$headers_encoded.$payload_encoded.$signature_encoded";
 	
-	return $jwt;
+    return $jwt;
 }
 
 function is_jwt_valid($jwt) {
-	// split the jwt
-	$tokenParts = explode('.', $jwt);
-	$header = base64_decode($tokenParts[0]);
-	$payload = base64_decode($tokenParts[1]);
-	$signature_provided = $tokenParts[2];
+    // split the jwt
+    $tokenParts = explode('.', $jwt);
+    $header = base64_decode($tokenParts[0]);
+    $payload = base64_decode($tokenParts[1]);
+    $signature_provided = $tokenParts[2];
 
-	// check the expiration time - note this will cause an error if there is no 'exp' claim in the jwt
-	$expiration = json_decode($payload)->exp;
-	$is_token_expired = ($expiration - time()) < 0;
+    // check the expiration time - note this will cause an error if there is no 'exp' claim in the jwt
+    $expiration = json_decode($payload)->exp;
+    $is_token_expired = ($expiration - time()) < 0;
 
-	// build a signature based on the header and payload using the secret
-	$base64_url_header = base64url_encode($header);
-	$base64_url_payload = base64url_encode($payload);
-	$signature = hash_hmac('SHA256', $base64_url_header . "." . $base64_url_payload, DB_PASSWD, true);
-	$base64_url_signature = base64url_encode($signature);
+    // build a signature based on the header and payload using the secret
+    $base64_url_header = base64url_encode($header);
+    $base64_url_payload = base64url_encode($payload);
+    $signature = hash_hmac('SHA256', $base64_url_header . "." . $base64_url_payload, DB_PASSWD, true);
+    $base64_url_signature = base64url_encode($signature);
 
-	// verify it matches the signature provided in the jwt
-	$is_signature_valid = ($base64_url_signature === $signature_provided);
+    // verify it matches the signature provided in the jwt
+    $is_signature_valid = ($base64_url_signature === $signature_provided);
 	
-	if ($is_token_expired || !$is_signature_valid) {
-		return FALSE;
-	} else {
-		return TRUE;
-	}
+    if ($is_token_expired || !$is_signature_valid) {
+        return FALSE;
+    } else {
+        return TRUE;
+    }
 }
 
 function base64url_encode($data) {
@@ -70,24 +70,24 @@ 
 }
 
 function get_authorization_header(){
-	$superGlobal = new SuperGlobal();
-	$headers = null;
+    $superGlobal = new SuperGlobal();
+    $headers = null;
 	
-	if (null !== $superGlobal->get('Authorization', 'SERVER')) {
-		$headers = trim($superGlobal->get('Authorization', 'SERVER'));
-	} else if (null !== $superGlobal->get('HTTP_AUTHORIZATION', 'SERVER')) { //Nginx or fast CGI
-		$headers = trim($superGlobal->get('HTTP_AUTHORIZATION', 'SERVER'));
-	} else if (function_exists('apache_request_headers') === true) {
-		$requestHeaders = (array) apache_request_headers();
-		// Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
-		$requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
-		//print_r($requestHeaders);
-		if (isset($requestHeaders['Authorization']) === true) {
-			$headers = trim($requestHeaders['Authorization']);
-		}
-	}
+    if (null !== $superGlobal->get('Authorization', 'SERVER')) {
+        $headers = trim($superGlobal->get('Authorization', 'SERVER'));
+    } else if (null !== $superGlobal->get('HTTP_AUTHORIZATION', 'SERVER')) { //Nginx or fast CGI
+        $headers = trim($superGlobal->get('HTTP_AUTHORIZATION', 'SERVER'));
+    } else if (function_exists('apache_request_headers') === true) {
+        $requestHeaders = (array) apache_request_headers();
+        // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
+        $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
+        //print_r($requestHeaders);
+        if (isset($requestHeaders['Authorization']) === true) {
+            $headers = trim($requestHeaders['Authorization']);
+        }
+    }
 	
-	return $headers;
+    return $headers;
 }
 
 function get_bearer_token() {
@@ -104,8 +104,8 @@ 
 
 function get_bearer_data($jwt) {
     // split the jwt
-	$tokenParts = explode('.', $jwt);
-	$payload = base64_decode($tokenParts[1]);
+    $tokenParts = explode('.', $jwt);
+    $payload = base64_decode($tokenParts[1]);
 	
     // HEADER: Get the access token from the header
     if (empty($payload) === false) {

api/inc/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -26,22 +26,22 @@ 
 
 use TeampassClasses\SuperGlobal\SuperGlobal;
 
-define("API_ROOT_PATH", __DIR__ . "/..");
+define("API_ROOT_PATH", __DIR__."/..");
 
 // include main configuration file
-require API_ROOT_PATH . '/../sources/main.functions.php';
+require API_ROOT_PATH.'/../sources/main.functions.php';
 
 // init
 loadClasses('DB');
 $superGlobal = new SuperGlobal();
 
 // include the base controller file
-require API_ROOT_PATH . "/Controller/Api/BaseController.php";
+require API_ROOT_PATH."/Controller/Api/BaseController.php";
 
 // include the use model file
-require API_ROOT_PATH . "/Model/UserModel.php";
-require API_ROOT_PATH . "/Model/ItemModel.php";
-require API_ROOT_PATH . "/Model/FolderModel.php";
+require API_ROOT_PATH."/Model/UserModel.php";
+require API_ROOT_PATH."/Model/ItemModel.php";
+require API_ROOT_PATH."/Model/FolderModel.php";
 
 /**
  * Launch expected action for ITEM
@@ -52,10 +52,10 @@ 
  */
 function itemAction(array $actions, array $userData)
 {
-    require API_ROOT_PATH . "/Controller/Api/ItemController.php";
+    require API_ROOT_PATH."/Controller/Api/ItemController.php";
     
     $objFeedController = new ItemController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -68,10 +68,10 @@ 
  */
 function folderAction(array $actions, array $userData)
 {
-    require API_ROOT_PATH . "/Controller/Api/FolderController.php";
+    require API_ROOT_PATH."/Controller/Api/FolderController.php";
 
     $objFeedController = new FolderController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -82,7 +82,7 @@ 
  */
 function apiIsEnabled(): string
 {
-    require_once API_ROOT_PATH . '/../includes/config/tp.config.php';
+    require_once API_ROOT_PATH.'/../includes/config/tp.config.php';
 
     if (isset($SETTINGS) === true && isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
         return json_encode(
@@ -111,7 +111,7 @@ 
  */
 function verifyAuth(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false && is_jwt_valid($bearer_token) === true) {
@@ -141,7 +141,7 @@ 
  */
 function getDataFromToken(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false) {