SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Notifications/Notification.php

Indentation +43 added lines, -43 removed lines

@@ -5,48 +5,48 @@
 
 class Notification extends Model{
 
-    use SoftDeletes;
-    protected $table    = 'notifications';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at', 'item_type', 'data'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['key', 'data', 'item_name', 'item_type', 'item_id', 'notified'];
-    protected $appends  = ['description'];
-    public $searchable  = ['key', 'item_name', 'item_type'];
-
-    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 getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	use SoftDeletes;
+	protected $table    = 'notifications';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at', 'item_type', 'data'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['key', 'data', 'item_name', 'item_type', 'item_id', 'notified'];
+	protected $appends  = ['description'];
+	public $searchable  = ['key', 'item_name', 'item_type'];
+
+	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 getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
     
-    public function item()
-    {
-        return $this->morphTo();
-    }
-
-    public function setDataAttribute($value)
-    {
-        $this->attributes['data'] = serialize($value);
-    }
-
-    public function getDescriptionAttribute()
-    {
-        return trans('notifications.' . $this->attributes['key'], unserialize($this->attributes['data']));
-    }
-
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\NotificationObserver'));
-    }
+	public function item()
+	{
+		return $this->morphTo();
+	}
+
+	public function setDataAttribute($value)
+	{
+		$this->attributes['data'] = serialize($value);
+	}
+
+	public function getDescriptionAttribute()
+	{
+		return trans('notifications.' . $this->attributes['key'], unserialize($this->attributes['data']));
+	}
+
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\NotificationObserver'));
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Notification extends Model{
+class Notification extends Model {
 
     use SoftDeletes;
     protected $table    = 'notifications';
@@ -41,7 +41,7 @@ 
 
     public function getDescriptionAttribute()
     {
-        return trans('notifications.' . $this->attributes['key'], unserialize($this->attributes['data']));
+        return trans('notifications.'.$this->attributes['key'], unserialize($this->attributes['data']));
     }
 
     public static function boot()

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

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 */
 	public function assignPermissions($groupId, $permissionIds)
 	{
-		\DB::transaction(function () use ($groupId, $permissionIds) {
+		\DB::transaction(function() use ($groupId, $permissionIds) {
 			$group = $this->find($groupId);
 			$group->permissions()->detach();
 			$group->permissions()->attach($permissionIds);

Indentation +1 added lines, -1 removed lines

@@ -29,6 +29,6 @@
 			$group->permissions()->attach($permissionIds);
 		});
 
-        return $this->find($groupId);
+		return $this->find($groupId);
 	}
 }

src/lang/ar/notifications.php

Indentation +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@
 
 return [
     
-    /**
-     * Here goes your notification messages.
-     */
+	/**
+	 * Here goes your notification messages.
+	 */
 
 ];
\ No newline at end of file

src/lang/en/auth.php

Indentation +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Authentication Language Lines
     |--------------------------------------------------------------------------
@@ -13,7 +13,7 @@ 
     |
     */
 
-    'failed' => 'These credentials do not match our records.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+	'failed' => 'These credentials do not match our records.',
+	'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
 
 ];

src/lang/en/validation.php

Indentation +75 added lines, -75 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Validation Language Lines
     |--------------------------------------------------------------------------
@@ -13,74 +13,74 @@ 
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min and :max.',
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
-        'string'  => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
-    ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'filled'               => 'The :attribute field is required.',
-    'image'                => 'The :attribute must be an image.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
-    ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
-    ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
-    ],
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'unique'               => 'The :attribute has already been taken.',
-    'url'                  => 'The :attribute format is invalid.',
+	'accepted'             => 'The :attribute must be accepted.',
+	'active_url'           => 'The :attribute is not a valid URL.',
+	'after'                => 'The :attribute must be a date after :date.',
+	'alpha'                => 'The :attribute may only contain letters.',
+	'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
+	'alpha_num'            => 'The :attribute may only contain letters and numbers.',
+	'array'                => 'The :attribute must be an array.',
+	'before'               => 'The :attribute must be a date before :date.',
+	'between'              => [
+		'numeric' => 'The :attribute must be between :min and :max.',
+		'file'    => 'The :attribute must be between :min and :max kilobytes.',
+		'string'  => 'The :attribute must be between :min and :max characters.',
+		'array'   => 'The :attribute must have between :min and :max items.',
+	],
+	'boolean'              => 'The :attribute field must be true or false.',
+	'confirmed'            => 'The :attribute confirmation does not match.',
+	'date'                 => 'The :attribute is not a valid date.',
+	'date_format'          => 'The :attribute does not match the format :format.',
+	'different'            => 'The :attribute and :other must be different.',
+	'digits'               => 'The :attribute must be :digits digits.',
+	'digits_between'       => 'The :attribute must be between :min and :max digits.',
+	'distinct'             => 'The :attribute field has a duplicate value.',
+	'email'                => 'The :attribute must be a valid email address.',
+	'exists'               => 'The selected :attribute is invalid.',
+	'filled'               => 'The :attribute field is required.',
+	'image'                => 'The :attribute must be an image.',
+	'in'                   => 'The selected :attribute is invalid.',
+	'in_array'             => 'The :attribute field does not exist in :other.',
+	'integer'              => 'The :attribute must be an integer.',
+	'ip'                   => 'The :attribute must be a valid IP address.',
+	'json'                 => 'The :attribute must be a valid JSON string.',
+	'max'                  => [
+		'numeric' => 'The :attribute may not be greater than :max.',
+		'file'    => 'The :attribute may not be greater than :max kilobytes.',
+		'string'  => 'The :attribute may not be greater than :max characters.',
+		'array'   => 'The :attribute may not have more than :max items.',
+	],
+	'mimes'                => 'The :attribute must be a file of type: :values.',
+	'min'                  => [
+		'numeric' => 'The :attribute must be at least :min.',
+		'file'    => 'The :attribute must be at least :min kilobytes.',
+		'string'  => 'The :attribute must be at least :min characters.',
+		'array'   => 'The :attribute must have at least :min items.',
+	],
+	'not_in'               => 'The selected :attribute is invalid.',
+	'numeric'              => 'The :attribute must be a number.',
+	'present'              => 'The :attribute field must be present.',
+	'regex'                => 'The :attribute format is invalid.',
+	'required'             => 'The :attribute field is required.',
+	'required_if'          => 'The :attribute field is required when :other is :value.',
+	'required_unless'      => 'The :attribute field is required unless :other is in :values.',
+	'required_with'        => 'The :attribute field is required when :values is present.',
+	'required_with_all'    => 'The :attribute field is required when :values is present.',
+	'required_without'     => 'The :attribute field is required when :values is not present.',
+	'required_without_all' => 'The :attribute field is required when none of :values are present.',
+	'same'                 => 'The :attribute and :other must match.',
+	'size'                 => [
+		'numeric' => 'The :attribute must be :size.',
+		'file'    => 'The :attribute must be :size kilobytes.',
+		'string'  => 'The :attribute must be :size characters.',
+		'array'   => 'The :attribute must contain :size items.',
+	],
+	'string'               => 'The :attribute must be a string.',
+	'timezone'             => 'The :attribute must be a valid zone.',
+	'unique'               => 'The :attribute has already been taken.',
+	'url'                  => 'The :attribute format is invalid.',
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
     |--------------------------------------------------------------------------
@@ -91,13 +91,13 @@ 
     |
     */
 
-    'custom' => [
-        'attribute-name' => [
-            'rule-name' => 'custom-message',
-        ],
-    ],
+	'custom' => [
+		'attribute-name' => [
+			'rule-name' => 'custom-message',
+		],
+	],
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
     |--------------------------------------------------------------------------
@@ -108,6 +108,6 @@ 
     |
     */
 
-    'attributes' => [],
+	'attributes' => [],
 
 ];

