SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Core/Utl/ErrorHandler.php

Indentation +65 added lines, -65 removed lines

@@ -2,81 +2,81 @@
 
 class ErrorHandler
 {
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => 'Please login before any action'];
-        abort($error['status'], $error['message']);
-    }
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => 'Please login before any action'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function tokenExpired()
-    {
-        $error = ['status' => 403, 'message' => 'Login token expired'];
-        abort($error['status'], $error['message']);
-    }
+	public function tokenExpired()
+	{
+		$error = ['status' => 403, 'message' => 'Login token expired'];
+		abort($error['status'], $error['message']);
+	}
 
-     public function noPermissions()
-    {
-        $error = ['status' => 403, 'message' => 'No permissions'];
-        abort($error['status'], $error['message']);
-    }
+	 public function noPermissions()
+	{
+		$error = ['status' => 403, 'message' => 'No permissions'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => 'Wrong mail or password'];
-        abort($error['status'], $error['message']);
-    }
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => 'Wrong mail or password'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
-        abort($error['status'], $error['message']);
-    }
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => 'Please check the given inputes'];
-        abort($error['status'], $error['message']);
-    }
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => 'Please check the given inputes'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => 'Can\'t create setting'];
-        abort($error['status'], $error['message']);
-    }
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => 'Can\'t create setting'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => 'Can\'t update setting key'];
-        abort($error['status'], $error['message']);
-    }
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => 'Can\'t update setting key'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function userIsBlocked()
-    {
-        $error = ['status' => 403, 'message' => 'You have been blocked'];
-        abort($error['status'], $error['message']);
-    }
+	public function userIsBlocked()
+	{
+		$error = ['status' => 403, 'message' => 'You have been blocked'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function invalidResetToken()
-    {
-        $error = ['status' => 400, 'message' => 'Reset password token is invalid'];
-        abort($error['status'], $error['message']);
-    }
+	public function invalidResetToken()
+	{
+		$error = ['status' => 400, 'message' => 'Reset password token is invalid'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function invalidResetPassword()
-    {
-        $error = ['status' => 400, 'message' => 'Reset password is invalid'];
-        abort($error['status'], $error['message']);
-    }
+	public function invalidResetPassword()
+	{
+		$error = ['status' => 400, 'message' => 'Reset password is invalid'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
-        abort($error['status'], $error['message']);
-    }
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function generalError()
-    {
-        $error = ['status' => 404, 'message' => 'Something went wrong'];
-        abort($error['status'], $error['message']);
-    }
+	public function generalError()
+	{
+		$error = ['status' => 404, 'message' => 'Something went wrong'];
+		abort($error['status'], $error['message']);
+	}
 }
\ No newline at end of file

src/Modules/V1/Acl/AclUser.php

Indentation +53 added lines, -53 removed lines

@@ -6,66 +6,66 @@
 
 class AclUser extends User {
 
-    use SoftDeletes;
-    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'];
-    protected $appends  = ['permissions'];
+	use SoftDeletes;
+	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'];
+	protected $appends  = ['permissions'];
     
-    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 logs()
-    {
-        return $this->hasMany('App\Modules\V1\Logging\Log', 'user_id');
-    }
+	public function logs()
+	{
+		return $this->hasMany('App\Modules\V1\Logging\Log', 'user_id');
+	}
 
-    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();
+	}
 
-    public function getPermissionsAttribute()
-    {
-        $permissions = [];
-        foreach ($this->groups as $group)
-        {
-            $group->permissions->each(function ($permission) use (&$permissions){
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
+	public function getPermissionsAttribute()
+	{
+		$permissions = [];
+		foreach ($this->groups as $group)
+		{
+			$group->permissions->each(function ($permission) use (&$permissions){
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
 
-        return \Illuminate\Database\Eloquent\Collection::make($permissions);
-    }
+		return \Illuminate\Database\Eloquent\Collection::make($permissions);
+	}
 
-    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'));
+	}
 }

src/Modules/V1/Acl/Database/Migrations/2015_12_20_124154_password_resets.php

Indentation +22 added lines, -22 removed lines

@@ -5,27 +5,27 @@
 
 class PasswordResets extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('password_resets', function (Blueprint $table) {
-            $table->string('email')->index();
-            $table->string('token')->index();
-            $table->timestamp('created_at');
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('password_resets', function (Blueprint $table) {
+			$table->string('email')->index();
+			$table->string('token')->index();
+			$table->timestamp('created_at');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('password_resets');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('password_resets');
+	}
 }

src/Modules/V1/Acl/Database/Migrations/2015_12_20_124153_users.php

Indentation +9 added lines, -9 removed lines

@@ -13,15 +13,15 @@
 	public function up()
 	{
 		Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100)->nullable();
-            $table->string('email')->unique();
-            $table->string('password', 60);
-            $table->boolean('blocked', 0);
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('name',100)->nullable();
+			$table->string('email')->unique();
+			$table->string('password', 60);
+			$table->boolean('blocked', 0);
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
 	}
 
 	/**

src/ApiSkeletonServiceProvider.php

Indentation +21 added lines, -21 removed lines

@@ -6,26 +6,26 @@
 
 class ApiSkeletonServiceProvider extends ServiceProvider
 {
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->publishes([
-            __DIR__.'/Modules'               => app_path('Modules'),
-            __DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'),
-            ]);
-    }
+	/**
+	 * Perform post-registration booting of services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->publishes([
+			__DIR__.'/Modules'               => app_path('Modules'),
+			__DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'),
+			]);
+	}
 
-    /**
-     * Register any package services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
+	/**
+	 * Register any package services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
 }
\ No newline at end of file

src/Modules/V1/Acl/ModelObservers/AclGroupObserver.php

Indentation +52 added lines, -52 removed lines

@@ -5,65 +5,65 @@
  */
 class AclGroupObserver {
 
-    public function saving($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent updating of the admin group.
-     * 
-     * @param  object $model the model beign updated.
-     * @return void
-     */
-    public function updating($model)
-    {
-        if ($model->getOriginal()['name'] == 'Admin') 
-        {
-            \ErrorHandler::noPermissions();
-        }
-    }
+	/**
+	 * Prevent updating of the admin group.
+	 * 
+	 * @param  object $model the model beign updated.
+	 * @return void
+	 */
+	public function updating($model)
+	{
+		if ($model->getOriginal()['name'] == 'Admin') 
+		{
+			\ErrorHandler::noPermissions();
+		}
+	}
 
-    public function updated($model)
-    {
-        //
-    }
+	public function updated($model)
+	{
+		//
+	}
 
-    /**
-     * Soft delete the associated permissions to the deleted group
-     * and prevent deleting the admin group.
-     * 
-     * @param  object $model the delted model.
-     * @return void
-     */
-    public function deleting($model)
-    {
-        if ($model->getOriginal()['name'] == 'Admin') 
-        {
-            \ErrorHandler::noPermissions();
-        }
+	/**
+	 * Soft delete the associated permissions to the deleted group
+	 * and prevent deleting the admin group.
+	 * 
+	 * @param  object $model the delted model.
+	 * @return void
+	 */
+	public function deleting($model)
+	{
+		if ($model->getOriginal()['name'] == 'Admin') 
+		{
+			\ErrorHandler::noPermissions();
+		}
 
-        \DB::table('groups_permissions')->where('group_id', $model->id)->update(array('deleted_at' => \DB::raw('NOW()')));
-    }
+		\DB::table('groups_permissions')->where('group_id', $model->id)->update(array('deleted_at' => \DB::raw('NOW()')));
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
 }
\ No newline at end of file

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

Indentation +233 added lines, -233 removed lines

@@ -4,244 +4,244 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Acl\AclUser';
-    }
-
-    /**
-     * 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 = [];
-        \Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){
-            $permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); 
-        });
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Acl\AclUser';
+	}
+
+	/**
+	 * 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 = [];
+		\Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){
+			$permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); 
+		});
         
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given group.
-     * 
-     * @param  string  $groupName
-     * @return boolean
-     */
-    public function hasGroup($groupName)
-    {
-        $groups = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id)->groups;
-        return $groups->lists('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 = \Core::users()->find($user_id);
-            $user->groups()->detach();
-            $user->groups()->attach($group_ids);
-        });
-
-        return \Core::users()->find($user_id);
-    }
-
-    /**
-     * Handle a login request to the application.
-     * 
-     * @param  array   $credentials    
-     * @param  boolean $adminLogin
-     * @return string
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        if ( ! $user = \Core::users()->first(['email' => $credentials['email']])) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
-        {
-            \ErrorHandler::userIsBlocked();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
-        {
-            return $token;
-        }
-        else
-        {
-            \ErrorHandler::loginFailed();
-        }
-    }
-
-    /**
-     * Handle a registration request.
-     * 
-     * @param  array $credentials
-     * @return string
-     */
-    public function register($credentials)
-    {
-        return \JWTAuth::fromUser(\Core::users()->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 = \Core::users()->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->lists('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 * 
+	 * @param  string  $groupName
+	 * @return boolean
+	 */
+	public function hasGroup($groupName)
+	{
+		$groups = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id)->groups;
+		return $groups->lists('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 = \Core::users()->find($user_id);
+			$user->groups()->detach();
+			$user->groups()->attach($group_ids);
+		});
+
+		return \Core::users()->find($user_id);
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 * 
+	 * @param  array   $credentials    
+	 * @param  boolean $adminLogin
+	 * @return string
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		if ( ! $user = \Core::users()->first(['email' => $credentials['email']])) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($adminLogin && $user->groups->lists('name')->search('Admin', true) === false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ( ! $adminLogin && $user->groups->lists('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($user->blocked)
+		{
+			\ErrorHandler::userIsBlocked();
+		}
+		else if ($token = \JWTAuth::attempt($credentials))
+		{
+			return $token;
+		}
+		else
+		{
+			\ErrorHandler::loginFailed();
+		}
+	}
+
+	/**
+	 * Handle a registration request.
+	 * 
+	 * @param  array $credentials
+	 * @return string
+	 */
+	public function register($credentials)
+	{
+		return \JWTAuth::fromUser(\Core::users()->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 = \Core::users()->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->lists('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          = \Core::users()->find($user_id);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Handle the editing of the user profile.
-     * 
-     * @param  array $profile
-     * @return object
-     */
-    public function editProfile($profile)
-    {
-        unset($profile['email']);
-        unset($profile['password']);
-        $profile['id'] = \JWTAuth::parseToken()->authenticate()->id;
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function unblock($user_id)
+	{
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = \Core::users()->find($user_id);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Handle the editing of the user profile.
+	 * 
+	 * @param  array $profile
+	 * @return object
+	 */
+	public function editProfile($profile)
+	{
+		unset($profile['email']);
+		unset($profile['password']);
+		$profile['id'] = \JWTAuth::parseToken()->authenticate()->id;
         
-        return $this->save($profile);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $url
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email, $url)
-    {
-        view()->composer('auth.emails.password', function($view) use ($url) {
-            $view->with(['url' => $url]);
-        });
-
-        $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) {
-            $message->subject('Your Password Reset Link');
-        });
-
-        switch ($response) 
-        {
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('email');
-        }
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return integer
-     */
-    public function resetPassword($credentials)
-    {
-        $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
-            $user->password = bcrypt($password);
-            $user->save();
-
-            $token = \JWTAuth::fromUser($user);
-        });
-
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return $token;
+		return $this->save($profile);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $url
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email, $url)
+	{
+		view()->composer('auth.emails.password', function($view) use ($url) {
+			$view->with(['url' => $url]);
+		});
+
+		$response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) {
+			$message->subject('Your Password Reset Link');
+		});
+
+		switch ($response) 
+		{
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('email');
+		}
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return integer
+	 */
+	public function resetPassword($credentials)
+	{
+		$token    = false;
+		$response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+			$user->password = bcrypt($password);
+			$user->save();
+
+			$token = \JWTAuth::fromUser($user);
+		});
+
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return $token;
                 
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
 
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
 
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
 
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
 }

src/Modules/V1/Core/ModelObservers/SettingsObserver.php

Indentation +54 added lines, -54 removed lines

@@ -5,59 +5,59 @@
  */
 class SettingsObserver {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    /**
-     * Prevent the creating of the settings.
-     * 
-     * @param  object $model the model beign created.
-     * @return void
-     */
-    public function creating($model)
-    {
-        \ErrorHandler::cannotCreateSetting();
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    /**
-     * Prevent updating of the setting key.
-     * 
-     * @param  object $model the model beign updated.
-     * @return void
-     */
-    public function updating($model)
-    {
-        if ($model->getOriginal()['key'] !== $model->key) 
-        {
-            \ErrorHandler::cannotUpdateSettingKey();
-        }
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    public function deleting($model)
-    {
-        //
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	/**
+	 * Prevent the creating of the settings.
+	 * 
+	 * @param  object $model the model beign created.
+	 * @return void
+	 */
+	public function creating($model)
+	{
+		\ErrorHandler::cannotCreateSetting();
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	/**
+	 * Prevent updating of the setting key.
+	 * 
+	 * @param  object $model the model beign updated.
+	 * @return void
+	 */
+	public function updating($model)
+	{
+		if ($model->getOriginal()['key'] !== $model->key) 
+		{
+			\ErrorHandler::cannotUpdateSettingKey();
+		}
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	public function deleting($model)
+	{
+		//
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
 
 }
\ No newline at end of file

src/Modules/V1/Notifications/Repositories/NotificationRepository.php

Indentation +18 added lines, -18 removed lines

@@ -15,23 +15,23 @@
 	}
 
 	/**
-     * Set the notification notified to true.
-     * 
-     * @param  integer  $id
-     * @return object
-     */
-    public function notified($id)
-    {
-        return $this->save(['id' => $id, 'notified' => 1]);
-    }
+	 * Set the notification notified to true.
+	 * 
+	 * @param  integer  $id
+	 * @return object
+	 */
+	public function notified($id)
+	{
+		return $this->save(['id' => $id, 'notified' => 1]);
+	}
 
-    /**
-     * Set the notification notified to all.
-     * 
-     * @return void
-     */
-    public function notifyAll()
-    {
-        \Core::notifications()->update(false, ['notified' => 1], 'notified');
-    }
+	/**
+	 * Set the notification notified to all.
+	 * 
+	 * @return void
+	 */
+	public function notifyAll()
+	{
+		\Core::notifications()->update(false, ['notified' => 1], 'notified');
+	}
 }