ddimaria / Laravel-REST-CMS

app/Console/Commands/BaseCommand.php

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
 
 class BaseCommand extends Command {
 

app/Console/Commands/Generic.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php namespace App\Console\Commands;
 
 use App\Console\Commands\BaseCommand;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 
 class Generic extends BaseCommand {

app/Http/Controllers/API/V1/ApiController.php

Unused Use Statements -4 removed lines

@@ -4,10 +4,6 @@
 
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Contracts\Validation\ValidationException;
-use Illuminate\Foundation\Bus\DispatchesCommands;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
-
 use Chrisbjr\ApiGuard\Http\Controllers\ApiGuardController;
 
 abstract class ApiController extends ApiGuardController

Indentation +145 added lines, -145 removed lines

@@ -12,162 +12,162 @@
 
 abstract class ApiController extends ApiGuardController
 {
-    /**
-     * Laraponse object, which abstracts Fractal
-     * 
-     * @var EllipseSynergie\ApiResponse\Laravel\Response
-     */
-    public $response;
+	/**
+	 * Laraponse object, which abstracts Fractal
+	 * 
+	 * @var EllipseSynergie\ApiResponse\Laravel\Response
+	 */
+	public $response;
     
-    /**
-     * The string name of the Eloquen Model
-     * 
-     * @var string
-     */
-    protected $modelName;
+	/**
+	 * The string name of the Eloquen Model
+	 * 
+	 * @var string
+	 */
+	protected $modelName;
     
-    /**
-     * The Eloquent Model
-     * 
-     * @var Illuminate\Database\Eloquent\Model
-     */
-    protected $model;
+	/**
+	 * The Eloquent Model
+	 * 
+	 * @var Illuminate\Database\Eloquent\Model
+	 */
+	protected $model;
     
-    /**
-     * The string name of the Transformer class
-     * 
-     * @var string
-     */
-    protected $transformerName;
+	/**
+	 * The string name of the Transformer class
+	 * 
+	 * @var string
+	 */
+	protected $transformerName;
     
-    /**
-     * The name of the collection that is returned in the JSON response
-     * 
-     * @var string
-     */
-    protected $collectionName;
+	/**
+	 * The name of the collection that is returned in the JSON response
+	 * 
+	 * @var string
+	 */
+	protected $collectionName;
     
-    /**
-     * The Fractal Manager
-     * 
-     * @var \League\Fractal\Manager
-     */
-    public $manager;
-
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->response =  \Response::api();
+	/**
+	 * The Fractal Manager
+	 * 
+	 * @var \League\Fractal\Manager
+	 */
+	public $manager;
+
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->response =  \Response::api();
         
-        if (!empty($this->modelName)) {
-            $this->model = new $this->modelName;
-        }
-
-        // if no collection name provided, use the model's table name
-        if (empty($this->collectionName)) {
-            $this->collectionName = $this->model->getTable();
-        }
+		if (!empty($this->modelName)) {
+			$this->model = new $this->modelName;
+		}
+
+		// if no collection name provided, use the model's table name
+		if (empty($this->collectionName)) {
+			$this->collectionName = $this->model->getTable();
+		}
         
-        // parse includes
-        if (\Input::get('include') != '') {
-            $this->manager = new \League\Fractal\Manager;
-            $this->manager->parseIncludes(explode(',', \Input::get('include')));
-
-            //print_r($this->manager);exit;
-        }
-
-        parent::__construct();
-    }
-
-    /**
-     * Create an item
-     * 
-     * @return array
-     */
-    public function create($data = null)
-    {   
-        $data = $data ?: \Input::json()->all();
-
-        try {
-            $this->model->validate($data);
-            $item = $this->model->create($data);
+		// parse includes
+		if (\Input::get('include') != '') {
+			$this->manager = new \League\Fractal\Manager;
+			$this->manager->parseIncludes(explode(',', \Input::get('include')));
+
+			//print_r($this->manager);exit;
+		}
+
+		parent::__construct();
+	}
+
+	/**
+	 * Create an item
+	 * 
+	 * @return array
+	 */
+	public function create($data = null)
+	{   
+		$data = $data ?: \Input::json()->all();
+
+		try {
+			$this->model->validate($data);
+			$item = $this->model->create($data);
             
-            return $this->showByObject($item);
+			return $this->showByObject($item);
         
-        } catch (ValidationException $e) {
-            return $this->response->setStatusCode(422)->withError($e->errors()->toArray(), 'GEN-UNPROCESSABLE-ENTITY');
-        }
-    }
-
-    /**
-     * Returns a single item
-     * 
-     * @param  int $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function show($id)
-    {        
-        try {
+		} catch (ValidationException $e) {
+			return $this->response->setStatusCode(422)->withError($e->errors()->toArray(), 'GEN-UNPROCESSABLE-ENTITY');
+		}
+	}
+
+	/**
+	 * Returns a single item
+	 * 
+	 * @param  int $id
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function show($id)
+	{        
+		try {
             
-            return $this->response->withItem($this->model->findOrFail($id), new $this->transformerName);
+			return $this->response->withItem($this->model->findOrFail($id), new $this->transformerName);
         
-        } catch (ModelNotFoundException $e) {
-
-            return $this->respondNotFound();
-        }
-    }
-
-    /**
-     * Returns a single item
-     * 
-     * @param  object $object
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function showByObject($object)
-    {        
-        try {
-            return $this->response->withItem($object, new $this->transformerName);
+		} catch (ModelNotFoundException $e) {
+
+			return $this->respondNotFound();
+		}
+	}
+
+	/**
+	 * Returns a single item
+	 * 
+	 * @param  object $object
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function showByObject($object)
+	{        
+		try {
+			return $this->response->withItem($object, new $this->transformerName);
         
-        } catch (ModelNotFoundException $e) {
-
-            return $this->respondNotFound();
-        }
-    }
-
-    /**
-     * Returns a paginated collection
-     * 
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function collection()
-    {
-        $limit = \Input::get('limit') ?: 10;
-        $model = $this->model;
+		} catch (ModelNotFoundException $e) {
+
+			return $this->respondNotFound();
+		}
+	}
+
+	/**
+	 * Returns a paginated collection
+	 * 
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function collection()
+	{
+		$limit = \Input::get('limit') ?: 10;
+		$model = $this->model;
         
-        if (\Request::has('order')) {
-            list($orderCol, $orderBy) = explode('|', \Input::get('order'));
-            $model = $model->orderBy($orderCol, $orderBy);
-        }
-
-        return $this->response->withPaginator($model->paginate($limit), new $this->transformerName, $this->collectionName);
-    }
-
-    /**
-     * Handles 404 errors
-     * 
-     * @param  string $msg
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondNotFound($msg = 'Not found!')
-    {
-        return \Response::json([
-            'error' => [
-                'message' => $msg,
-                'status_code' => 404
-            ]
-        ], 404);
-    }
+		if (\Request::has('order')) {
+			list($orderCol, $orderBy) = explode('|', \Input::get('order'));
+			$model = $model->orderBy($orderCol, $orderBy);
+		}
+
+		return $this->response->withPaginator($model->paginate($limit), new $this->transformerName, $this->collectionName);
+	}
+
+	/**
+	 * Handles 404 errors
+	 * 
+	 * @param  string $msg
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function respondNotFound($msg = 'Not found!')
+	{
+		return \Response::json([
+			'error' => [
+				'message' => $msg,
+				'status_code' => 404
+			]
+		], 404);
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      */
     public function __construct()
     {
-        $this->response =  \Response::api();
+        $this->response = \Response::api();
         
         if (!empty($this->modelName)) {
             $this->model = new $this->modelName;

app/Http/Middleware/Cors.php

Unused Use Statements -2 removed lines

@@ -1,9 +1,7 @@
 <?php namespace App\Http\Middleware;
 
 use Closure;
-
 use Illuminate\Contracts\Routing\Middleware;
-use Illuminate\Http\Response;
 
 class Cors implements Middleware {
 

app/LaravelRestCms/User/User.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	 * Relationship to the api_key table
 	 * 
 	 * @codeCoverageIgnore
-	 * @return Illuminate\Database\Eloquent\Relations\HasOne
+	 * @return \Illuminate\Database\Eloquent\Relations\HasOne
 	 */
 	public function apiKey()
 	{

app/Library/Sftp.php

Doc Comments -1 removed lines

@@ -126,7 +126,6 @@
     /**
      * Retrieves a listing from directory
      * 
-     * @param  string   $dir 
      * @return boolean  success
      */
     public function rename($remoteFileFrom, $remoteFileTo)

Indentation +126 added lines, -126 removed lines

@@ -7,153 +7,153 @@
 class Sftp
 {
     
-    protected $connectionName;
-
-    /**
-     * Constructor
-     *
-     * @param string $connectionName
-     */
-    public function __construct($connectionName)
-    {
-        $this->connectionName = $connectionName;
-    }
-
-    /**
-     * Gets all XML files from a remote folder
-     * 
-     * @param  string $remoteDir 
-     * @param  string $localDir 
-     * @return array
-     */
+	protected $connectionName;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $connectionName
+	 */
+	public function __construct($connectionName)
+	{
+		$this->connectionName = $connectionName;
+	}
+
+	/**
+	 * Gets all XML files from a remote folder
+	 * 
+	 * @param  string $remoteDir 
+	 * @param  string $localDir 
+	 * @return array
+	 */
    	public function getFiles($remoteDir, $localDir)
    	{    	
-    	$files = $this->remoteListPackaged($remoteDir);
+		$files = $this->remoteListPackaged($remoteDir);
 
-    	foreach ($files as $file) {			
+		foreach ($files as $file) {			
 			$this->getFile($file['fullFileName'], $localDir . '/' . $file['fileName']);
 		}
 
-    	return $files;
+		return $files;
   	}
 
-    /**
-     * Gets all XML files from a remote folder
-     * 
-     * @param  string 	$dir 
-     * @param  bool     $sorted 
-     * @param  string   $sortOrder 
-     * @return array
-     */
+	/**
+	 * Gets all XML files from a remote folder
+	 * 
+	 * @param  string 	$dir 
+	 * @param  bool     $sorted 
+	 * @param  string   $sortOrder 
+	 * @return array
+	 */
    	public function remoteListPackaged($dir, $sorted = true, $sortOrder = 'desc')
    	{    	
-    	$files = [];
+		$files = [];
 		$all = $this->remoteList($dir, $sorted, $sortOrder);
 		
-        foreach ($all as $file=>$val) {
+		foreach ($all as $file=>$val) {
 			if ($this->isValidExtension($val['filename'])) {
 				$files[] = [
-                    'fileName' => $val['filename'], 
-                    'fullFileName' => $dir . '/' .$val['filename'],
-                    'size' => $val['size'],
-                    'modified' => gmdate("m/d/Y H:i:s", $val['mtime']),
-                ];
+					'fileName' => $val['filename'], 
+					'fullFileName' => $dir . '/' .$val['filename'],
+					'size' => $val['size'],
+					'modified' => gmdate("m/d/Y H:i:s", $val['mtime']),
+				];
 			}
 		}
 
 		return $files;
-    }
+	}
 
-    /**
-     * Retrieves a file from a SSH/SFTP server
-     * 
-     * @param  string $remoteFile 
-     * @param  string $localFile 
+	/**
+	 * Retrieves a file from a SSH/SFTP server
+	 * 
+	 * @param  string $remoteFile 
+	 * @param  string $localFile 
 	 * @return \Symfony\Component\Console\Output\OutputInterface
-     */
-    public function getFile($remoteFile, $localFile)
-    {	
-    	return \SSH::into($this->connectionName)->get($remoteFile, $localFile);    
-    }
-
-    /**
-     * Places a file on a remote SSH/SFTP server
-     * 
-     * @param  string $remoteFile 
-     * @param  string $localFile 
+	 */
+	public function getFile($remoteFile, $localFile)
+	{	
+		return \SSH::into($this->connectionName)->get($remoteFile, $localFile);    
+	}
+
+	/**
+	 * Places a file on a remote SSH/SFTP server
+	 * 
+	 * @param  string $remoteFile 
+	 * @param  string $localFile 
 	 * @return \Symfony\Component\Console\Output\OutputInterface
-     */
-    public function putFile($remoteFile, $localFile)
-    {
-    	return \SSH::into($this->connectionName)->put($localFile, $remoteFile);
-    }
-
-    /**
-     * Retrieves a listing from directory
-     * 
-     * @param  string 	$dir 
-     * @param  bool     $sorted 
-     * @param  string   $sortOrder 
+	 */
+	public function putFile($remoteFile, $localFile)
+	{
+		return \SSH::into($this->connectionName)->put($localFile, $remoteFile);
+	}
+
+	/**
+	 * Retrieves a listing from directory
+	 * 
+	 * @param  string 	$dir 
+	 * @param  bool     $sorted 
+	 * @param  string   $sortOrder 
 	 * @return array 	array of files and folders	
-     */
-    public function remoteList($dir, $sorted = true, $sortOrder = 'desc')
-    {
-    	$conn = $this->getConnection();
-    	$conn->chdir($dir);
-        $list = $conn->rawlist();
-
-        if ($sorted) {
-            $list = $this->sortList($list, $sortOrder);
-        }
+	 */
+	public function remoteList($dir, $sorted = true, $sortOrder = 'desc')
+	{
+		$conn = $this->getConnection();
+		$conn->chdir($dir);
+		$list = $conn->rawlist();
+
+		if ($sorted) {
+			$list = $this->sortList($list, $sortOrder);
+		}
     	
-    	return $list;    
-    }
-
-    /**
-     * Retrieves a listing from directory
-     * 
-     * @param  array    $list 
-     * @param  string   $sortOrder 
-     * @return array    sorted array of a folder
-     */
-    public function sortList($list, $sortOrder = 'desc')
-    {
-        usort($list, function($a, $b) { return $a['mtime'] - $b['mtime']; }); 
-
-        return $sortOrder == 'asc' ? $list : array_reverse($list);
-    }
-
-    /**
-     * Retrieves a listing from directory
-     * 
-     * @param  string   $dir 
-     * @return boolean  success
-     */
-    public function rename($remoteFileFrom, $remoteFileTo)
-    {
-        $conn = $this->getConnection();
-        //print $conn->getSFTPLog();;
-        return $conn->rename($remoteFileFrom, $remoteFileTo);
-    }
-
-    /**
-     * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
-     * 
-     * @return Net_SFTP connection
-     */
-    protected function getConnection()
-    {
-    	return \SSH::into($this->connectionName)->getGateway()->getConnection();
-    }
-
-    /**
-     * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
-     * 
-     * @param  string $fileName 
-     * @return bool 	
-     */
-    protected function isValidExtension($fileName)
-    {
-    	return substr(strrchr($fileName,'.'),1) === 'xml' || substr(strrchr($fileName,'.'),1) === 'err';
-    }
+		return $list;    
+	}
+
+	/**
+	 * Retrieves a listing from directory
+	 * 
+	 * @param  array    $list 
+	 * @param  string   $sortOrder 
+	 * @return array    sorted array of a folder
+	 */
+	public function sortList($list, $sortOrder = 'desc')
+	{
+		usort($list, function($a, $b) { return $a['mtime'] - $b['mtime']; }); 
+
+		return $sortOrder == 'asc' ? $list : array_reverse($list);
+	}
+
+	/**
+	 * Retrieves a listing from directory
+	 * 
+	 * @param  string   $dir 
+	 * @return boolean  success
+	 */
+	public function rename($remoteFileFrom, $remoteFileTo)
+	{
+		$conn = $this->getConnection();
+		//print $conn->getSFTPLog();;
+		return $conn->rename($remoteFileFrom, $remoteFileTo);
+	}
+
+	/**
+	 * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
+	 * 
+	 * @return Net_SFTP connection
+	 */
+	protected function getConnection()
+	{
+		return \SSH::into($this->connectionName)->getGateway()->getConnection();
+	}
+
+	/**
+	 * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
+	 * 
+	 * @param  string $fileName 
+	 * @return bool 	
+	 */
+	protected function isValidExtension($fileName)
+	{
+		return substr(strrchr($fileName,'.'),1) === 'xml' || substr(strrchr($fileName,'.'),1) === 'err';
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 			if ($this->isValidExtension($val['filename'])) {
 				$files[] = [
                     'fileName' => $val['filename'], 
-                    'fullFileName' => $dir . '/' .$val['filename'],
+                    'fullFileName' => $dir . '/' . $val['filename'],
                     'size' => $val['size'],
                     'modified' => gmdate("m/d/Y H:i:s", $val['mtime']),
                 ];
@@ -154,6 +154,6 @@ 
      */
     protected function isValidExtension($fileName)
     {
-    	return substr(strrchr($fileName,'.'),1) === 'xml' || substr(strrchr($fileName,'.'),1) === 'err';
+    	return substr(strrchr($fileName, '.'), 1) === 'xml' || substr(strrchr($fileName, '.'), 1) === 'err';
     }
 }
\ No newline at end of file

app/Http/Controllers/API/V1/UserController.php

Indentation +120 added lines, -120 removed lines

@@ -10,129 +10,129 @@
 
 class UserController extends ApiGuardController
 {
-    /**
-     * The name of the model to use for this package
-     * 
-     * @var string
-     */
-    protected $modelName = 'App\LaravelRestCms\User\User';
+	/**
+	 * The name of the model to use for this package
+	 * 
+	 * @var string
+	 */
+	protected $modelName = 'App\LaravelRestCms\User\User';
     
-    /**
-     * The name of the transformer to use for this package
-     * 
-     * @var string
-     */
-    protected $transformerName = 'App\LaravelRestCms\User\UserTransformer';
+	/**
+	 * The name of the transformer to use for this package
+	 * 
+	 * @var string
+	 */
+	protected $transformerName = 'App\LaravelRestCms\User\UserTransformer';
     
-    /**
-     * The key to use as a key for this collection in the output
-     * 
-     * @var string
-     */
-    protected $collectionName = 'users';
-
-    /**
-     * The methods that don't require api authentication
-     * 
-     * @var array
-     */
-    protected $apiMethods = [
-        'authenticate' => [
-            'keyAuthentication' => false
-        ],
-        'deauthenticate' => [
-            'keyAuthentication' => false
-        ]
-    ];
-
-    /**
-     * Authenticate the login
-     * 
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function authenticate() 
-    {
-        $credentials['username'] = Input::get('username');
-        $credentials['password'] = Input::get('password');
+	/**
+	 * The key to use as a key for this collection in the output
+	 * 
+	 * @var string
+	 */
+	protected $collectionName = 'users';
+
+	/**
+	 * The methods that don't require api authentication
+	 * 
+	 * @var array
+	 */
+	protected $apiMethods = [
+		'authenticate' => [
+			'keyAuthentication' => false
+		],
+		'deauthenticate' => [
+			'keyAuthentication' => false
+		]
+	];
+
+	/**
+	 * Authenticate the login
+	 * 
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function authenticate() 
+	{
+		$credentials['username'] = Input::get('username');
+		$credentials['password'] = Input::get('password');
         
-        $validator = Validator::make([
-                'username' => $credentials['username'],
-                'password' => $credentials['password']
-            ],
-            [
-                'username' => 'required|max:255',
-                'password' => 'required|max:255'
-            ]
-        );
+		$validator = Validator::make([
+				'username' => $credentials['username'],
+				'password' => $credentials['password']
+			],
+			[
+				'username' => 'required|max:255',
+				'password' => 'required|max:255'
+			]
+		);
         
-        if ($validator->fails()) {
-            return $this->response->errorWrongArgsValidator($validator);
-        }
-
-        try {
-            $user                 = with(new User)->authenticate($credentials['username'], $credentials['password'])->first();
-            $credentials['email'] = $user->email;
-        } catch (\ErrorException $e) {
-            return $this->response->errorUnauthorized("Your username or password is incorrect");
-        }
-
-        // We have validated this user
-        // Assign an API key for this session
-        $apiKey = ApiKey::where('user_id', '=', $user->id)->first();
+		if ($validator->fails()) {
+			return $this->response->errorWrongArgsValidator($validator);
+		}
+
+		try {
+			$user                 = with(new User)->authenticate($credentials['username'], $credentials['password'])->first();
+			$credentials['email'] = $user->email;
+		} catch (\ErrorException $e) {
+			return $this->response->errorUnauthorized("Your username or password is incorrect");
+		}
+
+		// We have validated this user
+		// Assign an API key for this session
+		$apiKey = ApiKey::where('user_id', '=', $user->id)->first();
         
-        if (!isset($apiKey)) {
-            $apiKey                = new ApiKey;
-            $apiKey->user_id       = $user->id;
-            $apiKey->key           = $apiKey->generateKey();
-            $apiKey->level         = 5;
-            $apiKey->ignore_limits = 0;
-        } else {
-            $apiKey->generateKey();
-        }
-
-        if (!$apiKey->save()) {
-            return $this->response->errorInternalError("Failed to create an API key. Please try again.");
-        }
-
-
-        // We have an API key.. i guess we only need to return that.
-        return $this->response->withItem($user, new \App\LaravelRestCms\User\UserTransformer);
-    }
-
-    /**
-     * Retrieve the user model
-     * 
-     * @return Model
-     */
-    public function getUserDetails() 
-    {
-        $user = $this->apiKey->user;
-
-        return isset($user) ? $user : $this->response->errorNotFound();
-    }
-
-    /**
-     * Log the user out
-     * 
-     * @param  string $apiKey
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function deauthenticate($apiKey) 
-    {
-        $this->apiKey = ApiKey::where('key', $apiKey)->first();
-
-        if (empty($this->apiKey)) {
-            return $this->response->errorUnauthorized("There is no such user to deauthenticate.");
-        }
-
-        $this->apiKey->delete();
-
-        return $this->response->withArray([
-            'ok' => [
-                'code'      => 'SUCCESSFUL',
-                'http_code' => 200,
-                'message'   => 'User was successfuly deauthenticated'
-            ]
-        ]);
-    }
+		if (!isset($apiKey)) {
+			$apiKey                = new ApiKey;
+			$apiKey->user_id       = $user->id;
+			$apiKey->key           = $apiKey->generateKey();
+			$apiKey->level         = 5;
+			$apiKey->ignore_limits = 0;
+		} else {
+			$apiKey->generateKey();
+		}
+
+		if (!$apiKey->save()) {
+			return $this->response->errorInternalError("Failed to create an API key. Please try again.");
+		}
+
+
+		// We have an API key.. i guess we only need to return that.
+		return $this->response->withItem($user, new \App\LaravelRestCms\User\UserTransformer);
+	}
+
+	/**
+	 * Retrieve the user model
+	 * 
+	 * @return Model
+	 */
+	public function getUserDetails() 
+	{
+		$user = $this->apiKey->user;
+
+		return isset($user) ? $user : $this->response->errorNotFound();
+	}
+
+	/**
+	 * Log the user out
+	 * 
+	 * @param  string $apiKey
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function deauthenticate($apiKey) 
+	{
+		$this->apiKey = ApiKey::where('key', $apiKey)->first();
+
+		if (empty($this->apiKey)) {
+			return $this->response->errorUnauthorized("There is no such user to deauthenticate.");
+		}
+
+		$this->apiKey->delete();
+
+		return $this->response->withArray([
+			'ok' => [
+				'code'      => 'SUCCESSFUL',
+				'http_code' => 200,
+				'message'   => 'User was successfuly deauthenticated'
+			]
+		]);
+	}
 }
\ No newline at end of file

app/Http/routes.php

Indentation +2 added lines, -2 removed lines

@@ -15,6 +15,6 @@
 Route::group(['prefix' => 'api/v1', 'namespace' => 'Api\V1'], function()
 {
 	// users/auth
-    Route::post('user/login', 'UserController@authenticate');
-    Route::get('user/logout/{api_key}', 'UserController@deauthenticate');
+	Route::post('user/login', 'UserController@authenticate');
+	Route::get('user/logout/{api_key}', 'UserController@deauthenticate');
 });
\ No newline at end of file

app/Http/Middleware/Authenticate.php

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
 			if ($request->ajax())
 			{
 				return response('Unauthorized.', 401);
-			}
-			else
+			} else
 			{
 				return redirect()->guest('auth/login');
 			}