src/lang/en/passwords.php

Indentation +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Password Reset Language Lines
     |--------------------------------------------------------------------------
@@ -13,10 +13,10 @@ 
     |
     */
 
-    'password' => 'Passwords must be at least six characters and match the confirmation.',
-    'reset' => 'Your password has been reset!',
-    'sent' => 'We have e-mailed your password reset link!',
-    'token' => 'This password reset token is invalid.',
-    'user' => "We can't find a user with that e-mail address.",
+	'password' => 'Passwords must be at least six characters and match the confirmation.',
+	'reset' => 'Your password has been reset!',
+	'sent' => 'We have e-mailed your password reset link!',
+	'token' => 'This password reset token is invalid.',
+	'user' => "We can't find a user with that e-mail address.",
 
 ];

src/lang/en/pagination.php

Indentation +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Pagination Language Lines
     |--------------------------------------------------------------------------
@@ -13,7 +13,7 @@ 
     |
     */
 
-    'previous' => '« Previous',
-    'next'     => 'Next »',
+	'previous' => '« Previous',
+	'next'     => 'Next »',
 
 ];

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

Braces +8 added lines, -16 removed lines

@@ -103,24 +103,19 @@ 
         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();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
+        } else if ($token = \JWTAuth::attempt($credentials))
         {
             return ['token' => $token];
-        }
-        else
+        } else
         {
             \ErrorHandler::loginFailed();
         }
