OmarElGabry / lumen-api-oauth

app/Http/Controllers/Controller.php

Doc Comments +1 added lines, -5 removed lines

@@ -21,7 +21,6 @@ 
     /**
      * Return a JSON response for error.
      *
-     * @param  array  $data
      * @param  string $code
      * @return \Illuminate\Http\JsonResponse
      */
@@ -33,7 +32,7 @@ 
      * Check if the user is authorized to perform a given action on a resource.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  array $resource
+     * @param  string $resource
      * @param  mixed|array $arguments
      * @return boolean
      * @see    https://lumen.laravel.com/docs/authorization 
@@ -67,9 +66,6 @@ 
      * Get current authorized user id.
      * This method should be called only after validating the access token using OAuthMiddleware Middleware.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  array $resource
-     * @param  array $data
      * @return boolean
      * 
      * @throws LucaDegasperi\OAuth2Server\Exceptions\NoActiveAccessTokenException

Indentation +11 added lines, -11 removed lines

@@ -14,9 +14,9 @@ 
      * @param  string $code
      * @return \Illuminate\Http\JsonResponse
      */
-	public function success($data, $code){
-		return response()->json(['data' => $data], $code);
-	}
+    public function success($data, $code){
+        return response()->json(['data' => $data], $code);
+    }
 
     /**
      * Return a JSON response for error.
@@ -25,9 +25,9 @@ 
      * @param  string $code
      * @return \Illuminate\Http\JsonResponse
      */
-	public function error($message, $code){
-		return response()->json(['message' => $message], $code);
-	}
+    public function error($message, $code){
+        return response()->json(['message' => $message], $code);
+    }
 
     /**
      * Check if the user is authorized to perform a given action on a resource.
@@ -40,14 +40,14 @@ 
      */
     protected function authorizeUser(Request $request, $resource, $arguments = []){
     	
-    	$user 	 = User::find($this->getUserId());
-    	$action	 = $this->getAction($request); 
+        $user 	 = User::find($this->getUserId());
+        $action	 = $this->getAction($request); 
 
         // The ability string must match the string defined in App\Providers\AuthServiceProvider\ability()
         $ability = "{$action}-{$resource}";
 
-    	// return $this->authorizeForUser($user, "{$action}-{$resource}", $data);
-    	return Gate::forUser($user)->allows($ability, $arguments);
+        // return $this->authorizeForUser($user, "{$action}-{$resource}", $data);
+        return Gate::forUser($user)->allows($ability, $arguments);
     }
 
     /**
@@ -75,7 +75,7 @@ 
      * @throws LucaDegasperi\OAuth2Server\Exceptions\NoActiveAccessTokenException
      */
     protected function getUserId(){
-    	return \LucaDegasperi\OAuth2Server\Facades\Authorizer::getResourceOwnerId();
+        return \LucaDegasperi\OAuth2Server\Facades\Authorizer::getResourceOwnerId();
     }
 
     /**

Spacing +10 added lines, -10 removed lines

@@ -5,7 +5,7 @@ 
 use App\User;
 use Gate;
 
-class Controller extends BaseController{
+class Controller extends BaseController {
 
     /**
      * Return a JSON response for success.
@@ -14,7 +14,7 @@ 
      * @param  string $code
      * @return \Illuminate\Http\JsonResponse
      */
