php-resta / resta-core

src/resta/Authenticate/AuthenticateToken.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
     /**

      * @var null

      */

-    public $credentialHash=null;

+    public $credentialHash = null;

 

     /**

      * @return string

@@ -16,7 +16,7 @@ 
     {

         // the absolute params property must be present

         // in the object and the params value must be the builder key.

-        if(property_exists($this,'params') and isset($this->params['builder'])){

+        if (property_exists($this, 'params') and isset($this->params['builder'])) {

 

             // a real token will be generated after

             // you get the first method of the query builder value.

@@ -24,7 +24,7 @@ 
 

             // we refer to the token closure feature on the config to enable

             // the creation of user-based tokens on the application side.

-            return $this->getTokenFromProvider($authData,function() use($authData){

+            return $this->getTokenFromProvider($authData, function() use($authData){

                 return md5(sha1($authData->id.'__'.$this->credentialHash.'__'.time().'__'.fingerPrint()));

             });

         }

@@ -37,11 +37,11 @@ 
      * @param callable $callback

      * @return mixed

      */

-    private function getTokenFromProvider($authData,callable $callback)

+    private function getTokenFromProvider($authData, callable $callback)

     {

         // if the token value is a closure value,

         // we will run a user-based token closure.

-        if(app()->has('authenticate.token') && is_callable($token = app()->get('authenticate.token'))){

+        if (app()->has('authenticate.token') && is_callable($token = app()->get('authenticate.token'))) {

             return $token($authData);

         }

 

src/resta/Authenticate/Driver/Eloquent/UserBuilderHelper.php

Spacing +29 added lines, -29 removed lines

@@ -35,7 +35,7 @@ 
     {

         $userId = $manager->getAuth()->params['userId'];

 

-        return DeviceToken::where('user_id',$userId)->get();

+        return DeviceToken::where('user_id', $userId)->get();

     }

 

     /**

@@ -44,7 +44,7 @@ 
      */

     protected function callbackQueryWithoutCredentials($driver)

     {

-        if($this->isCallableAddToWhere()){

+        if ($this->isCallableAddToWhere()) {

 

             return $driver::where(function($query) {

 

@@ -66,8 +66,8 @@ 
         return DeviceToken::where(function($query) use($token) {

 

             //where query for token

-            $query->where('token_integer',crc32(md5($token)));

-            $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));

+            $query->where('token_integer', crc32(md5($token)));

+            $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));

 

             // if the addToWhereClosure value is a closure,

             // then in this case we actually run

@@ -96,8 +96,8 @@ 
         return DeviceToken::where(function($query) use($token) {

 

             //where query for token

-            $query->where('token_integer',crc32(md5($token)));

-            $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));

+            $query->where('token_integer', crc32(md5($token)));

+            $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));

 

             // if the addToWhereClosure value is a closure,

             // then in this case we actually run

@@ -114,13 +114,13 @@ 
      * @param array $credentials

      * @return mixed

      */

-    protected function queryAddToWhere($query,$credentials=array())

+    protected function queryAddToWhere($query, $credentials = array())

     {

         // if the addToWhereClosure value is a closure,

         // then in this case we actually run

         // the closure object and add it to the query value.

-        if($this->isCallableAddToWhere()){

-            return $this->query['addToWhere']($query,$credentials);

+        if ($this->isCallableAddToWhere()) {

+            return $this->query['addToWhere']($query, $credentials);

         }

     }

 

@@ -135,7 +135,7 @@ 
         //we get the model specified for the builder.

         $driver = $this->query['driver'];

 

-        if(count($credentials->get())==0){

+        if (count($credentials->get())==0) {

 

             // if the credential array is empty in the config section,

             // then you must run the query with a callable value of addToWhere value.

@@ -148,14 +148,14 @@ 
 

             // with the callback method (eloquent model)

             // we write the where clause.

-            foreach ($credentials->get() as $credential=>$credentialValue){

+            foreach ($credentials->get() as $credential=>$credentialValue) {

 

-                if(app()->has('authenticate.'.$credential)

-                    && is_callable($provider = app()->get('authenticate.'.$credential))){

-                    $query->where($credential,$provider($credentialValue));

+                if (app()->has('authenticate.'.$credential)

+                    && is_callable($provider = app()->get('authenticate.'.$credential))) {

+                    $query->where($credential, $provider($credentialValue));

                 }

-                else{

-                    $query->where($credential,$credentialValue);

+                else {

+                    $query->where($credential, $credentialValue);

                 }

 

             }

@@ -163,17 +163,17 @@ 
             // if the addToWhereClosure value is a closure,

             // then in this case we actually run

             // the closure object and add it to the query value.

-            $this->queryAddToWhere($query,$credentials->get(),$credentials->get());

+            $this->queryAddToWhere($query, $credentials->get(), $credentials->get());

         });

     }

 

     /**

      * @return void|mixed

      */

-    protected function updateToken($token=null)

+    protected function updateToken($token = null)

     {

         //if query status value is true

-        if($this->auth->params['status']){

+        if ($this->auth->params['status']) {

 

             // we go to the method that produces

             // the classical token value and get the token value.

@@ -183,7 +183,7 @@ 
             // if there is no update, we reset the status value to 0.

             $update = $this->auth->params['builder']->update(['token'=>$this->auth->params['token']]);

 

-            if(!$update){

+            if (!$update) {

                 $this->auth->params['status'] = 0;

                 $this->auth->params['exception'] = 'update';

             }

@@ -199,10 +199,10 @@ 
     {

         $token_integer = crc32(md5($this->auth->params['token']));

 

-        if(!is_null($token_integer)){

+        if (!is_null($token_integer)) {

 

-            if(DeviceToken::where('user_id',$this->auth->params['authId'])

-                ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0){

+            if (DeviceToken::where('user_id', $this->auth->params['authId'])

+                ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0) {

 

                 return DeviceToken::create([

                     'user_id' => $this->auth->params['authId'],

@@ -213,10 +213,10 @@ 
                     'expire' => $this->auth->getExpire(),

                 ]);

             }

-            else{

+            else {

 

-                return DeviceToken::where('user_id',$this->auth->params['authId'])

-                    ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))

+                return DeviceToken::where('user_id', $this->auth->params['authId'])

+                    ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))

                     ->update([

                     'token' => $this->auth->params['token'],

                     'token_integer' => $token_integer

@@ -236,11 +236,11 @@ 
     {

         $token_integer = crc32(md5($this->auth->getTokenSentByUser()));

 

-        if(!is_null($token_integer)){

+        if (!is_null($token_integer)) {

 

-            DeviceToken::where('token_integer',$token_integer)->delete();

+            DeviceToken::where('token_integer', $token_integer)->delete();

             

-            return (DeviceToken::where('token_integer',$token_integer)->count()) ? false : true;

+            return (DeviceToken::where('token_integer', $token_integer)->count()) ? false : true;

         }

 

     }

Braces +2 added lines, -4 removed lines

@@ -153,8 +153,7 @@ 
                 if(app()->has('authenticate.'.$credential)

                     && is_callable($provider = app()->get('authenticate.'.$credential))){

                     $query->where($credential,$provider($credentialValue));

-                }

-                else{

+                } else{

                     $query->where($credential,$credentialValue);

                 }

 

@@ -212,8 +211,7 @@ 
                     'device_agent_integer' => crc32(md5($_SERVER['HTTP_USER_AGENT'])),

                     'expire' => $this->auth->getExpire(),

                 ]);

-            }

-            else{

+            } else{

 

                 return DeviceToken::where('user_id',$this->auth->params['authId'])

                     ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))