SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Notifications/Services/NotificationService.php

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      *
      * @param  collection $users
      * @param  string     $notification
-     * @param  Variadic   $notificationData
+     * @param  Variadic[]   $notificationData
      * @return void
      */
     public function notify($users, $notification, ...$notificationData)

Indentation +63 added lines, -63 removed lines

@@ -7,72 +7,72 @@
 
 class NotificationService extends BaseService
 {
-    /**
-     * Init new object.
-     *
-     * @param   NotificationRepository $repo
-     * @return  void
-     */
-    public function __construct(NotificationRepository $repo)
-    {
-        parent::__construct($repo);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   NotificationRepository $repo
+	 * @return  void
+	 */
+	public function __construct(NotificationRepository $repo)
+	{
+		parent::__construct($repo);
+	}
 
-    /**
-     * Retrieve all notifications of the logged in user.
-     *
-     * @param  integer $perPage
-     * @return Collection
-     */
-    public function my($perPage)
-    {
-        return $this->repo->my($perPage);
-    }
+	/**
+	 * Retrieve all notifications of the logged in user.
+	 *
+	 * @param  integer $perPage
+	 * @return Collection
+	 */
+	public function my($perPage)
+	{
+		return $this->repo->my($perPage);
+	}
 
-    /**
-     * Retrieve unread notifications of the logged in user.
-     *
-     * @param  integer $perPage
-     * @return Collection
-     */
-    public function unread($perPage)
-    {
-        return $this->repo->unread($perPage);
-    }
+	/**
+	 * Retrieve unread notifications of the logged in user.
+	 *
+	 * @param  integer $perPage
+	 * @return Collection
+	 */
+	public function unread($perPage)
+	{
+		return $this->repo->unread($perPage);
+	}
 
-    /**
-     * Mark the notification as read.
-     *
-     * @param  integer  $id
-     * @return object
-     */
-    public function markAsRead($id)
-    {
-        return $this->repo->markAsRead($id);
-    }
+	/**
+	 * Mark the notification as read.
+	 *
+	 * @param  integer  $id
+	 * @return object
+	 */
+	public function markAsRead($id)
+	{
+		return $this->repo->markAsRead($id);
+	}
 
-    /**
-     * Mark all notifications as read.
-     *
-     * @return void
-     */
-    public function markAllAsRead()
-    {
-        return $this->repo->markAllAsRead();
-    }
+	/**
+	 * Mark all notifications as read.
+	 *
+	 * @return void
+	 */
+	public function markAllAsRead()
+	{
+		return $this->repo->markAllAsRead();
+	}
 
-    /**
-     * Notify th given user with the given notification.
-     *
-     * @param  collection $users
-     * @param  string     $notification
-     * @param  Variadic   $notificationData
-     * @return void
-     */
-    public function notify($users, $notification, ...$notificationData)
-    {
-        $users = is_array($users) ? $this->userRepo->findBy(['id' => ['op' => 'in', 'val' => $users]]) : $users;
-        $notification = 'App\Modules\Notifications\Notifications\\'.$notification;
-        \Notification::send($users, new $notification(...$notificationData));
-    }
+	/**
+	 * Notify th given user with the given notification.
+	 *
+	 * @param  collection $users
+	 * @param  string     $notification
+	 * @param  Variadic   $notificationData
+	 * @return void
+	 */
+	public function notify($users, $notification, ...$notificationData)
+	{
+		$users = is_array($users) ? $this->userRepo->findBy(['id' => ['op' => 'in', 'val' => $users]]) : $users;
+		$notification = 'App\Modules\Notifications\Notifications\\'.$notification;
+		\Notification::send($users, new $notification(...$notificationData));
+	}
 }

src/Modules/PushNotificationDevices/Services/PushNotificationDeviceService.php

Unused Use Statements -3 removed lines

@@ -3,9 +3,6 @@
 namespace App\Modules\PushNotificationDevices\Services;
 
 use App\Modules\Core\BaseClasses\BaseService;
-use LaravelFCM\Message\OptionsBuilder;
-use LaravelFCM\Message\PayloadDataBuilder;
-use LaravelFCM\Message\PayloadNotificationBuilder;
 use App\Modules\PushNotificationDevices\Repositories\PushNotificationDeviceRepository;
 
 class PushNotificationDeviceService extends BaseService

Indentation +31 added lines, -31 removed lines

@@ -10,38 +10,38 @@
 
 class PushNotificationDeviceService extends BaseService
 {
-    /**
-     * Init new object.
-     *
-     * @param   PushNotificationDeviceRepository $repo
-     * @return  void
-     */
-    public function __construct(PushNotificationDeviceRepository $repo)
-    {
-        parent::__construct($repo);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   PushNotificationDeviceRepository $repo
+	 * @return  void
+	 */
+	public function __construct(PushNotificationDeviceRepository $repo)
+	{
+		parent::__construct($repo);
+	}
 
-    /**
-     * Register the given device to the logged in user.
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function registerDevice($data)
-    {
-        $data['access_token'] = \Auth::user()->token();
-        $data['user_id']      = \Auth::id();
-        $device               = $this->repo->first([
-            'and' => [
-                'device_token' => $data['device_token'],
-                'user_id' => $data['user_id']
-                ]
-            ]);
+	/**
+	 * Register the given device to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return void
+	 */
+	public function registerDevice($data)
+	{
+		$data['access_token'] = \Auth::user()->token();
+		$data['user_id']      = \Auth::id();
+		$device               = $this->repo->first([
+			'and' => [
+				'device_token' => $data['device_token'],
+				'user_id' => $data['user_id']
+				]
+			]);
 
-        if ($device) {
-            $data['id'] = $device->id;
-        }
+		if ($device) {
+			$data['id'] = $device->id;
+		}
 
-        return $this->repo->save($data);
-    }
+		return $this->repo->save($data);
+	}
 }

src/Modules/Reporting/Repositories/ReportRepository.php

Indentation +40 added lines, -40 removed lines

@@ -7,45 +7,45 @@
 
 class ReportRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   Report $model
-     * @return  void
-     */
-    public function __construct(Report $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Report $model
+	 * @return  void
+	 */
+	public function __construct(Report $model)
+	{
+		parent::__construct($model);
+	}
 
-    /**
-     * Render the given report db view based on the given
-     * condition.
-     *
-     * @param  mixed   $report
-     * @param  array   $conditions
-     * @param  integer $perPage
-     * @return object
-     */
-    public function renderReport($report, $conditions = [], $perPage = 0)
-    {
-        $report = ! filter_var($report, FILTER_VALIDATE_INT) ? $report : $this->find($report);
-        /**
-         * Fetch data from the report based on the given conditions.
-         */
-        $report = \DB::table($report->view_name);
-        unset($conditions['page']);
-        if (count($conditions)) {
-            $conditions = $this->constructConditions($conditions, $this->model);
-            $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-        /**
-         * Paginate or all data.
-         */
-        if ($perPage) {
-            return $report->paginate($perPage);
-        } else {
-            return $report->get();
-        }
-    }
+	/**
+	 * Render the given report db view based on the given
+	 * condition.
+	 *
+	 * @param  mixed   $report
+	 * @param  array   $conditions
+	 * @param  integer $perPage
+	 * @return object
+	 */
+	public function renderReport($report, $conditions = [], $perPage = 0)
+	{
+		$report = ! filter_var($report, FILTER_VALIDATE_INT) ? $report : $this->find($report);
+		/**
+		 * Fetch data from the report based on the given conditions.
+		 */
+		$report = \DB::table($report->view_name);
+		unset($conditions['page']);
+		if (count($conditions)) {
+			$conditions = $this->constructConditions($conditions, $this->model);
+			$report->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+		/**
+		 * Paginate or all data.
+		 */
+		if ($perPage) {
+			return $report->paginate($perPage);
+		} else {
+			return $report->get();
+		}
+	}
 }

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

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class Register 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 [
-            'name'     => 'nullable|string',
-            'email'    => 'required|email|unique:users,email',
-            'password' => 'required|min:6'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'name'     => 'nullable|string',
+			'email'    => 'required|email|unique:users,email',
+			'password' => 'required|min:6'
+		];
+	}
 }

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

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class StoreUser 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 [
-            'name'     => 'nullable|string',
-            'email'    => 'required|email|unique:users,email,' . $this->route('id'),
-            'password' => 'nullable|min:6'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'name'     => 'nullable|string',
+			'email'    => 'required|email|unique:users,email,' . $this->route('id'),
+			'password' => 'nullable|min:6'
+		];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         return [
             'name'     => 'nullable|string',
-            'email'    => 'required|email|unique:users,email,' . $this->route('id'),
+            'email'    => 'required|email|unique:users,email,'.$this->route('id'),
             'password' => 'nullable|min:6'
         ];
     }

