SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Users/Providers/RouteServiceProvider.php

Indentation +62 added lines, -62 removed lines

@@ -7,73 +7,73 @@
 
 class RouteServiceProvider extends ServiceProvider
 {
-    /**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Modules\Users\Http\Controllers';
+	/**
+	 * This namespace is applied to your controller routes.
+	 *
+	 * In addition, it is set as the URL generator's root namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'App\Modules\Users\Http\Controllers';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
+	/**
+	 * Define your route model bindings, pattern filters, etc.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//
 
-        parent::boot();
-    }
+		parent::boot();
+	}
 
-    /**
-     * Define the routes for the module.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapWebRoutes();
+	/**
+	 * Define the routes for the module.
+	 *
+	 * @return void
+	 */
+	public function map()
+	{
+		$this->mapWebRoutes();
 
-        $this->mapApiRoutes();
+		$this->mapApiRoutes();
 
-        //
-    }
+		//
+	}
 
-    /**
-     * Define the "web" routes for the module.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::role([
-            'middleware' => 'web',
-            'namespace'  => $this->namespace,
-        ], function ($router) {
-            require module_path('users', 'Routes/web.php', 'app');
-        });
-    }
+	/**
+	 * Define the "web" routes for the module.
+	 *
+	 * These routes all receive session state, CSRF protection, etc.
+	 *
+	 * @return void
+	 */
+	protected function mapWebRoutes()
+	{
+		Route::role([
+			'middleware' => 'web',
+			'namespace'  => $this->namespace,
+		], function ($router) {
+			require module_path('users', 'Routes/web.php', 'app');
+		});
+	}
 
-    /**
-     * Define the "api" routes for the module.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::role([
-            'middleware' => 'api',
-            'namespace'  => $this->namespace,
-            'prefix'     => 'api',
-        ], function ($router) {
-            require module_path('users', 'Routes/api.php', 'app');
-        });
-    }
+	/**
+	 * Define the "api" routes for the module.
+	 *
+	 * These routes are typically stateless.
+	 *
+	 * @return void
+	 */
+	protected function mapApiRoutes()
+	{
+		Route::role([
+			'middleware' => 'api',
+			'namespace'  => $this->namespace,
+			'prefix'     => 'api',
+		], function ($router) {
+			require module_path('users', 'Routes/api.php', 'app');
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         Route::role([
             'middleware' => 'web',
             'namespace'  => $this->namespace,
-        ], function ($router) {
+        ], function($router) {
             require module_path('users', 'Routes/web.php', 'app');
         });
     }
@@ -72,7 +72,7 @@ 
             'middleware' => 'api',
             'namespace'  => $this->namespace,
             'prefix'     => 'api',
-        ], function ($router) {
+        ], function($router) {
             require module_path('users', 'Routes/api.php', 'app');
         });
     }

src/Modules/Users/Http/Requests/AssignGroups.php

Indentation +21 added lines, -21 removed lines

@@ -6,26 +6,26 @@
 
 class AssignRoles extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize()
+	{
+		return true;
+	}
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'role_ids' => 'required|exists:roles,id',
-            'user_id'   => 'required|exists:users,id'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'role_ids' => 'required|exists:roles,id',
+			'user_id'   => 'required|exists:users,id'
+		];
+	}
 }

src/Modules/Users/Http/Resources/AclUser.php

Indentation +27 added lines, -27 removed lines

@@ -9,32 +9,32 @@
 
 class AclUser extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        if (! $this->resource) {
-            return [];
-        }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param Request $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		if (! $this->resource) {
+			return [];
+		}
 
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'email' => $this->email,
-            'profilePicture' => $this->profile_picture,
-            'notifications' => NotificationResource::collection($this->whenLoaded('notifications')),
-            'readNotifications' => NotificationResource::collection($this->whenLoaded('readNotifications')),
-            'unreadNotifications' => NotificationResource::collection($this->whenLoaded('unreadNotifications')),
-            'roles' => RoleResource::collection($this->whenLoaded('roles')),
-            'oauthClients' => OauthClientResource::collection($this->whenLoaded('oauthClients')),
-            'locale' => $this->locale,
-            'timezone' => $this->timezone,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ];
-    }
+		return [
+			'id' => $this->id,
+			'name' => $this->name,
+			'email' => $this->email,
+			'profilePicture' => $this->profile_picture,
+			'notifications' => NotificationResource::collection($this->whenLoaded('notifications')),
+			'readNotifications' => NotificationResource::collection($this->whenLoaded('readNotifications')),
+			'unreadNotifications' => NotificationResource::collection($this->whenLoaded('unreadNotifications')),
+			'roles' => RoleResource::collection($this->whenLoaded('roles')),
+			'oauthClients' => OauthClientResource::collection($this->whenLoaded('oauthClients')),
+			'locale' => $this->locale,
+			'timezone' => $this->timezone,
+			'created_at' => $this->created_at,
+			'updated_at' => $this->updated_at,
+		];
+	}
 }

