SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Notifications/Database/Factories/PushNotificationDeviceFactory.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function(Faker\Generator $faker) {
     return [
 		'device_token' => $faker->sha1(),
 		'user_id'      => $faker->randomDigitNotNull(),

Indentation +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 $factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function (Faker\Generator $faker) {
-    return [
+	return [
 		'device_token' => $faker->sha1(),
 		'user_id'      => $faker->randomDigitNotNull(),
 		'created_at'   => $faker->dateTimeBetween('-1 years', 'now'),
 		'updated_at'   => $faker->dateTimeBetween('-1 years', 'now')
-    ];
+	];
 });
\ No newline at end of file

src/Modules/V1/Notifications/Database/Migrations/2016_01_24_111942_push_notifications_devices.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 			$table->unique(array('device_token', 'user_id'));
 			$table->softDeletes();
 			$table->timestamps();
-        });
+		});
 	}
 
 	/**

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 */
 	public function up()
 	{
-		Schema::create('push_notifications_devices', function (Blueprint $table) {
+		Schema::create('push_notifications_devices', function(Blueprint $table) {
 			$table->increments('id');
 			$table->string('device_token');
 			$table->integer('user_id');

src/Modules/V1/Notifications/Database/Migrations/2017_10_26_154804_create_jobs_table.php

Indentation +27 added lines, -27 removed lines

@@ -6,33 +6,33 @@
 
 class CreateJobsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('jobs', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('queue');
-            $table->longText('payload');
-            $table->tinyInteger('attempts')->unsigned();
-            $table->unsignedInteger('reserved_at')->nullable();
-            $table->unsignedInteger('available_at');
-            $table->unsignedInteger('created_at');
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('jobs', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('queue');
+			$table->longText('payload');
+			$table->tinyInteger('attempts')->unsigned();
+			$table->unsignedInteger('reserved_at')->nullable();
+			$table->unsignedInteger('available_at');
+			$table->unsignedInteger('created_at');
 
-            $table->index(['queue', 'reserved_at']);
-        });
-    }
+			$table->index(['queue', 'reserved_at']);
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('jobs');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('jobs');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('jobs', function (Blueprint $table) {
+        Schema::create('jobs', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('queue');
             $table->longText('payload');

src/Modules/V1/Acl/AclUser.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 use App\User;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Notifications\Notifiable;
 use Laravel\Passport\HasApiTokens;
 
 class AclUser extends User {

Indentation +73 added lines, -73 removed lines

@@ -7,89 +7,89 @@
 
 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 = ['name', 'email', 'password'];
-    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 = ['name', 'email', 'password'];
+	public $searchable  = ['name', 'email'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     * 
-     * @param string $value 
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = bcrypt($value);
-    }
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 * 
+	 * @param string $value 
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = bcrypt($value);
+	}
 
-    public function groups()
-    {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
+	public function groups()
+	{
+		return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
 
-    /**
-     * Return fcm device tokens related to the user.
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
+	/**
+	 * Return fcm device tokens related to the user.
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
 
-        foreach ($devices as $device) 
-        {
-            $accessToken = decrypt($device->access_token);
+		foreach ($devices as $device) 
+		{
+			$accessToken = decrypt($device->access_token);
 
-            try
-            {
-                if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
-                {
-                    continue;
-                }
+			try
+			{
+				if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
+				{
+					continue;
+				}
 
-                $tokens[] = $device->device_token;
-            } 
-            catch (\Exception $e) 
-            {
-                $device->forceDelete();
-            }
-        }
+				$tokens[] = $device->device_token;
+			} 
+			catch (\Exception $e) 
+			{
+				$device->forceDelete();
+			}
+		}
 
-        return $tokens;
-    }
+		return $tokens;
+	}
 
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.' . $this->id;
-    }
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.' . $this->id;
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
     use SoftDeletes, HasApiTokens;
     protected $table    = 'users';
     protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token','deleted_at'];
+    protected $hidden   = ['password', 'remember_token', 'deleted_at'];
     protected $guarded  = ['id'];
     protected $fillable = ['name', 'email', 'password'];
     public $searchable  = ['name', 'email'];
@@ -43,7 +43,7 @@ 
 
     public function groups()
     {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     public function receivesBroadcastNotificationsOn()
     {
-        return 'users.' . $this->id;
+        return 'users.'.$this->id;
     }
     
     public static function boot()

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
                 }
 
                 $tokens[] = $device->device_token;
-            } 
-            catch (\Exception $e) 
+            } catch (\Exception $e) 
             {
                 $device->forceDelete();
             }

src/lang/en/errors.php

Indentation +20 added lines, -20 removed lines

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

src/lang/ar/errors.php

Indentation +20 added lines, -20 removed lines

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

src/Modules/V1/Acl/Repositories/UserRepository.php

Braces +6 added lines, -12 removed lines

@@ -122,16 +122,13 @@ 
         if ( ! $user = $this->first(['email' => $credentials['email']])) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
+        } else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
+        } else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
+        } else if ($user->blocked)
         {
             \ErrorHandler::userIsBlocked();
         }
@@ -159,8 +156,7 @@ 
         {
             $data = ['email' => $user->email, 'password' => ''];
             return $this->register($data);
-        }
-        else
+        } else
         {
             if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
             {
@@ -198,12 +194,10 @@ 
         if ( ! $this->hasGroup('Admin'))
         {
             \ErrorHandler::noPermissions();
-        }
-        else if (\Auth::id() == $user_id)
+        } else if (\Auth::id() == $user_id)
         {
             \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+        } else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::noPermissions();
         }

Doc Comments +1 added lines, -1 removed lines

@@ -259,7 +259,7 @@
      * Reset the given user's password.
      *
      * @param  array  $credentials
-     * @return array
+     * @return string|null
      */
     public function resetPassword($credentials)
     {

Indentation +358 added lines, -358 removed lines

@@ -7,369 +7,369 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Acl\AclUser';
-    }
-
-    /**
-     * The loginProxy implementation.
-     * 
-     * @var \App\Modules\V1\Acl\Proxy\LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * The accessTokenRepository implementation.
-     * @var \League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface
-     */
-    private $accessTokenRepository;
-
-    public function __construct(LoginProxy $loginProxy, AccessTokenRepositoryInterface $accessTokenRepository)
-    {        
-        $this->loginProxy            = $loginProxy;
-        $this->accessTokenRepository = $accessTokenRepository;
-        parent::__construct();
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = [])
-    {
-        $permissions = [];
-        $user        = \Core::users()->find(\Auth::id(), $relations);
-        foreach ($user->groups()->get() as $group)
-        {
-            $group->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  boolean $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false)
-    {      
-        $user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
-        $permissions = [];
-
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
-            $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
-        });
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Acl\AclUser';
+	}
+
+	/**
+	 * The loginProxy implementation.
+	 * 
+	 * @var \App\Modules\V1\Acl\Proxy\LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * The accessTokenRepository implementation.
+	 * @var \League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface
+	 */
+	private $accessTokenRepository;
+
+	public function __construct(LoginProxy $loginProxy, AccessTokenRepositoryInterface $accessTokenRepository)
+	{        
+		$this->loginProxy            = $loginProxy;
+		$this->accessTokenRepository = $accessTokenRepository;
+		parent::__construct();
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = [])
+	{
+		$permissions = [];
+		$user        = \Core::users()->find(\Auth::id(), $relations);
+		foreach ($user->groups()->get() as $group)
+		{
+			$group->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  boolean $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false)
+	{      
+		$user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
+		$permissions = [];
+
+		$user->groups->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 group.
-     * 
-     * @param  string  $groupName
-     * @param  integer $userId
-     * @return boolean
-     */
-    public function hasGroup($groupName, $userId = false)
-    {
-        $userId = $userId ?: \Auth::id();
-        $groups = $this->find($userId)->groups;
-        return $groups->pluck('name')->search($groupName, true) === false ? false : true;
-    }
-
-    /**
-     * Assign the given group ids to the given user.
-     * 
-     * @param  integer $user_id    
-     * @param  array   $group_ids
-     * @return object
-     */
-    public function assignGroups($user_id, $group_ids)
-    {
-        \DB::transaction(function () use ($user_id, $group_ids) {
-            $user = $this->find($user_id);
-            $user->groups()->detach();
-            $user->groups()->attach($group_ids);
-        });
-
-        return $this->find($user_id);
-    }
-
-    /**
-     * 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();
-        }
-        else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
-        {
-            \ErrorHandler::userIsBlocked();
-        }
-
-        return $user;
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     * 
-     * @param  array   $credentials
-     * @return array
-     */
-    public function loginSocial($credentials)
-    {
-        $access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
-        $user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
-
-        if ( ! $user->email)
-        {
-            \ErrorHandler::noSocialEmail();
-        }
-
-        if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
-        {
-            $data = ['email' => $user->email, 'password' => ''];
-            return $this->register($data);
-        }
-        else
-        {
-            if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
-            {
-                \ErrorHandler::userAlreadyRegistered();
-            }
-
-            return $this->loginProxy->login(['email' => $registeredUser->email, 'password' => ''], 0);
-        }
-    }
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 * 
+	 * @param  string  $groupName
+	 * @param  integer $userId
+	 * @return boolean
+	 */
+	public function hasGroup($groupName, $userId = false)
+	{
+		$userId = $userId ?: \Auth::id();
+		$groups = $this->find($userId)->groups;
+		return $groups->pluck('name')->search($groupName, true) === false ? false : true;
+	}
+
+	/**
+	 * Assign the given group ids to the given user.
+	 * 
+	 * @param  integer $user_id    
+	 * @param  array   $group_ids
+	 * @return object
+	 */
+	public function assignGroups($user_id, $group_ids)
+	{
+		\DB::transaction(function () use ($user_id, $group_ids) {
+			$user = $this->find($user_id);
+			$user->groups()->detach();
+			$user->groups()->attach($group_ids);
+		});
+
+		return $this->find($user_id);
+	}
+
+	/**
+	 * 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();
+		}
+		else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($user->blocked)
+		{
+			\ErrorHandler::userIsBlocked();
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 * 
+	 * @param  array   $credentials
+	 * @return array
+	 */
+	public function loginSocial($credentials)
+	{
+		$access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
+		$user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
+
+		if ( ! $user->email)
+		{
+			\ErrorHandler::noSocialEmail();
+		}
+
+		if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
+		{
+			$data = ['email' => $user->email, 'password' => ''];
+			return $this->register($data);
+		}
+		else
+		{
+			if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
+			{
+				\ErrorHandler::userAlreadyRegistered();
+			}
+
+			return $this->loginProxy->login(['email' => $registeredUser->email, 'password' => ''], 0);
+		}
+	}
     
-    /**
-     * Handle a registration request.
-     * 
-     * @param  array $credentials
-     * @return array
-     */
-    public function register($credentials)
-    {
-        $this->model->create($credentials);
-        return $this->loginProxy->login($credentials, 0);
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function block($user_id)
-    {
-        if ( ! $user = $this->find($user_id)) 
-        {
-            \ErrorHandler::notFound('user');
-        }
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if (\Auth::id() == $user_id)
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+	/**
+	 * Handle a registration request.
+	 * 
+	 * @param  array $credentials
+	 * @return array
+	 */
+	public function register($credentials)
+	{
+		$this->model->create($credentials);
+		return $this->loginProxy->login($credentials, 0);
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function block($user_id)
+	{
+		if ( ! $user = $this->find($user_id)) 
+		{
+			\ErrorHandler::notFound('user');
+		}
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if (\Auth::id() == $user_id)
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function unblock($user_id)
-    {
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = $this->find($user_id);
-        $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');
-        }
-
-        $url   = $this->config['resetLink'];
-        $token = \Password::getRepository()->create($user);
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function unblock($user_id)
+	{
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = $this->find($user_id);
+		$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');
+		}
+
+		$url   = $this->config['resetLink'];
+		$token = \Password::getRepository()->create($user);
         
-        \Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
-            $m->to($user->email, $user->name)->subject('Your Password Reset Link');
-        });
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return array
-     */
-    public function resetPassword($credentials)
-    {
-        $response = \Password::reset($credentials, function ($user, $password) {
-            $user->password = $password;
-            $user->save();
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
+		\Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
+			$m->to($user->email, $user->name)->subject('Your Password Reset Link');
+		});
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return array
+	 */
+	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');
-
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
-
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
-
-            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();
-    }
-
-    /**
-     * Paginate all users in the given group based on the given conditions.
-     * 
-     * @param  string  $groupName
-     * @param  array   $relations
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
-    {   
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = call_user_func_array("{$this->getModel()}::with", array($relations));
-
-        $model->whereHas('groups', function($q) use ($groupName){
-            $q->where('name', $groupName);
-        });
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
+
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
+
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
+
+			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();
+	}
+
+	/**
+	 * Paginate all users in the given group based on the given conditions.
+	 * 
+	 * @param  string  $groupName
+	 * @param  array   $relations
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
+	{   
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = call_user_func_array("{$this->getModel()}::with", array($relations));
+
+		$model->whereHas('groups', function($q) use ($groupName){
+			$q->where('name', $groupName);
+		});
 
         
-        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 $credentials
-     * @return object
-     */
-    public function saveProfile($credentials) 
-    {
-        $user = \Auth::user();
-        $user->save($credentials);
-
-        return $user;
-    }
-
-    /**
-     * Ensure access token hasn't expired or revoked.
-     * 
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        $data = new ValidationData();
-        $data->setCurrentTime(time());
-
-        if ($accessToken->validate($data) === false || $this->accessTokenRepository->isAccessTokenRevoked($accessToken->getClaim('jti'))) 
-        {
-            return true;
-        }
-
-        return false;
-    }
+		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 $credentials
+	 * @return object
+	 */
+	public function saveProfile($credentials) 
+	{
+		$user = \Auth::user();
+		$user->save($credentials);
+
+		return $user;
+	}
+
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 * 
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		$data = new ValidationData();
+		$data->setCurrentTime(time());
+
+		if ($accessToken->validate($data) === false || $this->accessTokenRepository->isAccessTokenRevoked($accessToken->getClaim('jti'))) 
+		{
+			return true;
+		}
+
+		return false;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
         $user        = \Core::users()->find(\Auth::id(), $relations);
         foreach ($user->groups()->get() as $group)
         {
-            $group->permissions->each(function ($permission) use (&$permissions){
+            $group->permissions->each(function($permission) use (&$permissions){
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }
@@ -72,7 +72,7 @@ 
         $user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
         $permissions = [];
 
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
+        $user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model){
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
         });
         
@@ -102,7 +102,7 @@ 
      */
     public function assignGroups($user_id, $group_ids)
     {
-        \DB::transaction(function () use ($user_id, $group_ids) {
+        \DB::transaction(function() use ($user_id, $group_ids) {
             $user = $this->find($user_id);
             $user->groups()->detach();
             $user->groups()->attach($group_ids);
@@ -251,7 +251,7 @@ 
         $url   = $this->config['resetLink'];
         $token = \Password::getRepository()->create($user);
         
-        \Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
+        \Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function($m) use ($user) {
             $m->to($user->email, $user->name)->subject('Your Password Reset Link');
         });
     }
@@ -264,7 +264,7 @@ 
      */
     public function resetPassword($credentials)
     {
-        $response = \Password::reset($credentials, function ($user, $password) {
+        $response = \Password::reset($credentials, function($user, $password) {
             $user->password = $password;
             $user->save();
         });

src/Modules/V1/Acl/Repositories/OauthClientRepository.php

Indentation +21 added lines, -21 removed lines

@@ -14,27 +14,27 @@
 		return 'App\Modules\V1\Acl\OauthClient';
 	}
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function revoke($clientId)
-    {
-    	$client = $this->find($clientId);
-        $client->tokens()->update(['revoked' => true]);
-        $client->forceFill(['revoked' => true])->save();
-    }
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function revoke($clientId)
+	{
+		$client = $this->find($clientId);
+		$client->tokens()->update(['revoked' => true]);
+		$client->forceFill(['revoked' => true])->save();
+	}
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function revoke($clientId)
-    {
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function revoke($clientId)
+	{
 		$this->update($clientId, ['secret' => str_random(40)]);
-    }
+	}
 }

src/Modules/V1/Acl/OauthClient.php

Indentation +16 added lines, -16 removed lines

@@ -6,23 +6,23 @@
 
 class OauthClient extends Client
 {
-    protected $dates    = ['created_at', 'updated_at'];
-    protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
-    public $searchable  = ['name'];
+	protected $dates    = ['created_at', 'updated_at'];
+	protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
+	public $searchable  = ['name'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\OauthClientObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\OauthClientObserver'));
+	}
 }