vince-scarpa / responsibleAPI

src/responsible.php

Spacing +1 added lines, -1 removed lines

@@ -359,7 +359,7 @@
         $getJWT = (isset($options['getJWT']) && is_bool($options['getJWT']))
         ? $options['getJWT'] : true;
 
-        $getSecretAppend = (isset($options['secret']) && ($options['secret'] == 'append') )
+        $getSecretAppend = (isset($options['secret']) && ($options['secret'] == 'append'))
         ? $options['secret'] : false;
 
         return (new user\user)

src/core/server.php

Spacing +6 added lines, -6 removed lines

@@ -165,7 +165,7 @@ 
             return;
         }
         if (is_null($key) || $key == '') {
-            if( !is_null($response) ) {
+            if (!is_null($response)) {
                 $this->RESPONSE['response'] = $response;
             }
             return;
@@ -206,7 +206,7 @@ 
     public function authenticate()
     {
         $options = $this->getOptions();
-        $route = (isset($options['route']) && !empty($options['route']) ) ? $options['route'] : '';
+        $route = (isset($options['route']) && !empty($options['route'])) ? $options['route'] : '';
 
         $this->endpoints->baseApiRoot(dirname(__DIR__));
         $this->endpoints->register();
@@ -217,7 +217,7 @@ 
         $this->router = $router->route($route);
         $endpoint = $this->endpoints->isEndpoint($router->getApi(), $router->getPath());
 
-        if(isset($endpoint->model['scope'])) {
+        if (isset($endpoint->model['scope'])) {
             $_REQUEST['scope'] = $endpoint->model['scope'];
             $this->header->setData($_REQUEST);
         }
@@ -296,7 +296,7 @@ 
         /**
          * Check if theres a payload sent
          */
-        if(isset($_REQUEST['payload'])) {
+        if (isset($_REQUEST['payload'])) {
             $router->setRequestBody($_REQUEST['payload']);
         }
         // print_r($_REQUEST);
@@ -308,11 +308,11 @@ 
         /**
          * Check the access scope
          */
-        if( !isset($this->router->endpoint->model['scope']) ) {
+        if (!isset($this->router->endpoint->model['scope'])) {
             $this->router->endpoint->model['scope'] = 'private';
         }
 
-        if( isset($this->header->getMethod()->data['scope']) && 
+        if (isset($this->header->getMethod()->data['scope']) && 
             ($this->header->getMethod()->data['scope'] == 'anonymous')
         ) {
             $this->router->endpoint->model['scope'] = 'anonymous';

src/core/throttle/limiter.php

Indentation +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
         if( isset($this->account->scope) &&
             ($this->account->scope == 'anonymous' || $this->account->scope == 'public')
         ) {
-           $this->scope = $this->account->scope;
+            $this->scope = $this->account->scope;
         }
 
         return $this;

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
             $this->setUnlimited();
         }
 
-        if( isset($this->account->scope) &&
+        if (isset($this->account->scope) &&
             ($this->account->scope == 'anonymous' || $this->account->scope == 'public')
         ) {
            $this->scope = $this->account->scope;

src/core/auth/jwtValidate.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
      */
     public static function payload(array $payloadObject = [])
     {
-        if( isset($payloadObject['scope']) && $payloadObject['scope'] == 'anonymous' ) {
+        if (isset($payloadObject['scope']) && $payloadObject['scope'] == 'anonymous') {
             return true;
         }
 

src/core/auth/jwtDecoder.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
          */
         $payloadObject = $cipher->jsonDecode($cipher->decode($jwtPayload));
 
-        if( $this->key == 'payloadOnly' ) {
+        if ($this->key == 'payloadOnly') {
             return $payloadObject;
         }
 

src/core/auth/authorise.php

Spacing +7 added lines, -7 removed lines

@@ -63,7 +63,7 @@ 
         /**
          * Check if a custom scope is set
          */
-        if( isset($this->header->getMethod()->data['scope']) && 
+        if (isset($this->header->getMethod()->data['scope']) && 
             ($this->header->getMethod()->data['scope'] == 'anonymous')
         ) {
             $this->grantAccess = true;
@@ -101,14 +101,14 @@ 
                 ->decode()
             ;
 
-            if( isset($decoded['sub']) && !empty($decoded['sub']) ) {
+            if (isset($decoded['sub']) && !empty($decoded['sub'])) {
 
                 $this->user = (object) (new user\user)
                     ->setOptions($this->getOptions())
                     ->load($decoded['sub'], ['refreshToken' => true])
                 ;
 
-                if ( !empty($this->user) ) {
+                if (!empty($this->user)) {
                     $jwt = new auth\jwt;
                     $decoded = $jwt
                         ->setOptions($this->getOptions())
@@ -117,7 +117,7 @@ 
                         ->decode()
                     ;
                 }
-            }else{
+            } else {
 
                 $this->header->unauthorised();
             }
@@ -127,7 +127,7 @@ 
          * [$user Check user account]
          * @var [object]
          */
-        if ( (isset($decoded['sub']) && !empty($decoded['sub'])) && !$this->user ) {
+        if ((isset($decoded['sub']) && !empty($decoded['sub'])) && !$this->user) {
             $this->user = (object) (new user\user)
                 ->setOptions($this->getOptions())
                 ->load($decoded['sub'], ['refreshToken' => true])
@@ -148,7 +148,7 @@ 
      */
     public function user()
     {
-        if( $this->isGrantType() ) {
+        if ($this->isGrantType()) {
             return (object) [
                 'uid' => -1,
                 'account_id' => 0,
@@ -177,7 +177,7 @@ 
             return;
         }
 
-        if( isset($this->header->getMethod()->data['scope']) && 
+        if (isset($this->header->getMethod()->data['scope']) && 
             ($this->header->getMethod()->data['scope'] == 'anonymous')
         ) {
             return;

Braces +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
                         ->decode()
                     ;
                 }
-            }else{
+            } else{
 
                 $this->header->unauthorised();
             }

src/core/keys/key.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      */
     public function apiKeyGenerate($length = 32)
     {
-        $randInt = microtime().rand(1000, 9999);
+        $randInt = microtime() . rand(1000, 9999);
         $messageDigest = md5($randInt);
         return implode(
             '-',

src/core/endpoints/map.php

Spacing +11 added lines, -11 removed lines

@@ -81,14 +81,14 @@ 
         /**
          * Check if a custom directory was set in the Responsible API options
          */
-        if( (isset($this->options['classRoute']) && !empty($this->options['classRoute'])) && 
+        if ((isset($this->options['classRoute']) && !empty($this->options['classRoute'])) && 
             (isset($this->options['classRoute']['directory']) && isset($this->options['classRoute']['namespace']))
         ) {
             $customService = $this->options['classRoute'];
             $directory = $customService['directory'];
             $middleware = $customService['namespace'];
 
-        }else {
+        } else {
             $middleware = 'responsible';
 
             $endpoint = str_replace(
@@ -135,7 +135,7 @@ 
                 if (class_exists($child)) {
                     self::$middleWareClass = new $child;
                     $this->registry[$point] = self::$middleWareClass->register();
-                }else{
+                } else {
                     (new exception\errorException)
                         ->message("Class Error:: class {$child} needs to exist. See documentation on setting up a service.")
                         ->error('NOT_EXTENDED');
@@ -208,16 +208,16 @@ 
                 if ($found = array_search($endpoint, $this->registry[$api]) !== false) {
                     
                     $scope = 'private';
-                    if( method_exists($this->NAMESPACE_ENDPOINTS[$api], 'scope') ) {
+                    if (method_exists($this->NAMESPACE_ENDPOINTS[$api], 'scope')) {
                         $classScope = (new $this->NAMESPACE_ENDPOINTS[$api])->scope();
                         $position = array_search($endpoint, $this->registry[$api]);
                         
-                        if( is_array($classScope) && isset($classScope[$position]) ) {
+                        if (is_array($classScope) && isset($classScope[$position])) {
                             $endpointSettings['model']['scope'] = $classScope[$position];
 
-                        }else{
+                        } else {
 
-                            if( !is_array($classScope) ) {
+                            if (!is_array($classScope)) {
                                 $endpointSettings['model']['scope'] = $classScope;
                             }
                         }
@@ -267,16 +267,16 @@ 
                         }
 
                         $scope = 'private';
-                        if( method_exists($this->NAMESPACE_ENDPOINTS[$api], 'scope') ) {
+                        if (method_exists($this->NAMESPACE_ENDPOINTS[$api], 'scope')) {
                             $classScope = (new $this->NAMESPACE_ENDPOINTS[$api])->scope();
                             $position = array_search($path, $this->registry[$api]);
                             
-                            if( is_array($classScope) && isset($classScope[$position]) ) {
+                            if (is_array($classScope) && isset($classScope[$position])) {
                                 $scope = $classScope[$position];
 
-                            }else{
+                            } else {
 
-                                if( !is_array($classScope) ) {
+                                if (!is_array($classScope)) {
                                     $scope = $classScope;
                                 }
                             }

Braces +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
             $directory = $customService['directory'];
             $middleware = $customService['namespace'];
 
-        }else {
+        } else {
             $middleware = 'responsible';
 
             $endpoint = str_replace(
@@ -135,7 +135,7 @@ 
                 if (class_exists($child)) {
                     self::$middleWareClass = new $child;
                     $this->registry[$point] = self::$middleWareClass->register();
-                }else{
+                } else{
                     (new exception\errorException)
                         ->message("Class Error:: class {$child} needs to exist. See documentation on setting up a service.")
                         ->error('NOT_EXTENDED');
@@ -215,7 +215,7 @@ 
                         if( is_array($classScope) && isset($classScope[$position]) ) {
                             $endpointSettings['model']['scope'] = $classScope[$position];
 
-                        }else{
+                        } else{
 
                             if( !is_array($classScope) ) {
                                 $endpointSettings['model']['scope'] = $classScope;
@@ -274,7 +274,7 @@ 
                             if( is_array($classScope) && isset($classScope[$position]) ) {
                                 $scope = $classScope[$position];
 
-                            }else{
+                            } else{
 
                                 if( !is_array($classScope) ) {
                                     $scope = $classScope;

src/core/user/userLoad.php

Spacing +14 added lines, -14 removed lines

@@ -85,7 +85,7 @@ 
 
         $this->secret = $this->getDefaults()['config']['MASTER_KEY'];
 
-        if( isset($options['secret']) && $options['secret'] == 'append' ) {
+        if (isset($options['secret']) && $options['secret'] == 'append') {
             $this->secretAppend = true;
         }
     }
@@ -124,7 +124,7 @@ 
                 \PDO::FETCH_OBJ
             );
 
-        if( $this->secretAppend ) {
+        if ($this->secretAppend) {
             $this->secret = $account->secret;
         }
 
@@ -137,7 +137,7 @@ 
                 $account->refresh_token = $this->refreshTokenGenerate($account);
                 $sentToken = (new headers\header)->hasBearerToken();
 
-                if( $sentToken ) {
+                if ($sentToken) {
                     /**
                      * [$jwt Decode the JWT]
                      * @var auth\jwt
@@ -155,7 +155,7 @@ 
                     ;
                     $absSeconds = ($decoded['exp'] - ($this->timeNow() - $leeway));
 
-                    if( $absSeconds > 0 ) {
+                    if ($absSeconds > 0) {
                         $account->JWT = $sentToken;
                     }
 
@@ -193,21 +193,21 @@ 
     public function refreshTokenGenerate($account)
     {
         $offset = 86400;
-        $time = ($this->timeNow()+$offset);
+        $time = ($this->timeNow() + $offset);
 
-        if( isset($account->refresh_token) && !empty($account->refresh_token) ) {
+        if (isset($account->refresh_token) && !empty($account->refresh_token)) {
             $raToken = explode('.', $account->refresh_token);
-            if( is_array($raToken) ) {
+            if (is_array($raToken)) {
                 $raToken = array_values(array_filter($raToken));
-                $time = ($raToken[0] <= ($this->timeNow()-$offset) ) ? ($this->timeNow()+$offset) : $raToken[0];
+                $time = ($raToken[0] <= ($this->timeNow() - $offset)) ? ($this->timeNow() + $offset) : $raToken[0];
             }
         }
 
         $cipher = new encoder\cipher;
-        $refreshHash = $account->account_id.':'.$account->secret;
+        $refreshHash = $account->account_id . ':' . $account->secret;
         $refreshHash = $cipher->encode($cipher->hash('sha256', $refreshHash, $account->secret));
 
-        $refreshHash = $time.'.'.$refreshHash;
+        $refreshHash = $time . '.' . $refreshHash;
         $account->refreshToken = $refreshHash;
 
         $updateProp = [
@@ -342,26 +342,26 @@ 
                 $payload['iat'] = $iat;
             }
             if (false !== ($nbf = $this->checkVal($jwtOptions, 'notBeFor'))) {
-                if( strtolower($nbf) == 'issuedat' && isset($payload['iat']) ) {
+                if (strtolower($nbf) == 'issuedat' && isset($payload['iat'])) {
                     $nbf = $payload['iat'] + 10;
                 }
                 $payload['nbf'] = $nbf;
             }
         }
 
-        if( $refresh && $exp ) {
+        if ($refresh && $exp) {
             $refreshPayload = $payload;
 
             $offset = $exp - $this->timeNow();
             $leeway = ($this->checkVal($this->options['jwt'], 'leeway')) ?: $this->jwt->getLeeway();
 
-            $refreshPayload['exp'] = $exp+$offset+$leeway;
+            $refreshPayload['exp'] = $exp + $offset + $leeway;
 
             $refreshJWT = $this->refreshJWT([
                 'payload' => $refreshPayload
             ]);
 
-            if( isset($refreshJWT['refresh']) ) {
+            if (isset($refreshJWT['refresh'])) {
                 return $refreshJWT['refresh'];
             }
         }