-	public function success($data, $code){
+	public function success($data, $code) {
 		return response()->json(['data' => $data], $code);
 	}
 
@@ -25,7 +25,7 @@ 
      * @param  string $code
      * @return \Illuminate\Http\JsonResponse
      */
-	public function error($message, $code){
+	public function error($message, $code) {
 		return response()->json(['message' => $message], $code);
 	}
 
@@ -38,10 +38,10 @@ 
      * @return boolean
      * @see    https://lumen.laravel.com/docs/authorization 
      */
-    protected function authorizeUser(Request $request, $resource, $arguments = []){
+    protected function authorizeUser(Request $request, $resource, $arguments = []) {
     	
-    	$user 	 = User::find($this->getUserId());
-    	$action	 = $this->getAction($request); 
+    	$user = User::find($this->getUserId());
+    	$action = $this->getAction($request); 
 
         // The ability string must match the string defined in App\Providers\AuthServiceProvider\ability()
         $ability = "{$action}-{$resource}";
@@ -59,7 +59,7 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @return bool
      */
-    public function isAuthorized(Request $request){
+    public function isAuthorized(Request $request) {
         return false;
     }
 
@@ -74,7 +74,7 @@ 
      * 
      * @throws LucaDegasperi\OAuth2Server\Exceptions\NoActiveAccessTokenException
      */
-    protected function getUserId(){
+    protected function getUserId() {
     	return \LucaDegasperi\OAuth2Server\Facades\Authorizer::getResourceOwnerId();
     }
 
@@ -84,7 +84,7 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @return string
      */
-    protected function getAction(Request $request){
+    protected function getAction(Request $request) {
         return explode('@', $request->route()[1]["uses"], 2)[1];
     }
 
@@ -94,7 +94,7 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @return array
      */
-    protected function getArgs(Request $request){
+    protected function getArgs(Request $request) {
         return $request->route()[2];
     }
 }

app/Listeners/ExampleListener.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Listeners;
 
 use App\Events\ExampleEvent;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class ExampleListener
 {

app/User.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
-
 use Illuminate\Support\Facades\Hash;
 
 class User extends Model implements AuthenticatableContract, AuthorizableContract{

Spacing +2 added lines, -2 removed lines

@@ -40,11 +40,11 @@
      * @return int|boolean
      * @see    https://github.com/lucadegasperi/oauth2-server-laravel/blob/master/docs/authorization-server/password.md
      */
-    public function verify($email, $password){
+    public function verify($email, $password) {
 
         $user = User::where('email', $email)->first();
 
-        if($user && Hash::check($password, $user->password)){
+        if ($user && Hash::check($password, $user->password)) {
             return $user->id;
         }
 

app/Comment.php

Indentation +5 added lines, -5 removed lines

@@ -9,22 +9,22 @@
      *
      * @var array
      */
-	protected $fillable = ['id', 'post_id', 'user_id', 'content'];
+    protected $fillable = ['id', 'post_id', 'user_id', 'content'];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-	protected $hidden   = ['created_at', 'updated_at'];
+    protected $hidden   = ['created_at', 'updated_at'];
 
     /**
      * Define an inverse one-to-many relationship with App\Post.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-	public function post(){
-		return $this->belongsTo('App\Post');
-	}
+    public function post(){
+        return $this->belongsTo('App\Post');
+    }
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Comment extends Model{
+class Comment extends Model {
 
     /**
      * The attributes that are mass assignable.
@@ -16,14 +16,14 @@ 
      *
      * @var array
      */
-	protected $hidden   = ['created_at', 'updated_at'];
+	protected $hidden = ['created_at', 'updated_at'];
 
     /**
      * Define an inverse one-to-many relationship with App\Post.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-	public function post(){
+	public function post() {
 		return $this->belongsTo('App\Post');
 	}
 

app/Exceptions/Handler.php

Spacing +3 added lines, -3 removed lines

@@ -48,15 +48,15 @@
      */
     public function render($request, Exception $e)
     {
-        if(env('APP_DEBUG')){
+        if (env('APP_DEBUG')) {
             return parent::render($request, $e);
         }
 
-        if($e instanceof NotFoundHttpException){
+        if ($e instanceof NotFoundHttpException) {
             return response()->json(['message' => 'Bad Request', 'code' => 400], 400);
         }
 
-        if($e instanceof MethodNotAllowedHttpException){
+        if ($e instanceof MethodNotAllowedHttpException) {
             return response()->json(['message' => 'Not Found', 'code' => 404], 404);
         }
 

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
-
 use Illuminate\Support\Facades\Hash;
 
 class User extends Model implements AuthenticatableContract, AuthorizableContract{

app/Post.php

Indentation +5 added lines, -5 removed lines

@@ -9,22 +9,22 @@
      *
      * @var array
      */
-	protected $fillable = ['id', 'user_id', 'title', 'content'];
+    protected $fillable = ['id', 'user_id', 'title', 'content'];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-	protected $hidden   = ['created_at', 'updated_at'];
+    protected $hidden   = ['created_at', 'updated_at'];
 
     /**
      * Define a one-to-many relationship with App\Comment
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
-	public function comments(){
-		return $this->hasMany('App\Comment');
-	}
+    public function comments(){
+        return $this->hasMany('App\Comment');
+    }
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Post extends Model{
+class Post extends Model {
 
     /**
      * The attributes that are mass assignable.
@@ -16,14 +16,14 @@ 
      *
      * @var array
      */
-	protected $hidden   = ['created_at', 'updated_at'];
+	protected $hidden = ['created_at', 'updated_at'];
 
     /**
      * Define a one-to-many relationship with App\Comment
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
-	public function comments(){
+	public function comments() {
 		return $this->hasMany('App\Comment');
 	}
 

app/Providers/AuthServiceProvider.php

Spacing +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
      * @param  array  $arguments
      * @return boolean
      */
-    private function isOwner($arguments = []){
+    private function isOwner($arguments = []) {
 
         foreach ($arguments as $resource => $actions) {
             foreach ($actions as $action) {
@@ -67,9 +67,9 @@ 
                 //     }
                 // });
 
-                Gate::define($this->ability($action, $resource), function ($user, $arg) {
+                Gate::define($this->ability($action, $resource), function($user, $arg) {
                    
-                    if(is_null($arg))  { return false; }
+                    if (is_null($arg)) { return false; }
 
                     return $arg->user_id === $user->id || $user->is_admin;
                 });            
@@ -83,11 +83,11 @@ 
      * @param  array  $arguments
      * @return boolean
      */
-    private function isAdmin($arguments){
+    private function isAdmin($arguments) {
 
         foreach ($arguments as $resource => $actions) {
             foreach ($actions as $action) {
-                Gate::define($this->ability($action, $resource), function ($user) {
+                Gate::define($this->ability($action, $resource), function($user) {
                     return $user->is_admin;
                 });
             }
@@ -101,7 +101,7 @@ 
      * @param  string  $resource
      * @return string
      */
-    private function ability($action, $resource){
+    private function ability($action, $resource) {
         return "{$action}-{$resource}";
     }
     

app/Http/Middleware/Authorize.php

Spacing +2 added lines, -2 removed lines

@@ -11,11 +11,11 @@
      * @param  \Closure  $next
      * @return mixed
      */
-    public function handle($request, Closure $next, $controller){
+    public function handle($request, Closure $next, $controller) {
 
         $controller = new $controller();
 
-        if(!$controller->isAuthorized($request)){
+        if (!$controller->isAuthorized($request)) {
             return $controller->error("You aren't allowed to perform the requested action", 403);
         }
 

app/Http/Controllers/CommentController.php

Indentation +11 added lines, -11 removed lines

@@ -4,20 +4,20 @@
 
 class CommentController extends Controller{
 
-	public function index(){
+    public function index(){
 		
-		$comments = Comment::all();
-		return $this->success($comments, 200);
-	}
+        $comments = Comment::all();
+        return $this->success($comments, 200);
+    }
 
-	public function show($id){
+    public function show($id){
 
-		$comment = Comment::find($id);
+        $comment = Comment::find($id);
 
-		if(!$comment){
-			return $this->error("The comment with {$id} doesn't exist", 404);
-		}
+        if(!$comment){
+            return $this->error("The comment with {$id} doesn't exist", 404);
+        }
 
-		return $this->success($comment, 200);
-	}
+        return $this->success($comment, 200);
+    }
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -2,19 +2,19 @@
 
 use App\Comment;
 
-class CommentController extends Controller{
+class CommentController extends Controller {
 
-	public function index(){
+	public function index() {
 		
 		$comments = Comment::all();
 		return $this->success($comments, 200);
 	}
 
-	public function show($id){
+	public function show($id) {
 
 		$comment = Comment::find($id);
 
-		if(!$comment){
+		if (!$comment) {
 			return $this->error("The comment with {$id} doesn't exist", 404);
 		}