@@ -146,8 +141,7 @@ 
         {
             $data = ['email' => $user->email, 'password' => ''];
             return $this->register($data);
-        }
-        else
+        } else
         {
             if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
             {
@@ -193,12 +187,10 @@ 
         if ( ! $this->hasGroup('Admin'))
         {
             \ErrorHandler::noPermissions();
-        }
-        else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
+        } else if (\JWTAuth::parseToken()->authenticate()->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();
         }

Indentation +353 added lines, -353 removed lines

@@ -4,364 +4,364 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Acl\AclUser';
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = [])
-    {
-        $permissions = [];
-        $user        = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->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 ?: \JWTAuth::parseToken()->authenticate();
-        $permissions = [];
-
-        if ( ! $user = $this->find($user->id, ['groups.permissions'])) 
-        {
-            \ErrorHandler::tokenExpired();
-        }
-
-        $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';
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = [])
+	{
+		$permissions = [];
+		$user        = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->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 ?: \JWTAuth::parseToken()->authenticate();
+		$permissions = [];
+
+		if ( ! $user = $this->find($user->id, ['groups.permissions'])) 
+		{
+			\ErrorHandler::tokenExpired();
+		}
+
+		$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 ?: \JWTAuth::parseToken()->authenticate()->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 array
-     */
-    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();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
-        {
-            return ['token' => $token];
-        }
-        else
-        {
-            \ErrorHandler::loginFailed();
-        }
-    }
-
-    /**
-     * 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->login(['email' => $registeredUser->email, 'password' => ''], false);
-        }
-    }
+		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 ?: \JWTAuth::parseToken()->authenticate()->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 array
+	 */
+	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();
+		}
+		else if ($token = \JWTAuth::attempt($credentials))
+		{
+			return ['token' => $token];
+		}
+		else
+		{
+			\ErrorHandler::loginFailed();
+		}
+	}
+
+	/**
+	 * 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->login(['email' => $registeredUser->email, 'password' => ''], false);
+		}
+	}
     
-    /**
-     * Handle a registration request.
-     * 
-     * @param  array $credentials
-     * @return array
-     */
-    public function register($credentials)
-    {
-        return ['token' => \JWTAuth::fromUser($this->model->create($credentials))];
-    }
-
-    /**
-     * Logout the user.
-     * 
-     * @return boolean
-     */
-    public function logout()
-    {
-        return \JWTAuth::invalidate(\JWTAuth::getToken());
-    }
-
-    /**
-     * 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 (\JWTAuth::parseToken()->authenticate()->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)
+	{
+		return ['token' => \JWTAuth::fromUser($this->model->create($credentials))];
+	}
+
+	/**
+	 * Logout the user.
+	 * 
+	 * @return boolean
+	 */
+	public function logout()
+	{
+		return \JWTAuth::invalidate(\JWTAuth::getToken());
+	}
+
+	/**
+	 * 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 (\JWTAuth::parseToken()->authenticate()->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)
-    {
-        $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
-            $user->password = $password;
-            $user->save();
-
-            $token = \JWTAuth::fromUser($user);
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return ['token' => $token];
+		\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)
+	{
+		$token    = false;
+		$response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+			$user->password = $password;
+			$user->save();
+
+			$token = \JWTAuth::fromUser($user);
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return ['token' => $token];
                 
-            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 = \JWTAuth::parseToken()->authenticate();
-        if ( ! \Hash::check($credentials['old_password'], $user->password)) 
-        {
-            \ErrorHandler::invalidOldPassword();
-        }
-
-        $user->password = $credentials['password'];
-        $user->save();
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @return array
-     */
-    public function refreshtoken()
-    {
-        $token = \JWTAuth::parseToken()->refresh();
-
-        return ['token' => $token];
-    }
-
-    /**
-     * 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 = \JWTAuth::parseToken()->authenticate();
+		if ( ! \Hash::check($credentials['old_password'], $user->password)) 
+		{
+			\ErrorHandler::invalidOldPassword();
+		}
+
+		$user->password = $credentials['password'];
+		$user->save();
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @return array
+	 */
+	public function refreshtoken()
+	{
+		$token = \JWTAuth::parseToken()->refresh();
+
+		return ['token' => $token];
+	}
+
+	/**
+	 * 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 = \JWTAuth::parseToken()->authenticate();
-        $user->save($credentials);
-
-        return $user;
-    }
+		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 = \JWTAuth::parseToken()->authenticate();
+		$user->save($credentials);
+
+		return $user;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
         $user        = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->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;
             });
         }
@@ -44,7 +44,7 @@ 
      * @param  boolean $user
      * @return boolean
      */
