SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Proxy/LoginProxy.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
         $response = \ApiConsumer::post('/oauth/token', $data);
 
-        if (! $response->isSuccessful()) {
+        if ( ! $response->isSuccessful()) {
             if ($grantType == 'refresh_token') {
                 \ErrorHandler::invalidRefreshToken();
             }

Indentation +64 added lines, -64 removed lines

@@ -2,77 +2,77 @@
 
 class LoginProxy
 {
-    /**
-     * Attempt to create an access token using user credentials.
-     *
-     * @param  array   $credentials
-     * @param  boolean $adminLogin
-     * @return array
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        $user = \Core::users()->login($credentials, $adminLogin);
-        $tokens = $this->proxy('password', [
-            'username' => $credentials['email'],
-            'password' => $credentials['password']
-        ]);
+	/**
+	 * Attempt to create an access token using user credentials.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return array
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		$user = \Core::users()->login($credentials, $adminLogin);
+		$tokens = $this->proxy('password', [
+			'username' => $credentials['email'],
+			'password' => $credentials['password']
+		]);
 
-        return compact('user', 'tokens');
-    }
+		return compact('user', 'tokens');
+	}
 
-    /**
-     * Attempt to refresh the access token useing the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshtoken($refreshToken)
-    {
-        return $this->proxy('refresh_token', [
-            'refresh_token' => $refreshToken
-        ]);
-    }
+	/**
+	 * Attempt to refresh the access token useing the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshtoken($refreshToken)
+	{
+		return $this->proxy('refresh_token', [
+			'refresh_token' => $refreshToken
+		]);
+	}
 
-    /**
-     * Proxy a request to the OAuth server.
-     *
-     * @param string $grantType what type of grant type should be proxied
-     * @param array
-     */
-    public function proxy($grantType, array $data = [])
-    {
-        $data = array_merge($data, [
-            'client_id'     => config('skeleton.passport_client_id'),
-            'client_secret' => config('skeleton.passport_client_secret'),
-            'grant_type'    => $grantType
-        ]);
+	/**
+	 * Proxy a request to the OAuth server.
+	 *
+	 * @param string $grantType what type of grant type should be proxied
+	 * @param array
+	 */
+	public function proxy($grantType, array $data = [])
+	{
+		$data = array_merge($data, [
+			'client_id'     => config('skeleton.passport_client_id'),
+			'client_secret' => config('skeleton.passport_client_secret'),
+			'grant_type'    => $grantType
+		]);
 
-        $response = \ApiConsumer::post('/oauth/token', $data);
+		$response = \ApiConsumer::post('/oauth/token', $data);
 
-        if (! $response->isSuccessful()) {
-            if ($grantType == 'refresh_token') {
-                \ErrorHandler::invalidRefreshToken();
-            }
+		if (! $response->isSuccessful()) {
+			if ($grantType == 'refresh_token') {
+				\ErrorHandler::invalidRefreshToken();
+			}
 
-            \ErrorHandler::loginFailed();
-        }
+			\ErrorHandler::loginFailed();
+		}
 
-        $data = json_decode($response->getContent());
+		$data = json_decode($response->getContent());
 
-        return [
-            'access_token'  => $data->access_token,
-            'refresh_token' => $data->refresh_token,
-            'expires_in'    => $data->expires_in
-        ];
-    }
+		return [
+			'access_token'  => $data->access_token,
+			'refresh_token' => $data->refresh_token,
+			'expires_in'    => $data->expires_in
+		];
+	}
 
-    /**
-     * Logs out the user. We revoke access token and refresh token.
-     *
-     * @return void
-     */
-    public function logout()
-    {
-        \Core::users()->revokeAccessToken(\Auth::user()->token());
-    }
+	/**
+	 * Logs out the user. We revoke access token and refresh token.
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		\Core::users()->revokeAccessToken(\Auth::user()->token());
+	}
 }

src/Modules/Acl/Routes/api.php

Indentation +64 added lines, -64 removed lines

@@ -13,75 +13,75 @@
 
 Route::group(['prefix' => 'acl'], function () {
 
-    Route::group(['prefix' => 'users'], function () {
+	Route::group(['prefix' => 'users'], function () {
         
-        Route::get('list/{sortBy?}/{desc?}', 'UsersController@index');
-        Route::get('find/{id}', 'UsersController@find');
-        Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'UsersController@search');
-        Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'UsersController@paginate');
-        Route::get('delete/{id}', 'UsersController@delete');
-        Route::get('restore/{id}', 'UsersController@restore');
-        Route::get('account', 'UsersController@account');
-        Route::get('block/{id}', 'UsersController@block');
-        Route::get('unblock/{id}', 'UsersController@unblock');
-        Route::get('logout', 'UsersController@logout');
-        Route::post('refreshtoken', 'UsersController@refreshtoken');
-        Route::post('first', 'UsersController@first');
-        Route::post('findby/{sortBy?}/{desc?}', 'UsersController@findby');
-        Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'UsersController@paginateby');
-        Route::post('save', 'UsersController@save');
-        Route::post('profile/save', 'UsersController@saveProfile');
-        Route::post('deleted/{perPage?}/{sortBy?}/{desc?}', 'UsersController@deleted');
-        Route::post('register', 'UsersController@register');
-        Route::post('login', 'UsersController@login');
-        Route::post('login/social', 'UsersController@loginSocial');
-        Route::post('assigngroups', 'UsersController@assigngroups');
-        Route::post('sendreset', 'UsersController@sendreset');
-        Route::post('resetpassword', 'UsersController@resetpassword');
-        Route::post('changepassword', 'UsersController@changePassword');
-        Route::post('confirm/email', 'UsersController@confirmEmail');
-        Route::post('resend/email/confirmation', 'UsersController@resendEmailConfirmation');
-        Route::post('group/{groupName}/{perPage?}/{sortBy?}/{desc?}', 'UsersController@group');
-    });
+		Route::get('list/{sortBy?}/{desc?}', 'UsersController@index');
+		Route::get('find/{id}', 'UsersController@find');
+		Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'UsersController@search');
+		Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'UsersController@paginate');
+		Route::get('delete/{id}', 'UsersController@delete');
+		Route::get('restore/{id}', 'UsersController@restore');
+		Route::get('account', 'UsersController@account');
+		Route::get('block/{id}', 'UsersController@block');
+		Route::get('unblock/{id}', 'UsersController@unblock');
+		Route::get('logout', 'UsersController@logout');
+		Route::post('refreshtoken', 'UsersController@refreshtoken');
+		Route::post('first', 'UsersController@first');
+		Route::post('findby/{sortBy?}/{desc?}', 'UsersController@findby');
+		Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'UsersController@paginateby');
+		Route::post('save', 'UsersController@save');
+		Route::post('profile/save', 'UsersController@saveProfile');
+		Route::post('deleted/{perPage?}/{sortBy?}/{desc?}', 'UsersController@deleted');
+		Route::post('register', 'UsersController@register');
+		Route::post('login', 'UsersController@login');
+		Route::post('login/social', 'UsersController@loginSocial');
+		Route::post('assigngroups', 'UsersController@assigngroups');
+		Route::post('sendreset', 'UsersController@sendreset');
+		Route::post('resetpassword', 'UsersController@resetpassword');
+		Route::post('changepassword', 'UsersController@changePassword');
+		Route::post('confirm/email', 'UsersController@confirmEmail');
+		Route::post('resend/email/confirmation', 'UsersController@resendEmailConfirmation');
+		Route::post('group/{groupName}/{perPage?}/{sortBy?}/{desc?}', 'UsersController@group');
+	});
 
-    Route::group(['prefix' => 'groups'], function () {
+	Route::group(['prefix' => 'groups'], function () {
 
-        Route::get('list/{sortBy?}/{desc?}', 'GroupsController@index');
-        Route::get('find/{id}', 'GroupsController@find');
-        Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'GroupsController@search');
-        Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'GroupsController@paginate');
-        Route::get('delete/{id}', 'GroupsController@delete');
-        Route::get('restore/{id}', 'GroupsController@restore');
-        Route::post('first', 'GroupsController@first');
-        Route::post('findby/{sortBy?}/{desc?}', 'GroupsController@findby');
-        Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'GroupsController@paginateby');
-        Route::post('save', 'GroupsController@save');
-        Route::post('deleted/{perPage?}/{sortBy?}/{desc?}', 'GroupsController@deleted');
-        Route::post('assignpermissions', 'GroupsController@assignpermissions');
-    });
+		Route::get('list/{sortBy?}/{desc?}', 'GroupsController@index');
+		Route::get('find/{id}', 'GroupsController@find');
+		Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'GroupsController@search');
+		Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'GroupsController@paginate');
+		Route::get('delete/{id}', 'GroupsController@delete');
+		Route::get('restore/{id}', 'GroupsController@restore');
+		Route::post('first', 'GroupsController@first');
+		Route::post('findby/{sortBy?}/{desc?}', 'GroupsController@findby');
+		Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'GroupsController@paginateby');
+		Route::post('save', 'GroupsController@save');
+		Route::post('deleted/{perPage?}/{sortBy?}/{desc?}', 'GroupsController@deleted');
+		Route::post('assignpermissions', 'GroupsController@assignpermissions');
+	});
     
-    Route::group(['prefix' => 'permissions'], function () {
+	Route::group(['prefix' => 'permissions'], function () {
         
-        Route::get('list/{sortBy?}/{desc?}', 'PermissionsController@index');
-        Route::get('find/{id}', 'PermissionsController@find');
-        Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'PermissionsController@search');
-        Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'PermissionsController@paginate');
-        Route::post('first', 'PermissionsController@first');
-        Route::post('findby/{sortBy?}/{desc?}', 'PermissionsController@findby');
-        Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'PermissionsController@paginateby');
-    });
+		Route::get('list/{sortBy?}/{desc?}', 'PermissionsController@index');
+		Route::get('find/{id}', 'PermissionsController@find');
+		Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'PermissionsController@search');
+		Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'PermissionsController@paginate');
+		Route::post('first', 'PermissionsController@first');
+		Route::post('findby/{sortBy?}/{desc?}', 'PermissionsController@findby');
+		Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'PermissionsController@paginateby');
+	});
 
-    Route::group(['prefix' => 'oauth/clients'], function () {
+	Route::group(['prefix' => 'oauth/clients'], function () {
         
-        Route::get('list/{sortBy?}/{desc?}', 'OauthClientsController@index');
-        Route::get('find/{id}', 'OauthClientsController@find');
-        Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'OauthClientsController@search');
-        Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'OauthClientsController@paginate');
-        Route::get('revoke/{id}', 'OauthClientsController@revoke');
-        Route::get('unrevoke/{id}', 'OauthClientsController@unRevoke');
-        Route::post('first', 'OauthClientsController@first');
-        Route::post('findby/{sortBy?}/{desc?}', 'OauthClientsController@findby');
-        Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'OauthClientsController@paginateby');
-        Route::post('save', 'OauthClientsController@save');
-    });
+		Route::get('list/{sortBy?}/{desc?}', 'OauthClientsController@index');
+		Route::get('find/{id}', 'OauthClientsController@find');
+		Route::get('search/{query?}/{perPage?}/{sortBy?}/{desc?}', 'OauthClientsController@search');
+		Route::get('paginate/{perPage?}/{sortBy?}/{desc?}', 'OauthClientsController@paginate');
+		Route::get('revoke/{id}', 'OauthClientsController@revoke');
+		Route::get('unrevoke/{id}', 'OauthClientsController@unRevoke');
+		Route::post('first', 'OauthClientsController@first');
+		Route::post('findby/{sortBy?}/{desc?}', 'OauthClientsController@findby');
+		Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'OauthClientsController@paginateby');
+		Route::post('save', 'OauthClientsController@save');
+	});
 });

Spacing +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@ 
 |
 */
 
-Route::group(['prefix' => 'acl'], function () {
+Route::group(['prefix' => 'acl'], function() {
 
-    Route::group(['prefix' => 'users'], function () {
+    Route::group(['prefix' => 'users'], function() {
         
         Route::get('list/{sortBy?}/{desc?}', 'UsersController@index');
         Route::get('find/{id}', 'UsersController@find');
@@ -44,7 +44,7 @@ 
         Route::post('group/{groupName}/{perPage?}/{sortBy?}/{desc?}', 'UsersController@group');
     });
 
-    Route::group(['prefix' => 'groups'], function () {
+    Route::group(['prefix' => 'groups'], function() {
 
         Route::get('list/{sortBy?}/{desc?}', 'GroupsController@index');
         Route::get('find/{id}', 'GroupsController@find');
@@ -60,7 +60,7 @@ 
         Route::post('assignpermissions', 'GroupsController@assignpermissions');
     });
     
-    Route::group(['prefix' => 'permissions'], function () {
+    Route::group(['prefix' => 'permissions'], function() {
         
         Route::get('list/{sortBy?}/{desc?}', 'PermissionsController@index');
         Route::get('find/{id}', 'PermissionsController@find');
@@ -71,7 +71,7 @@ 
         Route::post('paginateby/{perPage?}/{sortBy?}/{desc?}', 'PermissionsController@paginateby');
     });
 
-    Route::group(['prefix' => 'oauth/clients'], function () {
+    Route::group(['prefix' => 'oauth/clients'], function() {
         
         Route::get('list/{sortBy?}/{desc?}', 'OauthClientsController@index');
         Route::get('find/{id}', 'OauthClientsController@find');

src/Modules/Acl/ModelObservers/AclPermissionObserver.php

Indentation +49 added lines, -49 removed lines

@@ -6,53 +6,53 @@
 class AclPermissionObserver
 {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        //
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    public function deleting($model)
-    {
-        //
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
-
-    public function restoring($model)
-    {
-        //
-    }
-
-    public function restored($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	public function creating($model)
+	{
+		//
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	public function updating($model)
+	{
+		//
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	public function deleting($model)
+	{
+		//
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
+
+	public function restoring($model)
+	{
+		//
+	}
+
+	public function restored($model)
+	{
+		//
+	}
 }

src/Modules/Acl/ModelObservers/AclGroupObserver.php

Indentation +56 added lines, -56 removed lines

@@ -6,69 +6,69 @@
 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)
+	{
+		//
+	}
 
-    /**
-     * Prevent deleting the admin group.
-     *
-     * @param  object $model the delted model.
-     * @return void
-     */
-    public function deleting($model)
-    {
-        if ($model->getOriginal('name') == 'Admin') {
-            \ErrorHandler::noPermissions();
-        }
-    }
+	/**
+	 * Prevent deleting the admin group.
+	 *
+	 * @param  object $model the delted model.
+	 * @return void
+	 */
+	public function deleting($model)
+	{
+		if ($model->getOriginal('name') == 'Admin') {
+			\ErrorHandler::noPermissions();
+		}
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }

src/Modules/Acl/ModelObservers/OauthClientObserver.php

Indentation +49 added lines, -49 removed lines

@@ -8,53 +8,53 @@
 class OauthClientObserver
 {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        $model->secret = Str::random(40);
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    public function deleting($model)
-    {
-        //
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
-
-    public function restoring($model)
-    {
-        //
-    }
-
-    public function restored($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	public function creating($model)
+	{
+		$model->secret = Str::random(40);
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	public function updating($model)
+	{
+		//
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	public function deleting($model)
+	{
+		//
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
+
+	public function restoring($model)
+	{
+		//
+	}
+
+	public function restored($model)
+	{
+		//
+	}
 }

src/Modules/Acl/ModelObservers/AclUserObserver.php

Indentation +48 added lines, -48 removed lines

@@ -6,62 +6,62 @@
 class AclUserObserver
 {
 
-    public function saving($model)
-    {
-        if ($model->isDirty('profile_picture')) {
-            \Media::deleteImage($model->getOriginal('profile_picture'));
-        }
-    }
+	public function saving($model)
+	{
+		if ($model->isDirty('profile_picture')) {
+			\Media::deleteImage($model->getOriginal('profile_picture'));
+		}
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    public function updating($model)
-    {
-        //
-    }
+	public function updating($model)
+	{
+		//
+	}
 
-    public function updated($model)
-    {
-        if ($model->isDirty('blocked') && $model->blocked) {
-            $model->tokens()->each(function ($token) {
+	public function updated($model)
+	{
+		if ($model->isDirty('blocked') && $model->blocked) {
+			$model->tokens()->each(function ($token) {
 
-                \Core::users()->revokeAccessToken($token);
-            });
-        }
-    }
+				\Core::users()->revokeAccessToken($token);
+			});
+		}
+	}
 
-    public function deleting($model)
-    {
-        if ($model->getOriginal('id') == \Auth::id()) {
-            \ErrorHandler::noPermissions();
-        }
-    }
+	public function deleting($model)
+	{
+		if ($model->getOriginal('id') == \Auth::id()) {
+			\ErrorHandler::noPermissions();
+		}
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     public function updated($model)
     {
         if ($model->isDirty('blocked') && $model->blocked) {
-            $model->tokens()->each(function ($token) {
+            $model->tokens()->each(function($token) {
 
                 \Core::users()->revokeAccessToken($token);
             });

src/Modules/Acl/AclGroup.php

Indentation +38 added lines, -38 removed lines

@@ -6,42 +6,42 @@
 class AclGroup extends Model
 {
 
-    use SoftDeletes;
-    protected $table    = 'groups';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name'];
-    public $searchable  = ['name'];
-
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function users()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
-
-    public function permissions()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
-    }
-
-    public static function boot()
-    {
-        parent::boot();
-        AclGroup::observe(\App::make('App\Modules\Acl\ModelObservers\AclGroupObserver'));
-    }
+	use SoftDeletes;
+	protected $table    = 'groups';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name'];
+	public $searchable  = ['name'];
+
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function users()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
+
+	public function permissions()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+	}
+
+	public static function boot()
+	{
+		parent::boot();
+		AclGroup::observe(\App::make('App\Modules\Acl\ModelObservers\AclGroupObserver'));
+	}
 }

src/Modules/Acl/AclUser.php

Indentation +127 added lines, -127 removed lines

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

src/Modules/Acl/AclPermission.php

Indentation +28 added lines, -28 removed lines

@@ -6,37 +6,37 @@
 class AclPermission extends Model
 {
 
-    use SoftDeletes;
-    protected $table    = 'permissions';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name', 'model'];
-    public $searchable  = ['name', 'model'];
+	use SoftDeletes;
+	protected $table    = 'permissions';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name', 'model'];
+	public $searchable  = ['name', 'model'];
 
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    public function groups()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'groups_permissions', 'permission_id', 'group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
-    }
+	public function groups()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'groups_permissions', 'permission_id', 'group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        AclPermission::observe(\App::make('App\Modules\Acl\ModelObservers\AclPermissionObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		AclPermission::observe(\App::make('App\Modules\Acl\ModelObservers\AclPermissionObserver'));
+	}
 }