SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/AbstractRepositories/AbstractRepositoryContainer.php

Indentation +30 added lines, -30 removed lines

@@ -5,37 +5,37 @@
 
 abstract class AbstractRepositoryContainer implements RepositoryContainerInterface
 {
-    /**
-     * Construct the repository class name based on
-     * the method name called, search in the
-     * given namespaces for the class and
-     * return an instance.
-     *
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        foreach ($this->getRepoNameSpace() as $repoNameSpace) {
-            $class = rtrim($repoNameSpace, '\\').'\\'.ucfirst(Str::singular($name)).'Repository';
-            if (class_exists($class)) {
-                \App::singleton($class, function ($app) use ($class) {
+	/**
+	 * Construct the repository class name based on
+	 * the method name called, search in the
+	 * given namespaces for the class and
+	 * return an instance.
+	 *
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		foreach ($this->getRepoNameSpace() as $repoNameSpace) {
+			$class = rtrim($repoNameSpace, '\\').'\\'.ucfirst(Str::singular($name)).'Repository';
+			if (class_exists($class)) {
+				\App::singleton($class, function ($app) use ($class) {
 
-                    return new \App\Modules\Core\Decorators\CachingDecorator(new $class, $app['cache.store']);
-                });
+					return new \App\Modules\Core\Decorators\CachingDecorator(new $class, $app['cache.store']);
+				});
 
-                return \App::make($class);
-            }
-        }
-    }
+				return \App::make($class);
+			}
+		}
+	}
 
-     /**
-      * Abstract methods that return the necessary
-      * information (repositories namespaces)
-      * needed to preform the previous actions.
-      *
-      * @return array
-      */
-    abstract protected function getRepoNameSpace();
+	 /**
+	  * Abstract methods that return the necessary
+	  * information (repositories namespaces)
+	  * needed to preform the previous actions.
+	  *
+	  * @return array
+	  */
+	abstract protected function getRepoNameSpace();
 }

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         foreach ($this->getRepoNameSpace() as $repoNameSpace) {
             $class = rtrim($repoNameSpace, '\\').'\\'.ucfirst(Str::singular($name)).'Repository';
             if (class_exists($class)) {
-                \App::singleton($class, function ($app) use ($class) {
+                \App::singleton($class, function($app) use ($class) {
 
                     return new \App\Modules\Core\Decorators\CachingDecorator(new $class, $app['cache.store']);
                 });

src/Modules/Core/Traits/Translatable.php

Indentation +36 added lines, -36 removed lines

@@ -2,46 +2,46 @@
 
 trait Translatable
 {
-    /**
-     * Create a new model instance that is existing.
-     *
-     * @param  array  $attributes
-     * @param  string|null  $connection
-     * @return static
-     */
-    public function newFromBuilder($attributes = [], $connection = null)
-    {
-        $model = parent::newFromBuilder($attributes, $connection);
+	/**
+	 * Create a new model instance that is existing.
+	 *
+	 * @param  array  $attributes
+	 * @param  string|null  $connection
+	 * @return static
+	 */
+	public function newFromBuilder($attributes = [], $connection = null)
+	{
+		$model = parent::newFromBuilder($attributes, $connection);
 
-        foreach ($model->attributes as $key => $value) {
-            if (isset($this->translatable) && in_array($key, $this->translatable)) {
-                $model->$key = $this->getTranslatedAttribute($value);
-            }
-        }
+		foreach ($model->attributes as $key => $value) {
+			if (isset($this->translatable) && in_array($key, $this->translatable)) {
+				$model->$key = $this->getTranslatedAttribute($value);
+			}
+		}
 
-        return $model;
-    }
+		return $model;
+	}
 
-    /**
-     * Returns a translatable model attribute based on the application's locale settings.
-     *
-     * @param $values
-     * @return string
-     */
-    protected function getTranslatedAttribute($values)
-    {
-        $values         = json_decode($values);
-        $primaryLocale  = \Session::get('locale');
-        $fallbackLocale = 'en';
+	/**
+	 * Returns a translatable model attribute based on the application's locale settings.
+	 *
+	 * @param $values
+	 * @return string
+	 */
+	protected function getTranslatedAttribute($values)
+	{
+		$values         = json_decode($values);
+		$primaryLocale  = \Session::get('locale');
+		$fallbackLocale = 'en';
 
-        if ($primaryLocale == 'all') {
-            return $values;
-        }
+		if ($primaryLocale == 'all') {
+			return $values;
+		}
 
-        if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
-            return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
-        }
+		if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
+			return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
+		}
 
-        return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
-    }
+		return $primaryLocale == 'all' ? $values : $values->$primaryLocale;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             return $values;
         }
 
-        if (! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
+        if ( ! $primaryLocale || ! is_object($values) || ! property_exists($values, $primaryLocale)) {
             return $values ? isset($values->$fallbackLocale) ? $values->$fallbackLocale : $values : '';
         }
 

src/Modules/Core/Repositories/SettingRepository.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function saveMany(array $data)
     {
-        \DB::transaction(function () use ($data) {
+        \DB::transaction(function() use ($data) {
             foreach ($data as $value) {
                 $this->save($value);
             }

Indentation +23 added lines, -23 removed lines

@@ -4,28 +4,28 @@
 
 class SettingRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     *
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\Core\Setting';
-    }
+	/**
+	 * Return the model full namespace.
+	 *
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\Core\Setting';
+	}
 
-    /**
-     * Save list of settings.
-     *
-     * @param  array   $data
-     * @return void
-     */
-    public function saveMany(array $data)
-    {
-        \DB::transaction(function () use ($data) {
-            foreach ($data as $value) {
-                $this->save($value);
-            }
-        });
-    }
+	/**
+	 * Save list of settings.
+	 *
+	 * @param  array   $data
+	 * @return void
+	 */
+	public function saveMany(array $data)
+	{
+		\DB::transaction(function () use ($data) {
+			foreach ($data as $value) {
+				$this->save($value);
+			}
+		});
+	}
 }

src/Modules/Notifications/Resources/Lang/en/notifications.php

Indentation +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@
 
 return [
     
-    /**
-     * Here goes your notification messages.
-     */
+	/**
+	 * Here goes your notification messages.
+	 */
 
 ];

src/Modules/Core/Providers/ModuleServiceProvider.php

Indentation +48 added lines, -48 removed lines

@@ -6,53 +6,53 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
-
-        $factory = app('Illuminate\Database\Eloquent\Factory');
-        $factory->load(__DIR__.'/../Database/Factories');
-    }
-
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //Bind Core Facade to the IoC Container
-        \App::bind('Core', function () {
-            return new \App\Modules\Core\Core;
-        });
-
-        //Bind ErrorHandler Facade to the IoC Container
-        \App::bind('ErrorHandler', function () {
-            return new \App\Modules\Core\Utl\ErrorHandler;
-        });
-
-        //Bind CoreConfig Facade to the IoC Container
-        \App::bind('CoreConfig', function () {
-            return new \App\Modules\Core\Utl\CoreConfig;
-        });
-
-        //Bind Mpgs Facade to the IoC Container
-        \App::bind('Media', function () {
-            return new \App\Modules\Core\Utl\Media;
-        });
-
-        //Bind Mpgs Facade to the IoC Container
-        \App::bind('ApiConsumer', function () {
-            $app = app();
-            return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
-        });
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
+
+		$factory = app('Illuminate\Database\Eloquent\Factory');
+		$factory->load(__DIR__.'/../Database/Factories');
+	}
+
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//Bind Core Facade to the IoC Container
+		\App::bind('Core', function () {
+			return new \App\Modules\Core\Core;
+		});
+
+		//Bind ErrorHandler Facade to the IoC Container
+		\App::bind('ErrorHandler', function () {
+			return new \App\Modules\Core\Utl\ErrorHandler;
+		});
+
+		//Bind CoreConfig Facade to the IoC Container
+		\App::bind('CoreConfig', function () {
+			return new \App\Modules\Core\Utl\CoreConfig;
+		});
+
+		//Bind Mpgs Facade to the IoC Container
+		\App::bind('Media', function () {
+			return new \App\Modules\Core\Utl\Media;
+		});
+
+		//Bind Mpgs Facade to the IoC Container
+		\App::bind('ApiConsumer', function () {
+			$app = app();
+			return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
+		});
         
-        $this->app->register(RouteServiceProvider::class);
-    }
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -28,27 +28,27 @@
     public function register()
     {
         //Bind Core Facade to the IoC Container
-        \App::bind('Core', function () {
+        \App::bind('Core', function() {
             return new \App\Modules\Core\Core;
         });
 
         //Bind ErrorHandler Facade to the IoC Container
-        \App::bind('ErrorHandler', function () {
+        \App::bind('ErrorHandler', function() {
             return new \App\Modules\Core\Utl\ErrorHandler;
         });
 
         //Bind CoreConfig Facade to the IoC Container
-        \App::bind('CoreConfig', function () {
+        \App::bind('CoreConfig', function() {
             return new \App\Modules\Core\Utl\CoreConfig;
         });
 
         //Bind Mpgs Facade to the IoC Container
-        \App::bind('Media', function () {
+        \App::bind('Media', function() {
             return new \App\Modules\Core\Utl\Media;
         });
 
         //Bind Mpgs Facade to the IoC Container
-        \App::bind('ApiConsumer', function () {
+        \App::bind('ApiConsumer', function() {
             $app = app();
             return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
         });

src/ApiSkeletonServiceProvider.php

Indentation +35 added lines, -35 removed lines

@@ -6,41 +6,41 @@
 
 class ApiSkeletonServiceProvider extends ServiceProvider
 {
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->publishes([
-            __DIR__.'/Modules'                               => app_path('Modules'),
-            __DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),
-            __DIR__.'/../lang'                               => base_path('resources/lang'),
-            __DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),
-            __DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),
-            __DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),
-            __DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),
-            __DIR__.'/../files/channels.php'                 => app_path('routes/channels.php'),
-            __DIR__.'/../phpcs.xml'                          => base_path('/phpcs.xml'),
-        ]);
+	/**
+	 * Perform post-registration booting of services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->publishes([
+			__DIR__.'/Modules'                               => app_path('Modules'),
+			__DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),
+			__DIR__.'/../lang'                               => base_path('resources/lang'),
+			__DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),
+			__DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),
+			__DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),
+			__DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),
+			__DIR__.'/../files/channels.php'                 => app_path('routes/channels.php'),
+			__DIR__.'/../phpcs.xml'                          => base_path('/phpcs.xml'),
+		]);
 
-        $this->publishes([
-            __DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),
-            __DIR__.'/../files/auth.php'      => config_path('auth.php'),
-        ], 'config');
-    }
+		$this->publishes([
+			__DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),
+			__DIR__.'/../files/auth.php'      => config_path('auth.php'),
+		], 'config');
+	}
 
-    /**
-     * Register any package services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->mergeConfigFrom(
-            __DIR__.'/../config/skeleton.php',
-            'skeleton'
-        );
-    }
+	/**
+	 * Register any package services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->mergeConfigFrom(
+			__DIR__.'/../config/skeleton.php',
+			'skeleton'
+		);
+	}
 }

src/Modules/Acl/Http/Controllers/UsersController.php

Doc Comments +1 added lines, -1 removed lines

@@ -268,7 +268,7 @@
      * @param  string $groupName The name of the requested group.
      * @param  integer $perPage  Number of rows per page default 15.
      * @param  string  $sortBy   The name of the column to sort by.
-     * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc     Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)

Indentation +280 added lines, -280 removed lines

@@ -11,285 +11,285 @@
 
 class UsersController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile', 'account'];
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
-
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules = [
-        'name'     => 'nullable|string',
-        'email'    => 'required|email|unique:users,email,{id}',
-        'password' => 'nullable|min:6'
-    ];
-
-    /**
-     * The loginProxy implementation.
-     *
-     * @var \App\Modules\Acl\Proxy\LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * Init new object.
-     *
-     * @param   LoginProxy     $loginProxy
-     * @param   UserRepository $repo
-     * @param   CoreConfig     $config
-     * @return  void
-     */
-    public function __construct(LoginProxy $loginProxy, UserRepository $repo, CoreConfig $config)
-    {
-        $this->loginProxy = $loginProxy;
-        parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclUser');
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function account()
-    {
-        return new $this->modelResource($this->repo->account($this->relations));
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return new $this->modelResource($this->repo->block($id));
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return new $this->modelResource($this->repo->unblock($id));
-    }
-
-    /**
-     * Logout the user.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return new GeneralResource($this->loginProxy->logout());
-    }
-
-    /**
-     * Handle a registration request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Request $request)
-    {
-        $this->validate($request, [
-            'name'     => 'nullable|string',
-            'email'    => 'required|email|unique:users,email,{id}',
-            'password' => 'required|min:6'
-            ]);
-
-        return new $this->modelResource($this->repo->register($request->only('name', 'email', 'password')));
-    }
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function login(Request $request)
-    {
-        $this->validate($request, [
-            'email'    => 'required|email',
-            'password' => 'required|min:6',
-            'admin'    => 'nullable|boolean'
-            ]);
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile', 'account'];
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
+
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules = [
+		'name'     => 'nullable|string',
+		'email'    => 'required|email|unique:users,email,{id}',
+		'password' => 'nullable|min:6'
+	];
+
+	/**
+	 * The loginProxy implementation.
+	 *
+	 * @var \App\Modules\Acl\Proxy\LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   LoginProxy     $loginProxy
+	 * @param   UserRepository $repo
+	 * @param   CoreConfig     $config
+	 * @return  void
+	 */
+	public function __construct(LoginProxy $loginProxy, UserRepository $repo, CoreConfig $config)
+	{
+		$this->loginProxy = $loginProxy;
+		parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclUser');
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account()
+	{
+		return new $this->modelResource($this->repo->account($this->relations));
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return new $this->modelResource($this->repo->block($id));
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return new $this->modelResource($this->repo->unblock($id));
+	}
+
+	/**
+	 * Logout the user.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return new GeneralResource($this->loginProxy->logout());
+	}
+
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Request $request)
+	{
+		$this->validate($request, [
+			'name'     => 'nullable|string',
+			'email'    => 'required|email|unique:users,email,{id}',
+			'password' => 'required|min:6'
+			]);
+
+		return new $this->modelResource($this->repo->register($request->only('name', 'email', 'password')));
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function login(Request $request)
+	{
+		$this->validate($request, [
+			'email'    => 'required|email',
+			'password' => 'required|min:6',
+			'admin'    => 'nullable|boolean'
+			]);
         
-        $result = $this->loginProxy->login($request->only('email', 'password'), $request->get('admin'));
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function loginSocial(Request $request)
-    {
-        $this->validate($request, [
-            'auth_code'    => 'required_without:access_token',
-            'access_token' => 'required_without:auth_code',
-            'type'         => 'required|in:facebook,google'
-            ]);
-
-        $result = $this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Assign the given groups to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assigngroups(Request $request)
-    {
-        $this->validate($request, [
-            'group_ids' => 'required|exists:groups,id',
-            'user_id'   => 'required|exists:users,id'
-            ]);
-
-        return new $this->modelResource($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')));
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function sendreset(Request $request)
-    {
-        $this->validate($request, ['email' => 'required|email']);
-
-        return new GeneralResource($this->repo->sendReset($request->get('email')));
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resetpassword(Request $request)
-    {
-        $this->validate($request, [
-            'token'                 => 'required',
-            'email'                 => 'required|email',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
-
-        return new GeneralResource($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')));
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(Request $request)
-    {
-        $this->validate($request, [
-            'old_password'          => 'required',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
-
-        return new GeneralResource($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')));
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function confirmEmail(Request $request)
-    {
-        $this->validate($request, [
-            'confirmation_code' => 'required|string'
-        ]);
-
-        return new GeneralResource($this->repo->confirmEmail($request->only('confirmation_code')));
-    }
-
-    /**
-     * Resend the email confirmation mail.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resendEmailConfirmation(Request $request)
-    {
-        $this->validate($request, [
-            'email' => 'required|exists:users,email'
-        ]);
-
-        return new GeneralResource($this->repo->sendConfirmationEmail($request->get('email')));
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshtoken(Request $request)
-    {
-        $this->validate($request, [
-            'refreshtoken' => 'required',
-        ]);
-
-        return new GeneralResource($this->loginProxy->refreshtoken($request->get('refreshtoken')));
-    }
-
-    /**
-     * Paginate all users with in the given group.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string $groupName The name of the requested group.
-     * @param  integer $perPage  Number of rows per page default 15.
-     * @param  string  $sortBy   The name of the column to sort by.
-     * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc));
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(Request $request)
-    {
-        $this->validate($request, [
-            'profile_picture' => 'nullable|string',
-            'name'            => 'nullable|string',
-            'email'           => 'required|email|unique:users,email,'.\Auth::id()
-        ]);
-
-        return new $this->modelResource($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')));
-    }
+		$result = $this->loginProxy->login($request->only('email', 'password'), $request->get('admin'));
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function loginSocial(Request $request)
+	{
+		$this->validate($request, [
+			'auth_code'    => 'required_without:access_token',
+			'access_token' => 'required_without:auth_code',
+			'type'         => 'required|in:facebook,google'
+			]);
+
+		$result = $this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Assign the given groups to the given user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assigngroups(Request $request)
+	{
+		$this->validate($request, [
+			'group_ids' => 'required|exists:groups,id',
+			'user_id'   => 'required|exists:users,id'
+			]);
+
+		return new $this->modelResource($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')));
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function sendreset(Request $request)
+	{
+		$this->validate($request, ['email' => 'required|email']);
+
+		return new GeneralResource($this->repo->sendReset($request->get('email')));
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetpassword(Request $request)
+	{
+		$this->validate($request, [
+			'token'                 => 'required',
+			'email'                 => 'required|email',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
+
+		return new GeneralResource($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')));
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(Request $request)
+	{
+		$this->validate($request, [
+			'old_password'          => 'required',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
+
+		return new GeneralResource($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')));
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function confirmEmail(Request $request)
+	{
+		$this->validate($request, [
+			'confirmation_code' => 'required|string'
+		]);
+
+		return new GeneralResource($this->repo->confirmEmail($request->only('confirmation_code')));
+	}
+
+	/**
+	 * Resend the email confirmation mail.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resendEmailConfirmation(Request $request)
+	{
+		$this->validate($request, [
+			'email' => 'required|exists:users,email'
+		]);
+
+		return new GeneralResource($this->repo->sendConfirmationEmail($request->get('email')));
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshtoken(Request $request)
+	{
+		$this->validate($request, [
+			'refreshtoken' => 'required',
+		]);
+
+		return new GeneralResource($this->loginProxy->refreshtoken($request->get('refreshtoken')));
+	}
+
+	/**
+	 * Paginate all users with in the given group.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string $groupName The name of the requested group.
+	 * @param  integer $perPage  Number of rows per page default 15.
+	 * @param  string  $sortBy   The name of the column to sort by.
+	 * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc));
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(Request $request)
+	{
+		$this->validate($request, [
+			'profile_picture' => 'nullable|string',
+			'name'            => 'nullable|string',
+			'email'           => 'required|email|unique:users,email,'.\Auth::id()
+		]);
+
+		return new $this->modelResource($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')));
+	}
 }

src/Modules/Core/Http/Controllers/BaseApiController.php

Doc Comments +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
      * Init new object.
      *
      * @param   mixed      $repo
-     * @param   CoreConfig $config
+     * @param   \App\Modules\Core\Utl\CoreConfig $config
      * @param   string     $modelResource
      * @return  void
      */
@@ -59,7 +59,7 @@ 
      * Fetch all records with relations from storage.
      *
      * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc   Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function index($sortBy = 'created_at', $desc = 1)
@@ -85,7 +85,7 @@ 
      * @param  string  $query   The search text.
      * @param  integer $perPage Number of rows per page default 15.
      * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc    Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1)
@@ -99,7 +99,7 @@ 
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc   Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function findby(Request $request, $sortBy = 'created_at', $desc = 1)
@@ -124,7 +124,7 @@ 
      *
      * @param  integer $perPage Number of rows per page default 15.
      * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc    Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1)
@@ -139,7 +139,7 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @param  integer $perPage Number of rows per page default 15.
      * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc    Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
@@ -189,7 +189,7 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @param  integer $perPage Number of rows per page default 15.
      * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+     * @param  integer $desc    Sort ascending or descinding (1: desc, 0: asc).
      * @return \Illuminate\Http\Response
      */
     public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)

Indentation +297 added lines, -297 removed lines

@@ -9,303 +9,303 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The config implementation.
-     *
-     * @var array
-     */
-    protected $config;
-
-    /**
-     * The relations implementation.
-     *
-     * @var array
-     */
-    protected $relations;
-
-    /**
-     * The repo implementation.
-     *
-     * @var object
-     */
-    protected $repo;
-
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $repo
-     * @param   CoreConfig $config
-     * @param   string     $modelResource
-     * @return  void
-     */
-    public function __construct($repo, $config, $modelResource)
-    {
-        $this->repo = $repo;
-        $this->modelResource = $modelResource;
-        $this->config = $config->getConfig();
-        $this->modelName = explode('\\', get_called_class());
-        $this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
-        $this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
-        $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
-        $this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
-        $route = explode('@', \Route::currentRouteAction())[1];
-
-        $this->setSessions();
-        $this->checkPermission($route);
-        $this->setRelations($route);
-    }
-
-    /**
-     * Fetch all records with relations from storage.
-     *
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function index($sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->all($this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function find($id)
-    {
-        return new $this->modelResource($this->repo->find($id, $this->relations));
-    }
-
-    /**
-     * Paginate all records with relations from storage
-     * that matche the given query.
-     *
-     * @param  string  $query   The search text.
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function findby(Request $request, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function first(Request $request)
-    {
-        return new $this->modelResource($this->repo->first($request->all(), $this->relations));
-    }
-
-    /**
-     * Paginate all records with relations from storage.
-     *
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->paginate($perPage, $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc));
-    }
-
-    /**
-     * Save the given model to storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function save(Request $request)
-    {
-        foreach ($this->validationRules as &$rule) {
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) {
-                $rule .= ',deleted_at,NULL';
-            }
-
-            if ($request->has('id')) {
-                $rule = str_replace('{id}', $request->get('id'), $rule);
-            } else {
-                $rule = str_replace(',{id}', '', $rule);
-            }
-        }
+	/**
+	 * The config implementation.
+	 *
+	 * @var array
+	 */
+	protected $config;
+
+	/**
+	 * The relations implementation.
+	 *
+	 * @var array
+	 */
+	protected $relations;
+
+	/**
+	 * The repo implementation.
+	 *
+	 * @var object
+	 */
+	protected $repo;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $repo
+	 * @param   CoreConfig $config
+	 * @param   string     $modelResource
+	 * @return  void
+	 */
+	public function __construct($repo, $config, $modelResource)
+	{
+		$this->repo = $repo;
+		$this->modelResource = $modelResource;
+		$this->config = $config->getConfig();
+		$this->modelName = explode('\\', get_called_class());
+		$this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
+		$this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
+		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
+		$this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
+		$route = explode('@', \Route::currentRouteAction())[1];
+
+		$this->setSessions();
+		$this->checkPermission($route);
+		$this->setRelations($route);
+	}
+
+	/**
+	 * Fetch all records with relations from storage.
+	 *
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index($sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->all($this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function find($id)
+	{
+		return new $this->modelResource($this->repo->find($id, $this->relations));
+	}
+
+	/**
+	 * Paginate all records with relations from storage
+	 * that matche the given query.
+	 *
+	 * @param  string  $query   The search text.
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function findby(Request $request, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function first(Request $request)
+	{
+		return new $this->modelResource($this->repo->first($request->all(), $this->relations));
+	}
+
+	/**
+	 * Paginate all records with relations from storage.
+	 *
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->paginate($perPage, $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc));
+	}
+
+	/**
+	 * Save the given model to storage.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function save(Request $request)
+	{
+		foreach ($this->validationRules as &$rule) {
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) {
+				$rule .= ',deleted_at,NULL';
+			}
+
+			if ($request->has('id')) {
+				$rule = str_replace('{id}', $request->get('id'), $rule);
+			} else {
+				$rule = str_replace(',{id}', '', $rule);
+			}
+		}
         
-        $this->validate($request, $this->validationRules);
-
-        return $this->modelResource::collection($this->repo->save($request->all()));
-    }
-
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id)
-    {
-        return new GeneralResource($this->repo->delete($id));
-    }
-
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->deleted($request->all(), $perPage, $sortBy, $desc));
-    }
-
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return new GeneralResource($this->repo->restore($id));
-    }
-
-    /**
-     * Check if the logged in user can do the given permission.
-     *
-     * @param  string $permission
-     * @return void
-     */
-    private function checkPermission($permission)
-    {
-        \Auth::shouldUse('api');
-        $this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
+		$this->validate($request, $this->validationRules);
+
+		return $this->modelResource::collection($this->repo->save($request->all()));
+	}
+
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id)
+	{
+		return new GeneralResource($this->repo->delete($id));
+	}
+
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->deleted($request->all(), $perPage, $sortBy, $desc));
+	}
+
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return new GeneralResource($this->repo->restore($id));
+	}
+
+	/**
+	 * Check if the logged in user can do the given permission.
+	 *
+	 * @param  string $permission
+	 * @return void
+	 */
+	private function checkPermission($permission)
+	{
+		\Auth::shouldUse('api');
+		$this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
         
-        if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
-            $user             = \Auth::user();
-            $permission       = $permission !== 'index' ? $permission : 'list';
-            $isPasswordClient = $user->token()->client->password_client;
-            $this->updateLocaleAndTimezone($user);
-
-            if ($user->blocked) {
-                \ErrorHandler::userIsBlocked();
-            }
-
-            if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
-            } else {
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
-
-    /**
-     * Set sessions based on the given headers in the request.
-     *
-     * @return void
-     */
-    private function setSessions()
-    {
-        \Session::put('time-zone', \Request::header('time-zone') ?: 0);
-
-        $locale = \Request::header('locale');
-        switch ($locale) {
-            case 'en':
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-
-            case 'ar':
-                \App::setLocale('ar');
-                \Session::put('locale', 'ar');
-                break;
-
-            case 'all':
-                \App::setLocale('en');
-                \Session::put('locale', 'all');
-                break;
-
-            default:
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-        }
-    }
-
-    /**
-     * Set relation based on the called api.
-     *
-     * @param  string $route
-     * @return void
-     */
-    private function setRelations($route)
-    {
-        $route           = $route !== 'index' ? $route : 'list';
-        $relations       = Arr::get($this->config['relations'], $this->modelName, false);
-        $this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
-    }
-
-    /**
-     * Update the logged in user locale and time zone.
-     *
-     * @param  object $user
-     * @return void
-     */
-    private function updateLocaleAndTimezone($user)
-    {
-        $update   = false;
-        $locale   = \Session::get('locale');
-        $timezone = \Session::get('time-zone');
-        if ($locale && $locale !== 'all' && $locale !== $user->locale) {
-            $user->locale = $locale;
-            $update       = true;
-        }
-
-        if ($timezone && $timezone !== $user->timezone) {
-            $user->timezone = $timezone;
-            $update       = true;
-        }
-
-        if ($update) {
-            $user->save();
-        }
-    }
+		if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
+			$user             = \Auth::user();
+			$permission       = $permission !== 'index' ? $permission : 'list';
+			$isPasswordClient = $user->token()->client->password_client;
+			$this->updateLocaleAndTimezone($user);
+
+			if ($user->blocked) {
+				\ErrorHandler::userIsBlocked();
+			}
+
+			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
+			} elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
+			} else {
+				\ErrorHandler::noPermissions();
+			}
+		}
+	}
+
+	/**
+	 * Set sessions based on the given headers in the request.
+	 *
+	 * @return void
+	 */
+	private function setSessions()
+	{
+		\Session::put('time-zone', \Request::header('time-zone') ?: 0);
+
+		$locale = \Request::header('locale');
+		switch ($locale) {
+			case 'en':
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+
+			case 'ar':
+				\App::setLocale('ar');
+				\Session::put('locale', 'ar');
+				break;
+
+			case 'all':
+				\App::setLocale('en');
+				\Session::put('locale', 'all');
+				break;
+
+			default:
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+		}
+	}
+
+	/**
+	 * Set relation based on the called api.
+	 *
+	 * @param  string $route
+	 * @return void
+	 */
+	private function setRelations($route)
+	{
+		$route           = $route !== 'index' ? $route : 'list';
+		$relations       = Arr::get($this->config['relations'], $this->modelName, false);
+		$this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	}
+
+	/**
+	 * Update the logged in user locale and time zone.
+	 *
+	 * @param  object $user
+	 * @return void
+	 */
+	private function updateLocaleAndTimezone($user)
+	{
+		$update   = false;
+		$locale   = \Session::get('locale');
+		$timezone = \Session::get('time-zone');
+		if ($locale && $locale !== 'all' && $locale !== $user->locale) {
+			$user->locale = $locale;
+			$update       = true;
+		}
+
+		if ($timezone && $timezone !== $user->timezone) {
+			$user->timezone = $timezone;
+			$update       = true;
+		}
+
+		if ($update) {
+			$user->save();
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -219,7 +219,7 @@ 
         \Auth::shouldUse('api');
         $this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
         
-        if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
+        if ( ! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
             $user             = \Auth::user();
             $permission       = $permission !== 'index' ? $permission : 'list';
             $isPasswordClient = $user->token()->client->password_client;
@@ -230,7 +230,7 @@ 
             }
 
             if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
+            } elseif ( ! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
             } else {
                 \ErrorHandler::noPermissions();
             }
@@ -301,7 +301,7 @@ 
 
         if ($timezone && $timezone !== $user->timezone) {
             $user->timezone = $timezone;
-            $update       = true;
+            $update = true;
         }
 
         if ($update) {

src/Modules/Reporting/Http/Controllers/ReportsController.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $reportName Name of the requested report
      * @param  integer $perPage    Number of rows per page default all data.
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function getReport(Request $request, $reportName, $perPage = 0)
     {

Indentation +29 added lines, -29 removed lines

@@ -9,35 +9,35 @@
 
 class ReportsController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['getReport'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['getReport'];
 
-    /**
-     * Init new object.
-     *
-     * @param   ReportRepository $repo
-     * @param   CoreConfig       $config
-     * @return  void
-     */
-    public function __construct(ReportRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Reporting\Http\Resources\Report');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   ReportRepository $repo
+	 * @param   CoreConfig       $config
+	 * @return  void
+	 */
+	public function __construct(ReportRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Reporting\Http\Resources\Report');
+	}
 
-    /**
-     * Render the given report name with the given conditions.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $reportName Name of the requested report
-     * @param  integer $perPage    Number of rows per page default all data.
-     * @return \Illuminate\Http\Response
-     */
-    public function getReport(Request $request, $reportName, $perPage = 0)
-    {
-        return \Response::json($this->repo->getReport($reportName, $request->all(), $perPage), 200);
-    }
+	/**
+	 * Render the given report name with the given conditions.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $reportName Name of the requested report
+	 * @param  integer $perPage    Number of rows per page default all data.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getReport(Request $request, $reportName, $perPage = 0)
+	{
+		return \Response::json($this->repo->getReport($reportName, $request->all(), $perPage), 200);
+	}
 }