src/Modules/Users/Http/Controllers/UserController.php

Indentation +212 added lines, -212 removed lines

@@ -24,239 +24,239 @@
 
 class UserController 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'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile'];
 
-    /**
-     * 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'];
+	/**
+	 * 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 loginProxy implementation.
-     *
-     * @var App\Modules\Users\Proxy\LoginProxy
-     */
-    protected $loginProxy;
+	/**
+	 * The loginProxy implementation.
+	 *
+	 * @var App\Modules\Users\Proxy\LoginProxy
+	 */
+	protected $loginProxy;
 
-    /**
-     * Init new object.
-     *
-     * @param   LoginProxy     $loginProxy
-     * @param   UserRepository $repo
-     * @return  void
-     */
-    public function __construct(LoginProxy $loginProxy, UserRepository $repo)
-    {
-        $this->loginProxy = $loginProxy;
-        parent::__construct($repo, 'App\Modules\Users\Http\Resources\AclUser');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   LoginProxy     $loginProxy
+	 * @param   UserRepository $repo
+	 * @return  void
+	 */
+	public function __construct(LoginProxy $loginProxy, UserRepository $repo)
+	{
+		$this->loginProxy = $loginProxy;
+		parent::__construct($repo, 'App\Modules\Users\Http\Resources\AclUser');
+	}
 
-    /**
-     * Insert the given model to storage.
-     *
-     * @param InsertUser $request
-     * @return \Illuminate\Http\Response
-     */
-    public function insert(InsertUser $request)
-    {
-        return new $this->modelResource($this->repo->save($request->all()));
-    }
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @param InsertUser $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function insert(InsertUser $request)
+	{
+		return new $this->modelResource($this->repo->save($request->all()));
+	}
 
-    /**
-     * Update the given model to storage.
-     *
-     * @param UpdateUser $request
-     * @return \Illuminate\Http\Response
-     */
-    public function update(UpdateUser $request)
-    {
-        return new $this->modelResource($this->repo->save($request->all()));
-    }
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param UpdateUser $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update(UpdateUser $request)
+	{
+		return new $this->modelResource($this->repo->save($request->all()));
+	}
 
-    /**
-     * Return the logged in user account.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function account(Request $request)
-    {
-        return new $this->modelResource($this->repo->account($request->relations));
-    }
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account(Request $request)
+	{
+		return new $this->modelResource($this->repo->account($request->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));
-    }
+	/**
+	 * 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));
-    }
+	/**
+	 * 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());
-    }
+	/**
+	 * Logout the user.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return new GeneralResource($this->loginProxy->logout());
+	}
 
-    /**
-     * Handle a registration request.
-     *
-     * @param Register $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Register $request)
-    {
-        return new $this->modelResource($this->repo->register($request->only('name', 'email', 'password')));
-    }
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param Register $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Register $request)
+	{
+		return new $this->modelResource($this->repo->register($request->only('name', 'email', 'password')));
+	}
 
-    /**
-     * Handle a login request to the application.
-     *
-     * @param Login $request
-     * @return \Illuminate\Http\Response
-     */
-    public function login(Login $request)
-    {
-        $result = $this->loginProxy->login($request->only('email', 'password'), $request->get('admin'));
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param Login $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function login(Login $request)
+	{
+		$result = $this->loginProxy->login($request->only('email', 'password'), $request->get('admin'));
 
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
 
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param LoginSocial $request
-     * @return \Illuminate\Http\Response
-     */
-    public function loginSocial(LoginSocial $request)
-    {
-        $result = $this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param LoginSocial $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function loginSocial(LoginSocial $request)
+	{
+		$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']]);
-    }
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
 
-    /**
-     * Assign the given roles to the given user.
-     *
-     * @param AssignRoles $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assignRoles(AssignRoles $request)
-    {
-        return new $this->modelResource($this->repo->assignRoles($request->get('user_id'), $request->get('role_ids')));
-    }
+	/**
+	 * Assign the given roles to the given user.
+	 *
+	 * @param AssignRoles $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assignRoles(AssignRoles $request)
+	{
+		return new $this->modelResource($this->repo->assignRoles($request->get('user_id'), $request->get('role_ids')));
+	}
 
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param SendReset $request
-     * @return \Illuminate\Http\Response
-     */
-    public function sendReset(SendReset $request)
-    {
-        return new GeneralResource($this->repo->sendReset($request->get('email')));
-    }
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param SendReset $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function sendReset(SendReset $request)
+	{
+		return new GeneralResource($this->repo->sendReset($request->get('email')));
+	}
 
-    /**
-     * Reset the given user's password.
-     *
-     * @param ResetPassword $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resetPassword(ResetPassword $request)
-    {
-        return new GeneralResource($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')));
-    }
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param ResetPassword $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetPassword(ResetPassword $request)
+	{
+		return new GeneralResource($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')));
+	}
 
-    /**
-     * Change the logged in user password.
-     *
-     * @param ChangePassword $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(ChangePassword $request)
-    {
-        return new GeneralResource($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')));
-    }
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param ChangePassword $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(ChangePassword $request)
+	{
+		return new GeneralResource($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')));
+	}
 
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param ConfirmEmail $request
-     * @return \Illuminate\Http\Response
-     */
-    public function confirmEmail(ConfirmEmail $request)
-    {
-        return new GeneralResource($this->repo->confirmEmail($request->only('confirmation_code')));
-    }
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param ConfirmEmail $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function confirmEmail(ConfirmEmail $request)
+	{
+		return new GeneralResource($this->repo->confirmEmail($request->only('confirmation_code')));
+	}
 
-    /**
-     * Resend the email confirmation mail.
-     *
-     * @param ResendEmailConfirmation $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resendEmailConfirmation(ResendEmailConfirmation $request)
-    {
-        return new GeneralResource($this->repo->sendConfirmationEmail($request->get('email')));
-    }
+	/**
+	 * Resend the email confirmation mail.
+	 *
+	 * @param ResendEmailConfirmation $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resendEmailConfirmation(ResendEmailConfirmation $request)
+	{
+		return new GeneralResource($this->repo->sendConfirmationEmail($request->get('email')));
+	}
 
-    /**
-     * Refresh the expired login token.
-     *
-     * @param RefreshToken $request
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshToken(RefreshToken $request)
-    {
-        return new GeneralResource($this->loginProxy->refreshToken($request->get('refresh_token')));
-    }
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @param RefreshToken $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshToken(RefreshToken $request)
+	{
+		return new GeneralResource($this->loginProxy->refreshToken($request->get('refresh_token')));
+	}
 
-    /**
-     * Paginate all users with in the given role.
-     *
-     * @param Request $request
-     * @param  string $roleName The name of the requested role.
-     * @return \Illuminate\Http\Response
-     */
-    public function role(Request $request, $roleName)
-    {
-        return $this->modelResource::collection($this->repo->role($request->all(), $roleName, $request->relations, $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
-    }
+	/**
+	 * Paginate all users with in the given role.
+	 *
+	 * @param Request $request
+	 * @param  string $roleName The name of the requested role.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function role(Request $request, $roleName)
+	{
+		return $this->modelResource::collection($this->repo->role($request->all(), $roleName, $request->relations, $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
+	}
 
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param SaveProfile $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(SaveProfile $request)
-    {
-        return new $this->modelResource($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')));
-    }
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param SaveProfile $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(SaveProfile $request)
+	{
+		return new $this->modelResource($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')));
+	}
 }

src/Modules/Users/Routes/api.php

Indentation +25 added lines, -25 removed lines

@@ -15,31 +15,31 @@
 
 Route::role(['prefix' => 'users'], function () {
 
-    Route::get('/', 'UserController@index');
-    Route::get('/{id}', 'UserController@find');
-    Route::post('/', 'UserController@insert');
-    Route::put('/', 'UserController@update');
-    Route::delete('/{id}', 'UserController@delete');
-    Route::get('list/deleted', 'UserController@deleted');
-    Route::patch('restore/{id}', 'UserController@restore');
-    Route::get('block/{id}', 'UserController@block');
-    Route::get('unblock/{id}', 'UserController@unblock');
-    Route::post('assign/roles', 'UserController@assignRoles');
-    Route::post('role/{roleName}', 'UserController@role');
+	Route::get('/', 'UserController@index');
+	Route::get('/{id}', 'UserController@find');
+	Route::post('/', 'UserController@insert');
+	Route::put('/', 'UserController@update');
+	Route::delete('/{id}', 'UserController@delete');
+	Route::get('list/deleted', 'UserController@deleted');
+	Route::patch('restore/{id}', 'UserController@restore');
+	Route::get('block/{id}', 'UserController@block');
+	Route::get('unblock/{id}', 'UserController@unblock');
+	Route::post('assign/roles', 'UserController@assignRoles');
+	Route::post('role/{roleName}', 'UserController@role');
 
-    Route::role(['prefix' => 'account'], function () {
+	Route::role(['prefix' => 'account'], function () {
 
-        Route::get('my', 'UserController@account');
-        Route::get('logout', 'UserController@logout');
-        Route::post('refresh/token', 'UserController@refreshToken');
-        Route::post('save', 'UserController@saveProfile');
-        Route::post('register', 'UserController@register');
-        Route::post('login', 'UserController@login');
-        Route::post('login/social', 'UserController@loginSocial');
-        Route::post('send/reset', 'UserController@sendReset');
-        Route::post('reset/password', 'UserController@resetPassword');
-        Route::post('change/password', 'UserController@changePassword');
-        Route::post('confirm/email', 'UserController@confirmEmail');
-        Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation');
-    });
+		Route::get('my', 'UserController@account');
+		Route::get('logout', 'UserController@logout');
+		Route::post('refresh/token', 'UserController@refreshToken');
+		Route::post('save', 'UserController@saveProfile');
+		Route::post('register', 'UserController@register');
+		Route::post('login', 'UserController@login');
+		Route::post('login/social', 'UserController@loginSocial');
+		Route::post('send/reset', 'UserController@sendReset');
+		Route::post('reset/password', 'UserController@resetPassword');
+		Route::post('change/password', 'UserController@changePassword');
+		Route::post('confirm/email', 'UserController@confirmEmail');
+		Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation');
+	});
 });

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 |
 */
 
-Route::role(['prefix' => 'users'], function () {
+Route::role(['prefix' => 'users'], function() {
 
     Route::get('/', 'UserController@index');
     Route::get('/{id}', 'UserController@find');
@@ -27,7 +27,7 @@ 
     Route::post('assign/roles', 'UserController@assignRoles');
     Route::post('role/{roleName}', 'UserController@role');
 
-    Route::role(['prefix' => 'account'], function () {
+    Route::role(['prefix' => 'account'], function() {
 
         Route::get('my', 'UserController@account');
         Route::get('logout', 'UserController@logout');

src/Modules/Users/AclUser.php

Indentation +127 added lines, -127 removed lines

@@ -7,133 +7,133 @@
 class AclUser extends User
 {
 
-    use SoftDeletes, HasApiTokens;
-    protected $table    = 'users';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token', 'deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
-    public $searchable  = ['name', 'email'];
+	use SoftDeletes, HasApiTokens;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token', 'deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
+	public $searchable  = ['name', 'email'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    /**
-     * Get the profile picture url.
-     * @return string
-     */
-    public function getProfilePictureAttribute($value)
-    {
-        return url(\Storage::url($value));
-    }
-
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     *
-     * @param string $value
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = bcrypt($value);
-    }
-
-    /**
-     * Get the entity's notifications.
-     */
-    public function notifications()
-    {
-        return $this->morphMany('App\Modules\Notifications\Notification', 'notifiable')->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get the entity's read notifications.
-     */
-    public function readNotifications()
-    {
-        return $this->notifications()->whereNotNull('read_at');
-    }
-
-    /**
-     * Get the entity's unread notifications.
-     */
-    public function unreadNotifications()
-    {
-        return $this->notifications()->whereNull('read_at');
-    }
-
-    public function roles()
-    {
-        return $this->belongsToMany('App\Modules\Roles\Role', 'users_roles', 'user_id', 'role_id')->whereNull('users_roles.deleted_at')->withTimestamps();
-    }
-
-    public function oauthClients()
-    {
-        return $this->hasMany('App\Modules\OauthClients\OauthClient', 'user_id');
-    }
-
-    /**
-     * Return fcm device tokens that will be used in sending fcm notifications.
-     *
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) {
-            if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) {
-                $device->forceDelete();
-                continue;
-            }
-
-            $tokens[] = $device->device_token;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.'.$this->id;
-    }
-
-    /**
-     * Custom password validation.
-     *
-     * @param  string $password
-     * @return boolean
-     */
-    public function validateForPassportPasswordGrant($password)
-    {
-        if ($password == config('skeleton.social_pass')) {
-            return true;
-        }
-
-        return \Hash::check($password, $this->password);
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	/**
+	 * Get the profile picture url.
+	 * @return string
+	 */
+	public function getProfilePictureAttribute($value)
+	{
+		return url(\Storage::url($value));
+	}
+
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 *
+	 * @param string $value
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = bcrypt($value);
+	}
+
+	/**
+	 * Get the entity's notifications.
+	 */
+	public function notifications()
+	{
+		return $this->morphMany('App\Modules\Notifications\Notification', 'notifiable')->orderBy('created_at', 'desc');
+	}
+
+	/**
+	 * Get the entity's read notifications.
+	 */
+	public function readNotifications()
+	{
+		return $this->notifications()->whereNotNull('read_at');
+	}
+
+	/**
+	 * Get the entity's unread notifications.
+	 */
+	public function unreadNotifications()
+	{
+		return $this->notifications()->whereNull('read_at');
+	}
+
+	public function roles()
+	{
+		return $this->belongsToMany('App\Modules\Roles\Role', 'users_roles', 'user_id', 'role_id')->whereNull('users_roles.deleted_at')->withTimestamps();
+	}
+
+	public function oauthClients()
+	{
+		return $this->hasMany('App\Modules\OauthClients\OauthClient', 'user_id');
+	}
+
+	/**
+	 * Return fcm device tokens that will be used in sending fcm notifications.
+	 *
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) {
+			if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) {
+				$device->forceDelete();
+				continue;
+			}
+
+			$tokens[] = $device->device_token;
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.'.$this->id;
+	}
+
+	/**
+	 * Custom password validation.
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function validateForPassportPasswordGrant($password)
+	{
+		if ($password == config('skeleton.social_pass')) {
+			return true;
+		}
+
+		return \Hash::check($password, $this->password);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        AclUser::observe(\App::make('App\Modules\Users\ModelObservers\AclUserObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		AclUser::observe(\App::make('App\Modules\Users\ModelObservers\AclUserObserver'));
+	}
 }

src/Modules/Users/Reppsitories/UserRepository.php

Indentation +380 added lines, -380 removed lines

@@ -6,391 +6,391 @@
 
 class UserRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   AclUser $model
-     * @return  void
-     */
-    public function __construct(AclUser $model)
-    {
-        parent::__construct($model);
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = [])
-    {
-        $permissions = [];
-        $user        = $this->find(\Auth::id(), $relations);
-        foreach ($user->roles()->get() as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
-        $user->permissions = $permissions;
-
-        return $user;
-    }
-
-    /**
-     * Check if the logged in user or the given user
-     * has the given permissions on the given model.
-     *
-     * @param  string $nameOfPermission
-     * @param  string $model
-     * @param  mixed  $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false)
-    {
-        $user        = $user ?: $this->find(\Auth::id(), ['roles.permissions']);
-        $permissions = [];
-
-        $user->roles->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
-            $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
-        });
-
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given role.
-     *
-     * @param  string[] $roles
-     * @param  mixed $user
-     * @return boolean
-     */
-    public function hasRole($roles, $user = false)
-    {
-        $user = $user ?: $this->find(\Auth::id());
-        return $user->roles->whereIn('name', $roles)->count() ? true : false;
-    }
-
-    /**
-     * Assign the given role ids to the given user.
-     *
-     * @param  integer $userId
-     * @param  array   $roleIds
-     * @return object
-     */
-    public function assignRoles($userId, $roleIds)
-    {
-        \DB::transaction(function () use ($userId, $roleIds) {
-            $user = $this->find($userId);
-            $user->roles()->detach();
-            $user->roles()->attach($roleIds);
-        });
-
-        return $this->find($userId);
-    }
-
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  array   $credentials
-     * @param  boolean $adminLogin
-     * @return object
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        if (! $user = $this->first(['email' => $credentials['email']])) {
-            \ErrorHandler::loginFailed();
-        } elseif ($adminLogin && ! $user->roles->whereIn('name', ['Admin'])->count()) {
-            \ErrorHandler::loginFailed();
-        } elseif (! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
-            \ErrorHandler::loginFailed();
-        } elseif ($user->blocked) {
-            \ErrorHandler::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
-            \ErrorHandler::emailNotConfirmed();
-        }
-
-        return $user;
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param  string $authCode
-     * @param  string $accessToken
-     * @param  string $type
-     * @return array
-     */
-    public function loginSocial($authCode, $accessToken, $type)
-    {
-        $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
-        $user         = \Socialite::driver($type)->userFromToken($access_token);
-
-        if (! $user->email) {
-            \ErrorHandler::noSocialEmail();
-        }
-
-        if (! $this->model->where('email', $user->email)->first()) {
-            $this->register(['email' => $user->email, 'password' => ''], true);
-        }
-
-        $loginProxy = \App::make('App\Modules\Users\Proxy\LoginProxy');
-        return $loginProxy->login(['email' => $user->email, 'password' => config('skeleton.social_pass')], 0);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   AclUser $model
+	 * @return  void
+	 */
+	public function __construct(AclUser $model)
+	{
+		parent::__construct($model);
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = [])
+	{
+		$permissions = [];
+		$user        = $this->find(\Auth::id(), $relations);
+		foreach ($user->roles()->get() as $role) {
+			$role->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
+		$user->permissions = $permissions;
+
+		return $user;
+	}
+
+	/**
+	 * Check if the logged in user or the given user
+	 * has the given permissions on the given model.
+	 *
+	 * @param  string $nameOfPermission
+	 * @param  string $model
+	 * @param  mixed  $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false)
+	{
+		$user        = $user ?: $this->find(\Auth::id(), ['roles.permissions']);
+		$permissions = [];
+
+		$user->roles->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
+			$permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
+		});
+
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given role.
+	 *
+	 * @param  string[] $roles
+	 * @param  mixed $user
+	 * @return boolean
+	 */
+	public function hasRole($roles, $user = false)
+	{
+		$user = $user ?: $this->find(\Auth::id());
+		return $user->roles->whereIn('name', $roles)->count() ? true : false;
+	}
+
+	/**
+	 * Assign the given role ids to the given user.
+	 *
+	 * @param  integer $userId
+	 * @param  array   $roleIds
+	 * @return object
+	 */
+	public function assignRoles($userId, $roleIds)
+	{
+		\DB::transaction(function () use ($userId, $roleIds) {
+			$user = $this->find($userId);
+			$user->roles()->detach();
+			$user->roles()->attach($roleIds);
+		});
+
+		return $this->find($userId);
+	}
+
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return object
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		if (! $user = $this->first(['email' => $credentials['email']])) {
+			\ErrorHandler::loginFailed();
+		} elseif ($adminLogin && ! $user->roles->whereIn('name', ['Admin'])->count()) {
+			\ErrorHandler::loginFailed();
+		} elseif (! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
+			\ErrorHandler::loginFailed();
+		} elseif ($user->blocked) {
+			\ErrorHandler::userIsBlocked();
+		} elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+			\ErrorHandler::emailNotConfirmed();
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param  string $authCode
+	 * @param  string $accessToken
+	 * @param  string $type
+	 * @return array
+	 */
+	public function loginSocial($authCode, $accessToken, $type)
+	{
+		$access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
+		$user         = \Socialite::driver($type)->userFromToken($access_token);
+
+		if (! $user->email) {
+			\ErrorHandler::noSocialEmail();
+		}
+
+		if (! $this->model->where('email', $user->email)->first()) {
+			$this->register(['email' => $user->email, 'password' => ''], true);
+		}
+
+		$loginProxy = \App::make('App\Modules\Users\Proxy\LoginProxy');
+		return $loginProxy->login(['email' => $user->email, 'password' => config('skeleton.social_pass')], 0);
+	}
     
-    /**
-     * Handle a registration request.
-     *
-     * @param  array   $credentials
-     * @param  boolean $skipConfirmEmail
-     * @return array
-     */
-    public function register($credentials, $skipConfirmEmail = false)
-    {
-        $user = $this->save($credentials);
-
-        if ($skipConfirmEmail) {
-            $user->confirmed = 1;
-            $user->save();
-        } elseif (! config('skeleton.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $skipConfirmEmail
+	 * @return array
+	 */
+	public function register($credentials, $skipConfirmEmail = false)
+	{
+		$user = $this->save($credentials);
+
+		if ($skipConfirmEmail) {
+			$user->confirmed = 1;
+			$user->save();
+		} elseif (! config('skeleton.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
     
-    /**
-     * Block the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function block($userId)
-    {
-        if (! $user = $this->find($userId)) {
-            \ErrorHandler::notFound('user');
-        }
-        if (! $this->hasRole(['Admin'])) {
-            \ErrorHandler::noPermissions();
-        } elseif (\Auth::id() == $userId) {
-            \ErrorHandler::noPermissions();
-        } elseif ($user->roles->pluck('name')->search('Admin', true) !== false) {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (! $user = $this->find($userId)) {
+			\ErrorHandler::notFound('user');
+		}
+		if (! $this->hasRole(['Admin'])) {
+			\ErrorHandler::noPermissions();
+		} elseif (\Auth::id() == $userId) {
+			\ErrorHandler::noPermissions();
+		} elseif ($user->roles->pluck('name')->search('Admin', true) !== false) {
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function unblock($userId)
-    {
-        if (! $this->hasRole(['Admin'])) {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = $this->find($userId);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if (! $user = $this->model->where('email', $email)->first()) {
-            \ErrorHandler::notFound('email');
-        }
-
-        $token = \Password::getRepository()->create($user);
-        \Core::notifications()->notify($user, 'ResetPassword', $token);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return string|null
-     */
-    public function resetPassword($credentials)
-    {
-        $response = \Password::reset($credentials, function ($user, $password) {
-            $user->password = $password;
-            $user->save();
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
-
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
-                //no break
-
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
-                //no break
-
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
-                //no break
-
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  array  $credentials
-     * @return void
-     */
-    public function changePassword($credentials)
-    {
-        $user = \Auth::user();
-        if (! \Hash::check($credentials['old_password'], $user->password)) {
-            \ErrorHandler::invalidOldPassword();
-        }
-
-        $user->password = $credentials['password'];
-        $user->save();
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return void
-     */
-    public function confirmEmail($confirmationCode)
-    {
-        if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
-            \ErrorHandler::invalidConfirmationCode();
-        }
-
-        $user->confirmed         = 1;
-        $user->confirmation_code = null;
-        $user->save();
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return void
-     */
-    public function sendConfirmationEmail($email)
-    {
-        $user = $this->first(['email' => $email]);
-        if ($user->confirmed) {
-            \ErrorHandler::emailAlreadyConfirmed();
-        }
-
-        $user->confirmed         = 0;
-        $user->confirmation_code = sha1(microtime());
-        $user->save();
-        \Core::notifications()->notify($user, 'ConfirmEmail');
-    }
-
-    /**
-     * Paginate all users in the given role based on the given conditions.
-     *
-     * @param  string  $roleName
-     * @param  array   $relations
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function role($conditions, $roleName, $relations, $perPage, $sortBy, $desc)
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = $this->model->with($relations);
-
-        $model->whereHas('roles', function ($q) use ($roleName) {
-            $q->where('name', $roleName);
-        });
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function unblock($userId)
+	{
+		if (! $this->hasRole(['Admin'])) {
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = $this->find($userId);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if (! $user = $this->model->where('email', $email)->first()) {
+			\ErrorHandler::notFound('email');
+		}
+
+		$token = \Password::getRepository()->create($user);
+		\Core::notifications()->notify($user, 'ResetPassword', $token);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return string|null
+	 */
+	public function resetPassword($credentials)
+	{
+		$response = \Password::reset($credentials, function ($user, $password) {
+			$user->password = $password;
+			$user->save();
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
+
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
+				//no break
+
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
+				//no break
+
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
+				//no break
+
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  array  $credentials
+	 * @return void
+	 */
+	public function changePassword($credentials)
+	{
+		$user = \Auth::user();
+		if (! \Hash::check($credentials['old_password'], $user->password)) {
+			\ErrorHandler::invalidOldPassword();
+		}
+
+		$user->password = $credentials['password'];
+		$user->save();
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return void
+	 */
+	public function confirmEmail($confirmationCode)
+	{
+		if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
+			\ErrorHandler::invalidConfirmationCode();
+		}
+
+		$user->confirmed         = 1;
+		$user->confirmation_code = null;
+		$user->save();
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return void
+	 */
+	public function sendConfirmationEmail($email)
+	{
+		$user = $this->first(['email' => $email]);
+		if ($user->confirmed) {
+			\ErrorHandler::emailAlreadyConfirmed();
+		}
+
+		$user->confirmed         = 0;
+		$user->confirmation_code = sha1(microtime());
+		$user->save();
+		\Core::notifications()->notify($user, 'ConfirmEmail');
+	}
+
+	/**
+	 * Paginate all users in the given role based on the given conditions.
+	 *
+	 * @param  string  $roleName
+	 * @param  array   $relations
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function role($conditions, $roleName, $relations, $perPage, $sortBy, $desc)
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = $this->model->with($relations);
+
+		$model->whereHas('roles', function ($q) use ($roleName) {
+			$q->where('name', $roleName);
+		});
 
         
-        if (count($conditions['conditionValues'])) {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        if ($perPage) {
-            return $model->orderBy($sortBy, $sort)->paginate($perPage);
-        }
-
-        return $model->orderBy($sortBy, $sort)->get();
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function saveProfile($data)
-    {
-        if (Arr::has($data, 'profile_picture')) {
-            $data['profile_picture'] = \Media::uploadImageBas64($data['profile_picture'], 'admins/profile_pictures');
-        }
+		if (count($conditions['conditionValues'])) {
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		if ($perPage) {
+			return $model->orderBy($sortBy, $sort)->paginate($perPage);
+		}
+
+		return $model->orderBy($sortBy, $sort)->get();
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return void
+	 */
+	public function saveProfile($data)
+	{
+		if (Arr::has($data, 'profile_picture')) {
+			$data['profile_picture'] = \Media::uploadImageBas64($data['profile_picture'], 'admins/profile_pictures');
+		}
         
-        $data['id'] = \Auth::id();
-        return $this->save($data);
-    }
-
-    /**
-     * Ensure access token hasn't expired or revoked.
-     *
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        $accessTokenId = json_decode($accessToken, true)['id'];
-        $accessToken   = \DB::table('oauth_access_tokens')
-                ->where('id', $accessTokenId)
-                ->first();
+		$data['id'] = \Auth::id();
+		return $this->save($data);
+	}
+
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 *
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		$accessTokenId = json_decode($accessToken, true)['id'];
+		$accessToken   = \DB::table('oauth_access_tokens')
+				->where('id', $accessTokenId)
+				->first();
         
-        if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Revoke the given access token and all
-     * associated refresh tokens.
-     *
-     * @param  oject $accessToken
-     * @return void
-     */
-    public function revokeAccessToken($accessToken)
-    {
-        \DB::table('oauth_refresh_tokens')
-            ->where('access_token_id', $accessToken->id)
-            ->update([
-                'revoked' => true
-            ]);
-
-        $accessToken->revoke();
-    }
+		if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Revoke the given access token and all
+	 * associated refresh tokens.
+	 *
+	 * @param  oject $accessToken
+	 * @return void
+	 */
+	public function revokeAccessToken($accessToken)
+	{
+		\DB::table('oauth_refresh_tokens')
+			->where('access_token_id', $accessToken->id)
+			->update([
+				'revoked' => true
+			]);
+
+		$accessToken->revoke();
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
         $permissions = [];
         $user        = $this->find(\Auth::id(), $relations);
         foreach ($user->roles()->get() as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
+            $role->permissions->each(function($permission) use (&$permissions) {
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }
@@ -51,7 +51,7 @@ 
         $user        = $user ?: $this->find(\Auth::id(), ['roles.permissions']);
         $permissions = [];
 
-        $user->roles->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
+        $user->roles->pluck('permissions')->each(function($permission) use (&$permissions, $model) {
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
         });
 
@@ -80,7 +80,7 @@ 
      */
     public function assignRoles($userId, $roleIds)
     {
-        \DB::transaction(function () use ($userId, $roleIds) {
+        \DB::transaction(function() use ($userId, $roleIds) {
             $user = $this->find($userId);
             $user->roles()->detach();
             $user->roles()->attach($roleIds);
@@ -99,15 +99,15 @@ 
      */
     public function login($credentials, $adminLogin = false)
     {
-        if (! $user = $this->first(['email' => $credentials['email']])) {
+        if ( ! $user = $this->first(['email' => $credentials['email']])) {
             \ErrorHandler::loginFailed();
         } elseif ($adminLogin && ! $user->roles->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
-        } elseif (! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
+        } elseif ( ! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
         } elseif ($user->blocked) {
             \ErrorHandler::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
             \ErrorHandler::emailNotConfirmed();
         }
 
@@ -127,11 +127,11 @@ 
         $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
         $user         = \Socialite::driver($type)->userFromToken($access_token);
 
-        if (! $user->email) {
+        if ( ! $user->email) {
             \ErrorHandler::noSocialEmail();
         }
 
-        if (! $this->model->where('email', $user->email)->first()) {
+        if ( ! $this->model->where('email', $user->email)->first()) {
             $this->register(['email' => $user->email, 'password' => ''], true);
         }
 
@@ -153,7 +153,7 @@ 
         if ($skipConfirmEmail) {
             $user->confirmed = 1;
             $user->save();
-        } elseif (! config('skeleton.disable_confirm_email')) {
+        } elseif ( ! config('skeleton.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -168,10 +168,10 @@ 
      */
     public function block($userId)
     {
-        if (! $user = $this->find($userId)) {
+        if ( ! $user = $this->find($userId)) {
             \ErrorHandler::notFound('user');
         }
-        if (! $this->hasRole(['Admin'])) {
+        if ( ! $this->hasRole(['Admin'])) {
             \ErrorHandler::noPermissions();
         } elseif (\Auth::id() == $userId) {
             \ErrorHandler::noPermissions();
@@ -193,7 +193,7 @@ 
      */
     public function unblock($userId)
     {
-        if (! $this->hasRole(['Admin'])) {
+        if ( ! $this->hasRole(['Admin'])) {
             \ErrorHandler::noPermissions();
         }
 
@@ -212,7 +212,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->model->where('email', $email)->first()) {
+        if ( ! $user = $this->model->where('email', $email)->first()) {
             \ErrorHandler::notFound('email');
         }
 
@@ -228,7 +228,7 @@ 
      */
     public function resetPassword($credentials)
     {
-        $response = \Password::reset($credentials, function ($user, $password) {
+        $response = \Password::reset($credentials, function($user, $password) {
             $user->password = $password;
             $user->save();
         });
@@ -263,7 +263,7 @@ 
     public function changePassword($credentials)
     {
         $user = \Auth::user();
-        if (! \Hash::check($credentials['old_password'], $user->password)) {
+        if ( ! \Hash::check($credentials['old_password'], $user->password)) {
             \ErrorHandler::invalidOldPassword();
         }
 
@@ -279,7 +279,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->first(['confirmation_code' => $confirmationCode])) {
             \ErrorHandler::invalidConfirmationCode();
         }
 
@@ -324,7 +324,7 @@ 
         $sort       = $desc ? 'desc' : 'asc';
         $model      = $this->model->with($relations);
 
-        $model->whereHas('roles', function ($q) use ($roleName) {
+        $model->whereHas('roles', function($q) use ($roleName) {
             $q->where('name', $roleName);
         });
 

src/Modules/PushNotificationDevices/Database/Seeds/ClearDataSeeder.php

Indentation +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 
 class ClearDataSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $permissions = \DB::table('permissions')->whereIn('model', ['pushNotificationDevice']);
-        \DB::table('roles_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
-        $permissions->delete();
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$permissions = \DB::table('permissions')->whereIn('model', ['pushNotificationDevice']);
+		\DB::table('roles_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
+		$permissions->delete();
+	}
 }

src/Modules/PushNotificationDevices/Database/Seeds/AssignRelationsSeeder.php

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class AssignRelationsSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
 
-        /**
-         * Assign the permissions to the admin role.
-         */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['pushNotificationDevice'])->each(function ($permission) use ($adminRoleId) {
-            \DB::table('roles_permissions')->insert(
-                [
-                'permission_id' => $permission->id,
-                'role_id'      => $adminRoleId,
-                'created_at'    => \DB::raw('NOW()'),
-                'updated_at'    => \DB::raw('NOW()')
-                ]
-            );
-        });
-    }
+		/**
+		 * Assign the permissions to the admin role.
+		 */
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['pushNotificationDevice'])->each(function ($permission) use ($adminRoleId) {
+			\DB::table('roles_permissions')->insert(
+				[
+				'permission_id' => $permission->id,
+				'role_id'      => $adminRoleId,
+				'created_at'    => \DB::raw('NOW()'),
+				'updated_at'    => \DB::raw('NOW()')
+				]
+			);
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         /**
          * Assign the permissions to the admin role.
          */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['pushNotificationDevice'])->each(function ($permission) use ($adminRoleId) {
+        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['pushNotificationDevice'])->each(function($permission) use ($adminRoleId) {
             \DB::table('roles_permissions')->insert(
                 [
                 'permission_id' => $permission->id,