src/Modules/Users/Http/Requests/AssignRoles.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|array',
-            'role_ids.*' => 'required|exists:roles,id'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'role_ids' => 'required|array',
+			'role_ids.*' => 'required|exists:roles,id'
+		];
+	}
 }

src/Modules/Users/Database/Seeds/UsersTableSeeder.php

Indentation +99 added lines, -99 removed lines

@@ -8,105 +8,105 @@
 
 class UsersTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Create Default roles.
-         */
-        Role::updateOrInsert([
-            'name' => 'Admin',
-        ],[
-            'created_at' => \DB::raw('NOW()'),
-            'updated_at' => \DB::raw('NOW()')
-        ]);
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Create Default roles.
+		 */
+		Role::updateOrInsert([
+			'name' => 'Admin',
+		],[
+			'created_at' => \DB::raw('NOW()'),
+			'updated_at' => \DB::raw('NOW()')
+		]);
 
-        /**
-         * Create Default user.
-         */
-        AclUser::updateOrInsert([
-            'email' => 'admin@user.com',
-        ],[
-            'name'       => 'Admin',
-            'password'   => \Hash::make('123456'),
-            'confirmed'  => 1,
-            'created_at' => \DB::raw('NOW()'),
-            'updated_at' => \DB::raw('NOW()')
-        ]);
+		/**
+		 * Create Default user.
+		 */
+		AclUser::updateOrInsert([
+			'email' => 'admin@user.com',
+		],[
+			'name'       => 'Admin',
+			'password'   => \Hash::make('123456'),
+			'confirmed'  => 1,
+			'created_at' => \DB::raw('NOW()'),
+			'updated_at' => \DB::raw('NOW()')
+		]);
 