-    public function can($nameOfPermission, $model, $user = false )
+    public function can($nameOfPermission, $model, $user = false)
     {      
         $user        = $user ?: \JWTAuth::parseToken()->authenticate();
         $permissions = [];
@@ -54,7 +54,7 @@ 
             \ErrorHandler::tokenExpired();
         }
 
-        $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()); 
         });
         
@@ -84,7 +84,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);
@@ -247,7 +247,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');
         });
     }
@@ -261,7 +261,7 @@ 
     public function resetPassword($credentials)
     {
         $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+        $response = \Password::reset($credentials, function($user, $password) use (&$token) {
             $user->password = $password;
             $user->save();
 

src/Modules/V1/Notifications/Providers/RouteServiceProvider.php

Indentation +61 added lines, -61 removed lines

@@ -8,72 +8,72 @@
 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\V1\Notifications\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\V1\Notifications\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::group([
-            'middleware' => 'web',
-            'namespace'  => $this->namespace,
-        ], function ($router) {
-            require module_path('notifications', 'Routes/web.php');
-        });
-    }
+	/**
+	 * Define the "web" routes for the module.
+	 *
+	 * These routes all receive session state, CSRF protection, etc.
+	 *
+	 * @return void
+	 */
+	protected function mapWebRoutes()
+	{
+		Route::group([
+			'middleware' => 'web',
+			'namespace'  => $this->namespace,
+		], function ($router) {
+			require module_path('notifications', 'Routes/web.php');
+		});
+	}
 
-    /**
-     * Define the "api" routes for the module.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::group([
-            'middleware' => 'api',
-            'namespace'  => $this->namespace,
-            'prefix'     => 'api',
-        ], function ($router) {
-            require module_path('notifications', 'Routes/api.php');
-        });
-    }
+	/**
+	 * Define the "api" routes for the module.
+	 *
+	 * These routes are typically stateless.
+	 *
+	 * @return void
+	 */
+	protected function mapApiRoutes()
+	{
+		Route::group([
+			'middleware' => 'api',
+			'namespace'  => $this->namespace,
+			'prefix'     => 'api',
+		], function ($router) {
+			require module_path('notifications', 'Routes/api.php');
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

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