SherifElfadaly / Laravel-Api-Skeleton

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

Indentation +291 added lines, -291 removed lines

@@ -7,298 +7,298 @@
 
 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;
-
-    public function __construct()
-    {
-        $this->config              = \CoreConfig::getConfig();
-        $this->model               = property_exists($this, 'model') ? $this->model : false;
-        $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->middleware(function ($request, $next) {
+	/**
+	 * The config implementation.
+	 *
+	 * @var array
+	 */
+	protected $config;
+
+	/**
+	 * The relations implementation.
+	 *
+	 * @var array
+	 */
+	protected $relations;
+
+	/**
+	 * The repo implementation.
+	 *
+	 * @var object
+	 */
+	protected $repo;
+
+	public function __construct()
+	{
+		$this->config              = \CoreConfig::getConfig();
+		$this->model               = property_exists($this, 'model') ? $this->model : false;
+		$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->middleware(function ($request, $next) {
             
-            $this->repo = call_user_func_array("\Core::{$this->model}", []);
-            return $next($request);
-        });
-
-        $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 \Response::json($this->repo->all($this->relations, $sortBy, $desc), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->find($id, $this->relations), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->first($request->all(), $this->relations), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->paginate($perPage, $this->relations, $sortBy, $desc), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
-    }
-
-    /**
-     * 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->repo = call_user_func_array("\Core::{$this->model}", []);
+			return $next($request);
+		});
+
+		$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 \Response::json($this->repo->all($this->relations, $sortBy, $desc), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->find($id, $this->relations), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->first($request->all(), $this->relations), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->paginate($perPage, $this->relations, $sortBy, $desc), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->save($request->all()), 200);
-    }
-
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id)
-    {
-        return \Response::json($this->repo->delete($id), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->deleted($request->all(), $perPage, $sortBy, $desc), 200);
-    }
-
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return \Response::json($this->repo->restore($id), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->save($request->all()), 200);
+	}
+
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id)
+	{
+		return \Response::json($this->repo->delete($id), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->deleted($request->all(), $perPage, $sortBy, $desc), 200);
+	}
+
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return \Response::json($this->repo->restore($id), 200);
+	}
+
+	/**
+	 * 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->model))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->model.'-'.$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->model, 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->model))) {
+			} elseif (! $isPasswordClient && $user->tokenCan($this->model.'-'.$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->model, 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 +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
         $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
         $route                     = explode('@', \Route::currentRouteAction())[1];
 
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             
             $this->repo = call_user_func_array("\Core::{$this->model}", []);
             return $next($request);
@@ -212,7 +212,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;
@@ -223,7 +223,7 @@ 
             }
 
             if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) {
+            } elseif ( ! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) {
             } else {
                 \ErrorHandler::noPermissions();
             }
@@ -294,7 +294,7 @@ 
 
         if ($timezone && $timezone !== $user->timezone) {
             $user->timezone = $timezone;
-            $update       = true;
+            $update = true;
         }
 
         if ($update) {

src/Modules/Core/Resources/Lang/ar/errors.php

Indentation +23 added lines, -23 removed lines

@@ -2,28 +2,28 @@
 
 return [
     
-    /**
-     * List of error messages used in core module.
-     */
-    'unAuthorized'            => 'من فضلك قم بتسجيل الدخول',
-    'invalidRefreshToken'     => 'رمز التحديث غير صالح',
-    'noPermissions'           => 'لا توجد صلاحية',
-    'loginFailed'             => 'خطأ في البريد لاكتروني او كلمة المرور',
-    'noSocialEmail'           => 'لا يمكن الحصول علي تابريد الاكتروني',
-    'userAlreadyRegistered'   => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر',
-    'connectionError'         => 'خطأ في الاتصال',
-    'redisNotRunning'         => 'سيرفير الاشعارات لايعمل',
-    'dbQueryError'            => 'خطا في البيانات',
-    'cannotCreateSetting'     => 'لا يمكن اضافة اعدادات',
-    'cannotUpdateSettingKey'  => 'لا يمكن تعديل اعدادات',
-    'userIsBlocked'           => 'لقد تم حظرك',
-    'invalidResetToken'       => 'رمز تعديل كلمة المرور خطا',
-    'invalidResetPassword'    => 'خطا في نعديل كلمة المرور',
-    'invalidOldPassword'      => 'كلمة السر القديمه خطا',
-    'invalidConfirmationCode' => 'لينك التاكيد غير صالح اة مستخدم من قبل',
-    'notFound'                => 'ال :replace المطلوب غير موجود',
-    'generalError'            => 'حدث خطا ما',
-    'emailNotConfirmed'       => 'بريدك الاكتروني غير مفعل',
-    'emailAlreadyConfirmed'   => 'البريد الاكتروني مفع بالقعل'
+	/**
+	 * List of error messages used in core module.
+	 */
+	'unAuthorized'            => 'من فضلك قم بتسجيل الدخول',
+	'invalidRefreshToken'     => 'رمز التحديث غير صالح',
+	'noPermissions'           => 'لا توجد صلاحية',
+	'loginFailed'             => 'خطأ في البريد لاكتروني او كلمة المرور',
+	'noSocialEmail'           => 'لا يمكن الحصول علي تابريد الاكتروني',
+	'userAlreadyRegistered'   => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر',
+	'connectionError'         => 'خطأ في الاتصال',
+	'redisNotRunning'         => 'سيرفير الاشعارات لايعمل',
+	'dbQueryError'            => 'خطا في البيانات',
+	'cannotCreateSetting'     => 'لا يمكن اضافة اعدادات',
+	'cannotUpdateSettingKey'  => 'لا يمكن تعديل اعدادات',
+	'userIsBlocked'           => 'لقد تم حظرك',
+	'invalidResetToken'       => 'رمز تعديل كلمة المرور خطا',
+	'invalidResetPassword'    => 'خطا في نعديل كلمة المرور',
+	'invalidOldPassword'      => 'كلمة السر القديمه خطا',
+	'invalidConfirmationCode' => 'لينك التاكيد غير صالح اة مستخدم من قبل',
+	'notFound'                => 'ال :replace المطلوب غير موجود',
+	'generalError'            => 'حدث خطا ما',
+	'emailNotConfirmed'       => 'بريدك الاكتروني غير مفعل',
+	'emailAlreadyConfirmed'   => 'البريد الاكتروني مفع بالقعل'
 
 ];

src/Modules/Core/Resources/Lang/en/errors.php

Indentation +23 added lines, -23 removed lines

@@ -2,28 +2,28 @@
 
 return [
     
-    /**
-     * List of error messages used in core module.
-     */
-    'unAuthorized'            => 'Please login before any action',
-    'invalidRefreshToken'     => 'Invalid refresh token',
-    'noPermissions'           => 'No permissions',
-    'loginFailed'             => 'Wrong mail or password',
-    'noSocialEmail'           => 'Couldn\'t retrieve email',
-    'userAlreadyRegistered'   => 'User already registered. Please login using email and password',
-    'connectionError'         => 'Connection error',
-    'redisNotRunning'         => 'Your redis notification server is\'t running',
-    'dbQueryError'            => 'Please check the given inputes',
-    'cannotCreateSetting'     => 'Can\'t create setting',
-    'cannotUpdateSettingKey'  => 'Can\'t update setting key',
-    'userIsBlocked'           => 'You have been blocked',
-    'invalidResetToken'       => 'Reset password token is invalid',
-    'invalidResetPassword'    => 'Reset password is invalid',
-    'invalidOldPassword'      => 'Old password is invalid',
-    'invalidConfirmationCode' => 'Confirmation link expired or already used',
-    'notFound'                => 'The requested :replace not found',
-    'generalError'            => 'Something went wrong',
-    'emailNotConfirmed'       => 'Your email isn\'t confirmed',
-    'emailAlreadyConfirmed'   => 'Your email is already confirmed'
+	/**
+	 * List of error messages used in core module.
+	 */
+	'unAuthorized'            => 'Please login before any action',
+	'invalidRefreshToken'     => 'Invalid refresh token',
+	'noPermissions'           => 'No permissions',
+	'loginFailed'             => 'Wrong mail or password',
+	'noSocialEmail'           => 'Couldn\'t retrieve email',
+	'userAlreadyRegistered'   => 'User already registered. Please login using email and password',
+	'connectionError'         => 'Connection error',
+	'redisNotRunning'         => 'Your redis notification server is\'t running',
+	'dbQueryError'            => 'Please check the given inputes',
+	'cannotCreateSetting'     => 'Can\'t create setting',
+	'cannotUpdateSettingKey'  => 'Can\'t update setting key',
+	'userIsBlocked'           => 'You have been blocked',
+	'invalidResetToken'       => 'Reset password token is invalid',
+	'invalidResetPassword'    => 'Reset password is invalid',
+	'invalidOldPassword'      => 'Old password is invalid',
+	'invalidConfirmationCode' => 'Confirmation link expired or already used',
+	'notFound'                => 'The requested :replace not found',
+	'generalError'            => 'Something went wrong',
+	'emailNotConfirmed'       => 'Your email isn\'t confirmed',
+	'emailAlreadyConfirmed'   => 'Your email is already confirmed'
 
 ];

src/Modules/Core/Facades/CoreConfig.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class CoreConfig extends Facade
 {
-    protected static function getFacadeAccessor()
-    {
-        return 'CoreConfig';
-    }
+	protected static function getFacadeAccessor()
+	{
+		return 'CoreConfig';
+	}
 }

src/Modules/Core/Facades/Media.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class Media extends Facade
 {
-    protected static function getFacadeAccessor()
-    {
-        return 'Media';
-    }
+	protected static function getFacadeAccessor()
+	{
+		return 'Media';
+	}
 }

src/Modules/Core/Facades/Core.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class Core extends Facade
 {
-    protected static function getFacadeAccessor()
-    {
-        return 'Core';
-    }
+	protected static function getFacadeAccessor()
+	{
+		return 'Core';
+	}
 }

src/Modules/Core/Facades/ErrorHandler.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class ErrorHandler extends Facade
 {
-    protected static function getFacadeAccessor()
-    {
-        return 'ErrorHandler';
-    }
+	protected static function getFacadeAccessor()
+	{
+		return 'ErrorHandler';
+	}
 }

src/Modules/Core/Facades/ApiConsumer.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class ApiConsumer extends Facade
 {
-    protected static function getFacadeAccessor()
-    {
-        return 'ApiConsumer';
-    }
+	protected static function getFacadeAccessor()
+	{
+		return 'ApiConsumer';
+	}
 }

src/Modules/Core/Providers/ModuleServiceProvider.php

Indentation +47 added lines, -47 removed lines

@@ -6,52 +6,52 @@
 
 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 () {
-            return new \App\Modules\Core\Utl\ApiConsumer;
-        });
+	/**
+	 * 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 () {
+			return new \App\Modules\Core\Utl\ApiConsumer;
+		});
         
-        $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() {
             return new \App\Modules\Core\Utl\ApiConsumer;
         });