-        /**
-         * Insert the permissions related to users table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Users model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'show',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'store',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'update',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'destroy',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'deleted',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'restore',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'assignRoles',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'block',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'unblock',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ]
-            ]
-        );
-    }
+		/**
+		 * Insert the permissions related to users table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Users model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'show',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'store',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'update',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'destroy',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'deleted',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'restore',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignRoles',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'block',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'unblock',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
          */
         Role::updateOrInsert([
             'name' => 'Admin',
-        ],[
+        ], [
             'created_at' => \DB::raw('NOW()'),
             'updated_at' => \DB::raw('NOW()')
         ]);
@@ -30,7 +30,7 @@ 
          */
         AclUser::updateOrInsert([
             'email' => 'admin@user.com',
-        ],[
+        ], [
             'name'       => 'Admin',
             'password'   => \Hash::make('123456'),
             'confirmed'  => 1,

src/Modules/Users/Services/UserService.php

Indentation +361 added lines, -361 removed lines

@@ -12,368 +12,368 @@
 
 class UserService extends BaseService
 {
-    /**
-     * @var PermissionService
-     */
-    protected $permissionService;
-
-    /**
-     * @var LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * @var NotificationService
-     */
-    protected $notificationService;
-
-    /**
-     * @var OauthClientService
-     */
-    protected $oauthClientService;
-
-    /**
-     * Init new object.
-     *
-     * @param   UserRepository       $repo
-     * @param   PermissionService    $permissionService
-     * @param   LoginProxy           $loginProxy
-     * @param   NotificationService  $notificationService
-     * @param   OauthClientService   $oauthClientService
-     * @return  void
-     */
-    public function __construct(
-        UserRepository $repo,
-        PermissionService $permissionService,
-        LoginProxy $loginProxy,
-        NotificationService $notificationService,
-        OauthClientService $oauthClientService
-    ) {
-        $this->permissionService   = $permissionService;
-        $this->loginProxy          = $loginProxy;
-        $this->notificationService = $notificationService;
-        $this->oauthClientService  = $oauthClientService;
-        parent::__construct($repo);
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = ['roles.permissions'])
-    {
-        $permissions = [];
-        $user        = $this->repo->find(\Auth::id(), $relations);
-        foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[$permission->repo][$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 $permissionName
-     * @param  string $model
-     * @param  mixed  $userId
-     * @return boolean
-     */
-    public function can($permissionName, $model, $userId = false)
-    {
-        $permission = $this->permissionService->first([
-            'and' => [
-                'model' => $model,
-                'name'  => $permissionName,
-                'roles' => [
-                    'op' => 'has',
-                    'val' => [
-                        'users' => [
-                            'op' => 'has',
-                            'val' => [
-                                'users.id' => $userId ?: \Auth::id()
-                            ]
-                        ]
-                    ]
-                ]
-            ]
-        ]);
-
-        return $permission ? true : false;
-    }
-
-    /**
-     * Check if the logged in or the given user has the given role.
-     *
-     * @param  string[] $roles
-     * @param  mixed    $user
-     * @return boolean
-     */
-    public function hasRoles($roles, $user = false)
-    {
-        return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
-    }
-
-    /**
-     * Assign the given role ids to the given user.
-     *
-     * @param  integer $userId
-     * @param  array   $roleIds
-     * @return object
-     */
-    public function assignRoles($userId, $roleIds)
-    {
-        $user = false;
-        \DB::transaction(function () use ($userId, $roleIds, &$user) {
-            $user = $this->repo->find($userId);
-            $this->repo->detachRoles($user);
-            $this->repo->attachRoles($user, $roleIds);
-        });
-
-        return $user;
-    }
-
-    /**
-     * Handle the login request to the application.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @return object
-     */
-    public function login($email, $password)
-    {
-        if (! $user = $this->repo->first(['email' => $email])) {
-            \Errors::loginFailed();
-        } elseif ($user->blocked) {
-            \Errors::userIsBlocked();
-        } elseif (! config('user.disable_confirm_email') && ! $user->confirmed) {
-            \Errors::emailNotConfirmed();
-        }
-
-        return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
-    }
-
-    /**
-     * Handle the social login request to the application.
-     *
-     * @param  string $authCode
-     * @param  string $accessToken
-     * @return array
-     */
-    public function loginSocial($authCode, $accessToken, $type)
-    {
-        $accessToken = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
-        $user        = \Socialite::driver($type)->userFromToken($accessToken)->user;
-
-        if (! \Arr::has($user, 'email')) {
-            \Errors::noSocialEmail();
-        }
-
-        if (! $this->repo->first(['email' => $user['email']])) {
-            $this->register($user['name'], $user['email'], '', true);
-        }
-
-        return $this->login($user['email'], config('user.social_pass'));
-    }
+	/**
+	 * @var PermissionService
+	 */
+	protected $permissionService;
+
+	/**
+	 * @var LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * @var NotificationService
+	 */
+	protected $notificationService;
+
+	/**
+	 * @var OauthClientService
+	 */
+	protected $oauthClientService;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   UserRepository       $repo
+	 * @param   PermissionService    $permissionService
+	 * @param   LoginProxy           $loginProxy
+	 * @param   NotificationService  $notificationService
+	 * @param   OauthClientService   $oauthClientService
+	 * @return  void
+	 */
+	public function __construct(
+		UserRepository $repo,
+		PermissionService $permissionService,
+		LoginProxy $loginProxy,
+		NotificationService $notificationService,
+		OauthClientService $oauthClientService
+	) {
+		$this->permissionService   = $permissionService;
+		$this->loginProxy          = $loginProxy;
+		$this->notificationService = $notificationService;
+		$this->oauthClientService  = $oauthClientService;
+		parent::__construct($repo);
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = ['roles.permissions'])
+	{
+		$permissions = [];
+		$user        = $this->repo->find(\Auth::id(), $relations);
+		foreach ($user->roles as $role) {
+			$role->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[$permission->repo][$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 $permissionName
+	 * @param  string $model
+	 * @param  mixed  $userId
+	 * @return boolean
+	 */
+	public function can($permissionName, $model, $userId = false)
+	{
+		$permission = $this->permissionService->first([
+			'and' => [
+				'model' => $model,
+				'name'  => $permissionName,
+				'roles' => [
+					'op' => 'has',
+					'val' => [
+						'users' => [
+							'op' => 'has',
+							'val' => [
+								'users.id' => $userId ?: \Auth::id()
+							]
+						]
+					]
+				]
+			]
+		]);
+
+		return $permission ? true : false;
+	}
+
+	/**
+	 * Check if the logged in or the given user has the given role.
+	 *
+	 * @param  string[] $roles
+	 * @param  mixed    $user
+	 * @return boolean
+	 */
+	public function hasRoles($roles, $user = false)
+	{
+		return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
+	}
+
+	/**
+	 * Assign the given role ids to the given user.
+	 *
+	 * @param  integer $userId
+	 * @param  array   $roleIds
+	 * @return object
+	 */
+	public function assignRoles($userId, $roleIds)
+	{
+		$user = false;
+		\DB::transaction(function () use ($userId, $roleIds, &$user) {
+			$user = $this->repo->find($userId);
+			$this->repo->detachRoles($user);
+			$this->repo->attachRoles($user, $roleIds);
+		});
+
+		return $user;
+	}
+
+	/**
+	 * Handle the login request to the application.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @return object
+	 */
+	public function login($email, $password)
+	{
+		if (! $user = $this->repo->first(['email' => $email])) {
+			\Errors::loginFailed();
+		} elseif ($user->blocked) {
+			\Errors::userIsBlocked();
+		} elseif (! config('user.disable_confirm_email') && ! $user->confirmed) {
+			\Errors::emailNotConfirmed();
+		}
+
+		return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
+	}
+
+	/**
+	 * Handle the social login request to the application.
+	 *
+	 * @param  string $authCode
+	 * @param  string $accessToken
+	 * @return array
+	 */
+	public function loginSocial($authCode, $accessToken, $type)
+	{
+		$accessToken = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
+		$user        = \Socialite::driver($type)->userFromToken($accessToken)->user;
+
+		if (! \Arr::has($user, 'email')) {
+			\Errors::noSocialEmail();
+		}
+
+		if (! $this->repo->first(['email' => $user['email']])) {
+			$this->register($user['name'], $user['email'], '', true);
+		}
+
+		return $this->login($user['email'], config('user.social_pass'));
+	}
     
-    /**
-     * Handle the registration request.
-     *
-     * @param  string  $name
-     * @param  string  $email
-     * @param  string  $password
-     * @param  boolean $skipConfirmEmail
-     * @return array
-     */
-    public function register($name, $email, $password, $skipConfirmEmail = false)
-    {
-        $user = $this->repo->save([
-            'name'      => $name,
-            'email'     => $email,
-            'password'  => $password,
-            'confirmed' => $skipConfirmEmail
-        ]);
-
-        if (! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
+	/**
+	 * Handle the registration request.
+	 *
+	 * @param  string  $name
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @param  boolean $skipConfirmEmail
+	 * @return array
+	 */
+	public function register($name, $email, $password, $skipConfirmEmail = false)
+	{
+		$user = $this->repo->save([
+			'name'      => $name,
+			'email'     => $email,
+			'password'  => $password,
+			'confirmed' => $skipConfirmEmail
+		]);
+
+		if (! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
     
-    /**
-     * Block the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function block($userId)
-    {
-        if (\Auth::id() == $userId) {
-            \Errors::noPermissions();
-        }
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (\Auth::id() == $userId) {
+			\Errors::noPermissions();
+		}
         
-        return $this->repo->save(['id' => $userId, 'blocked' => 1]);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function unblock($userId)
-    {
-        return $this->repo->save(['id' => $userId, 'blocked' => 0]);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if (! $user = $this->repo->first(['email' => $email])) {
-            \Errors::notFound('email');
-        }
-
-        $token = \Password::createToken($user);
-        $this->notificationService->notify($user, 'ResetPassword', $token);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param   string  $email
-     * @param   string  $password
-     * @param   string  $passwordConfirmation
-     * @param   string  $token
-     * @return string|void
-     */
-    public function resetPassword($email, $password, $passwordConfirmation, $token)
-    {
-        $response = \Password::reset([
-            'email'                 => $email,
-            'password'              => $password,
-            'password_confirmation' => $passwordConfirmation,
-            'token'                 => $token
-        ], function ($user, $password) {
-            $this->repo->save(['id' => $user->id, 'password' => $password]);
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
-                break;
-
-            case \Password::INVALID_TOKEN:
-                \Errors::invalidResetToken();
-                break;
-
-            case \Password::INVALID_PASSWORD:
-                \Errors::invalidResetPassword();
-                break;
-
-            case \Password::INVALID_USER:
-                \Errors::notFound('user');
-                break;
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  string  $password
-     * @param  string  $oldPassword
-     * @return void
-     */
-    public function changePassword($password, $oldPassword)
-    {
-        $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
-            \Errors::invalidOldPassword();
-        }
-
-        $this->repo->save(['id' => $user->id, 'password' => $password]);
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return void
-     */
-    public function confirmEmail($confirmationCode)
-    {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
-            \Errors::invalidConfirmationCode();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return void
-     */
-    public function sendConfirmationEmail($email)
-    {
-        $user = $this->repo->first(['email' => $email]);
-        if ($user->confirmed) {
-            \Errors::emailAlreadyConfirmed();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
-        $this->notificationService->notify($user, 'ConfirmEmail');
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  string $name
-     * @param  string $email
-     * @param  string $profilePicture
-     * @return void
-     */
-    public function saveProfile($name, $email, $profilePicture = false)
-    {
-        $data['id'] = \Auth::id();
-        return $this->repo->save([
-            'id'             => \Auth::id(),
-            'name'           => $name,
-            'email'          => $email,
-            'profilePicture' => $profilePicture,
-        ]);
-    }
-
-    /**
-     * Logs out the user, revoke access token and refresh token.
-     *
-     * @return void
-     */
-    public function logout()
-    {
-        $this->oauthClientService->revokeAccessToken(\Auth::user()->token());
-    }
-
-    /**
-     * Attempt to refresh the access token using the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken($refreshToken)
-    {
-        return $this->loginProxy->refreshToken($refreshToken);
-    }
+		return $this->repo->save(['id' => $userId, 'blocked' => 1]);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function unblock($userId)
+	{
+		return $this->repo->save(['id' => $userId, 'blocked' => 0]);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if (! $user = $this->repo->first(['email' => $email])) {
+			\Errors::notFound('email');
+		}
+
+		$token = \Password::createToken($user);
+		$this->notificationService->notify($user, 'ResetPassword', $token);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param   string  $email
+	 * @param   string  $password
+	 * @param   string  $passwordConfirmation
+	 * @param   string  $token
+	 * @return string|void
+	 */
+	public function resetPassword($email, $password, $passwordConfirmation, $token)
+	{
+		$response = \Password::reset([
+			'email'                 => $email,
+			'password'              => $password,
+			'password_confirmation' => $passwordConfirmation,
+			'token'                 => $token
+		], function ($user, $password) {
+			$this->repo->save(['id' => $user->id, 'password' => $password]);
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
+				break;
+
+			case \Password::INVALID_TOKEN:
+				\Errors::invalidResetToken();
+				break;
+
+			case \Password::INVALID_PASSWORD:
+				\Errors::invalidResetPassword();
+				break;
+
+			case \Password::INVALID_USER:
+				\Errors::notFound('user');
+				break;
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  string  $password
+	 * @param  string  $oldPassword
+	 * @return void
+	 */
+	public function changePassword($password, $oldPassword)
+	{
+		$user = \Auth::user();
+		if (! \Hash::check($oldPassword, $user->password)) {
+			\Errors::invalidOldPassword();
+		}
+
+		$this->repo->save(['id' => $user->id, 'password' => $password]);
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return void
+	 */
+	public function confirmEmail($confirmationCode)
+	{
+		if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+			\Errors::invalidConfirmationCode();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return void
+	 */
+	public function sendConfirmationEmail($email)
+	{
+		$user = $this->repo->first(['email' => $email]);
+		if ($user->confirmed) {
+			\Errors::emailAlreadyConfirmed();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
+		$this->notificationService->notify($user, 'ConfirmEmail');
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  string $name
+	 * @param  string $email
+	 * @param  string $profilePicture
+	 * @return void
+	 */
+	public function saveProfile($name, $email, $profilePicture = false)
+	{
+		$data['id'] = \Auth::id();
+		return $this->repo->save([
+			'id'             => \Auth::id(),
+			'name'           => $name,
+			'email'          => $email,
+			'profilePicture' => $profilePicture,
+		]);
+	}
+
+	/**
+	 * Logs out the user, revoke access token and refresh token.
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		$this->oauthClientService->revokeAccessToken(\Auth::user()->token());
+	}
+
+	/**
+	 * Attempt to refresh the access token using the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshToken($refreshToken)
+	{
+		return $this->loginProxy->refreshToken($refreshToken);
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -67,7 +67,7 @@ 
         $permissions = [];
         $user        = $this->repo->find(\Auth::id(), $relations);
         foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
+            $role->permissions->each(function($permission) use (&$permissions) {
                 $permissions[$permission->repo][$permission->id] = $permission->name;
             });
         }
@@ -130,7 +130,7 @@ 
     public function assignRoles($userId, $roleIds)
     {
         $user = false;
-        \DB::transaction(function () use ($userId, $roleIds, &$user) {
+        \DB::transaction(function() use ($userId, $roleIds, &$user) {
             $user = $this->repo->find($userId);
             $this->repo->detachRoles($user);
             $this->repo->attachRoles($user, $roleIds);
@@ -148,11 +148,11 @@ 
      */
     public function login($email, $password)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::loginFailed();
         } elseif ($user->blocked) {
             \Errors::userIsBlocked();
-        } elseif (! config('user.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('user.disable_confirm_email') && ! $user->confirmed) {
             \Errors::emailNotConfirmed();
         }
 
@@ -171,11 +171,11 @@ 
         $accessToken = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
         $user        = \Socialite::driver($type)->userFromToken($accessToken)->user;
 
-        if (! \Arr::has($user, 'email')) {
+        if ( ! \Arr::has($user, 'email')) {
             \Errors::noSocialEmail();
         }
 
-        if (! $this->repo->first(['email' => $user['email']])) {
+        if ( ! $this->repo->first(['email' => $user['email']])) {
             $this->register($user['name'], $user['email'], '', true);
         }
 
@@ -200,7 +200,7 @@ 
             'confirmed' => $skipConfirmEmail
         ]);
 
-        if (! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
+        if ( ! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -241,7 +241,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::notFound('email');
         }
 
@@ -265,7 +265,7 @@ 
             'password'              => $password,
             'password_confirmation' => $passwordConfirmation,
             'token'                 => $token
-        ], function ($user, $password) {
+        ], function($user, $password) {
             $this->repo->save(['id' => $user->id, 'password' => $password]);
         });
 
@@ -298,7 +298,7 @@ 
     public function changePassword($password, $oldPassword)
     {
         $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
+        if ( ! \Hash::check($oldPassword, $user->password)) {
             \Errors::invalidOldPassword();
         }
 
@@ -313,7 +313,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
             \Errors::invalidConfirmationCode();
         }
 

src/Modules/Users/Repositories/UserRepository.php

Indentation +45 added lines, -45 removed lines

@@ -8,52 +8,52 @@
 
 class UserRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   AclUser $model
-     * @return  void
-     */
-    public function __construct(AclUser $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   AclUser $model
+	 * @return  void
+	 */
+	public function __construct(AclUser $model)
+	{
+		parent::__construct($model);
+	}
 
-    /**
-     * Detach all roles from the given user.
-     *
-     * @param  mixed $user
-     * @return object
-     */
-    public function detachRoles($user)
-    {
-        $user = ! filter_var($user, FILTER_VALIDATE_INT) ? $user : $this->find($user);
-        $user->roles()->detach();
-    }
+	/**
+	 * Detach all roles from the given user.
+	 *
+	 * @param  mixed $user
+	 * @return object
+	 */
+	public function detachRoles($user)
+	{
+		$user = ! filter_var($user, FILTER_VALIDATE_INT) ? $user : $this->find($user);
+		$user->roles()->detach();
+	}
 
-    /**
-     * Attach role ids to the given user.
-     *
-     * @param  mixed $user
-     * @param  array $roleIds
-     * @return object
-     */
-    public function attachRoles($user, $roleIds)
-    {
-        $user = ! filter_var($user, FILTER_VALIDATE_INT) ? $user : $this->find($user);
-        $user->roles()->attach($roleIds);
-    }
+	/**
+	 * Attach role ids to the given user.
+	 *
+	 * @param  mixed $user
+	 * @param  array $roleIds
+	 * @return object
+	 */
+	public function attachRoles($user, $roleIds)
+	{
+		$user = ! filter_var($user, FILTER_VALIDATE_INT) ? $user : $this->find($user);
+		$user->roles()->attach($roleIds);
+	}
 
-    /**
-     * Count the given user the given roles.
-     *
-     * @param  mixed    $user
-     * @param  string[] $roles
-     * @return boolean
-     */
-    public function countRoles($user, $roles)
-    {
-        $user = ! filter_var($user, FILTER_VALIDATE_INT) ? $user : $this->find($user);
-        return $user->roles()->whereIn('name', $roles)->count();
-    }
+	/**
+	 * Count the given user the given roles.
+	 *
+	 * @param  mixed    $user
+	 * @param  string[] $roles
+	 * @return boolean
+	 */
+	public function countRoles($user, $roles)
+	{
+		$user = ! filter_var($user, FILTER_VALIDATE_INT) ? $user : $this->find($user);
+		return $user->roles()->whereIn('name', $roles)->count();
+	}
 }