SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Http/Controllers/GroupsController.php

Indentation +33 added lines, -33 removed lines

@@ -9,40 +9,40 @@
 
 class GroupsController extends BaseApiController
 {
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules = [
-    'name' => 'required|string|max:100|unique:groups,name,{id}'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules = [
+	'name' => 'required|string|max:100|unique:groups,name,{id}'
+	];
 
-    /**
-     * Init new object.
-     *
-     * @param   GroupRepository $repo
-     * @param   CoreConfig      $config
-     * @return  void
-     */
-    public function __construct(GroupRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclGroup');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   GroupRepository $repo
+	 * @param   CoreConfig      $config
+	 * @return  void
+	 */
+	public function __construct(GroupRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclGroup');
+	}
 
-    /**
-     * Handle an assign permissions to group request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assignpermissions(Request $request)
-    {
-        $this->validate($request, [
-            'permission_ids' => 'required|exists:permissions,id',
-            'group_id'       => 'required|array|exists:groups,id'
-            ]);
+	/**
+	 * Handle an assign permissions to group request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assignpermissions(Request $request)
+	{
+		$this->validate($request, [
+			'permission_ids' => 'required|exists:permissions,id',
+			'group_id'       => 'required|array|exists:groups,id'
+			]);
 
-        return new $this->modelResource($this->repo->assignPermissions($request->get('group_id'), $request->get('permission_ids')));
-    }
+		return new $this->modelResource($this->repo->assignPermissions($request->get('group_id'), $request->get('permission_ids')));
+	}
 }

src/Modules/Acl/Http/Controllers/PermissionsController.php

Indentation +11 added lines, -11 removed lines

@@ -8,15 +8,15 @@
 
 class PermissionsController extends BaseApiController
 {
-    /**
-     * Init new object.
-     *
-     * @param   PermissionRepository $repo
-     * @param   CoreConfig           $config
-     * @return  void
-     */
-    public function __construct(PermissionRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclPermission');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   PermissionRepository $repo
+	 * @param   CoreConfig           $config
+	 * @return  void
+	 */
+	public function __construct(PermissionRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclPermission');
+	}
 }

src/Modules/Acl/Http/Controllers/UsersController.php

Indentation +280 added lines, -280 removed lines

@@ -11,285 +11,285 @@
 
 class UsersController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile', 'account'];
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
-
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules = [
-        'name'     => 'nullable|string',
-        'email'    => 'required|email|unique:users,email,{id}',
-        'password' => 'nullable|min:6'
-    ];
-
-    /**
-     * The loginProxy implementation.
-     *
-     * @var \App\Modules\Acl\Proxy\LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * Init new object.
-     *
-     * @param   LoginProxy     $loginProxy
-     * @param   UserRepository $repo
-     * @param   CoreConfig     $config
-     * @return  void
-     */
-    public function __construct(LoginProxy $loginProxy, UserRepository $repo, CoreConfig $config)
-    {
-        $this->loginProxy = $loginProxy;
-        parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclUser');
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function account()
-    {
-        return new $this->modelResource($this->repo->account($this->relations));
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return new $this->modelResource($this->repo->block($id));
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return new $this->modelResource($this->repo->unblock($id));
-    }
-
-    /**
-     * Logout the user.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return new GeneralResource($this->loginProxy->logout());
-    }
-
-    /**
-     * Handle a registration request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Request $request)
-    {
-        $this->validate($request, [
-            'name'     => 'nullable|string',
-            'email'    => 'required|email|unique:users,email,{id}',
-            'password' => 'required|min:6'
-            ]);
-
-        return new $this->modelResource($this->repo->register($request->only('name', 'email', 'password')));
-    }
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function login(Request $request)
-    {
-        $this->validate($request, [
-            'email'    => 'required|email',
-            'password' => 'required|min:6',
-            'admin'    => 'nullable|boolean'
-            ]);
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile', 'account'];
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
+
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules = [
+		'name'     => 'nullable|string',
+		'email'    => 'required|email|unique:users,email,{id}',
+		'password' => 'nullable|min:6'
+	];
+
+	/**
+	 * The loginProxy implementation.
+	 *
+	 * @var \App\Modules\Acl\Proxy\LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   LoginProxy     $loginProxy
+	 * @param   UserRepository $repo
+	 * @param   CoreConfig     $config
+	 * @return  void
+	 */
+	public function __construct(LoginProxy $loginProxy, UserRepository $repo, CoreConfig $config)
+	{
+		$this->loginProxy = $loginProxy;
+		parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\AclUser');
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account()
+	{
+		return new $this->modelResource($this->repo->account($this->relations));
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return new $this->modelResource($this->repo->block($id));
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return new $this->modelResource($this->repo->unblock($id));
+	}
+
+	/**
+	 * Logout the user.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return new GeneralResource($this->loginProxy->logout());
+	}
+
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Request $request)
+	{
+		$this->validate($request, [
+			'name'     => 'nullable|string',
+			'email'    => 'required|email|unique:users,email,{id}',
+			'password' => 'required|min:6'
+			]);
+
+		return new $this->modelResource($this->repo->register($request->only('name', 'email', 'password')));
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function login(Request $request)
+	{
+		$this->validate($request, [
+			'email'    => 'required|email',
+			'password' => 'required|min:6',
+			'admin'    => 'nullable|boolean'
+			]);
         
-        $result = $this->loginProxy->login($request->only('email', 'password'), $request->get('admin'));
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function loginSocial(Request $request)
-    {
-        $this->validate($request, [
-            'auth_code'    => 'required_without:access_token',
-            'access_token' => 'required_without:auth_code',
-            'type'         => 'required|in:facebook,google'
-            ]);
-
-        $result = $this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Assign the given groups to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assigngroups(Request $request)
-    {
-        $this->validate($request, [
-            'group_ids' => 'required|exists:groups,id',
-            'user_id'   => 'required|exists:users,id'
-            ]);
-
-        return new $this->modelResource($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')));
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function sendreset(Request $request)
-    {
-        $this->validate($request, ['email' => 'required|email']);
-
-        return new GeneralResource($this->repo->sendReset($request->get('email')));
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resetpassword(Request $request)
-    {
-        $this->validate($request, [
-            'token'                 => 'required',
-            'email'                 => 'required|email',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
-
-        return new GeneralResource($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')));
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(Request $request)
-    {
-        $this->validate($request, [
-            'old_password'          => 'required',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
-
-        return new GeneralResource($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')));
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function confirmEmail(Request $request)
-    {
-        $this->validate($request, [
-            'confirmation_code' => 'required|string'
-        ]);
-
-        return new GeneralResource($this->repo->confirmEmail($request->only('confirmation_code')));
-    }
-
-    /**
-     * Resend the email confirmation mail.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resendEmailConfirmation(Request $request)
-    {
-        $this->validate($request, [
-            'email' => 'required|exists:users,email'
-        ]);
-
-        return new GeneralResource($this->repo->sendConfirmationEmail($request->get('email')));
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshtoken(Request $request)
-    {
-        $this->validate($request, [
-            'refreshtoken' => 'required',
-        ]);
-
-        return new GeneralResource($this->loginProxy->refreshtoken($request->get('refreshtoken')));
-    }
-
-    /**
-     * Paginate all users with in the given group.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string $groupName The name of the requested group.
-     * @param  integer $perPage  Number of rows per page default 15.
-     * @param  string  $sortBy   The name of the column to sort by.
-     * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
-    {
-        return $this->modelResource::collection($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc));
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(Request $request)
-    {
-        $this->validate($request, [
-            'profile_picture' => 'nullable|string',
-            'name'            => 'nullable|string',
-            'email'           => 'required|email|unique:users,email,'.\Auth::id()
-        ]);
-
-        return new $this->modelResource($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')));
-    }
+		$result = $this->loginProxy->login($request->only('email', 'password'), $request->get('admin'));
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function loginSocial(Request $request)
+	{
+		$this->validate($request, [
+			'auth_code'    => 'required_without:access_token',
+			'access_token' => 'required_without:auth_code',
+			'type'         => 'required|in:facebook,google'
+			]);
+
+		$result = $this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Assign the given groups to the given user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assigngroups(Request $request)
+	{
+		$this->validate($request, [
+			'group_ids' => 'required|exists:groups,id',
+			'user_id'   => 'required|exists:users,id'
+			]);
+
+		return new $this->modelResource($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')));
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function sendreset(Request $request)
+	{
+		$this->validate($request, ['email' => 'required|email']);
+
+		return new GeneralResource($this->repo->sendReset($request->get('email')));
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetpassword(Request $request)
+	{
+		$this->validate($request, [
+			'token'                 => 'required',
+			'email'                 => 'required|email',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
+
+		return new GeneralResource($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')));
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(Request $request)
+	{
+		$this->validate($request, [
+			'old_password'          => 'required',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
+
+		return new GeneralResource($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')));
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function confirmEmail(Request $request)
+	{
+		$this->validate($request, [
+			'confirmation_code' => 'required|string'
+		]);
+
+		return new GeneralResource($this->repo->confirmEmail($request->only('confirmation_code')));
+	}
+
+	/**
+	 * Resend the email confirmation mail.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resendEmailConfirmation(Request $request)
+	{
+		$this->validate($request, [
+			'email' => 'required|exists:users,email'
+		]);
+
+		return new GeneralResource($this->repo->sendConfirmationEmail($request->get('email')));
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshtoken(Request $request)
+	{
+		$this->validate($request, [
+			'refreshtoken' => 'required',
+		]);
+
+		return new GeneralResource($this->loginProxy->refreshtoken($request->get('refreshtoken')));
+	}
+
+	/**
+	 * Paginate all users with in the given group.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string $groupName The name of the requested group.
+	 * @param  integer $perPage  Number of rows per page default 15.
+	 * @param  string  $sortBy   The name of the column to sort by.
+	 * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
+	{
+		return $this->modelResource::collection($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc));
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(Request $request)
+	{
+		$this->validate($request, [
+			'profile_picture' => 'nullable|string',
+			'name'            => 'nullable|string',
+			'email'           => 'required|email|unique:users,email,'.\Auth::id()
+		]);
+
+		return new $this->modelResource($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')));
+	}
 }

src/Modules/Acl/Http/Controllers/OauthClientsController.php

Indentation +42 added lines, -42 removed lines

@@ -9,49 +9,49 @@
 
 class OauthClientsController extends BaseApiController
 {
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules = [
-        'name'     => 'required|max:255',
-        'redirect' => 'required|url',
-        'user_id'  => 'required|exists:users,id',
-        'revoked'  => 'boolean'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules = [
+		'name'     => 'required|max:255',
+		'redirect' => 'required|url',
+		'user_id'  => 'required|exists:users,id',
+		'revoked'  => 'boolean'
+	];
 
-    /**
-     * Init new object.
-     *
-     * @param   OauthClientRepository $repo
-     * @param   CoreConfig            $config
-     * @return  void
-     */
-    public function __construct(OauthClientRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\OauthClient');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   OauthClientRepository $repo
+	 * @param   CoreConfig            $config
+	 * @return  void
+	 */
+	public function __construct(OauthClientRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Acl\Http\Resources\OauthClient');
+	}
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId Id of the client
-     * @return \Illuminate\Http\Response
-     */
-    public function revoke($clientId)
-    {
-        return new GeneralResource($this->repo->revoke($clientId));
-    }
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId Id of the client
+	 * @return \Illuminate\Http\Response
+	 */
+	public function revoke($clientId)
+	{
+		return new GeneralResource($this->repo->revoke($clientId));
+	}
 
-    /**
-     * Un revoke the given client.
-     *
-     * @param  integer  $clientId Id of the client
-     * @return \Illuminate\Http\Response
-     */
-    public function unRevoke($clientId)
-    {
-        return new GeneralResource($this->repo->unRevoke($clientId));
-    }
+	/**
+	 * Un revoke the given client.
+	 *
+	 * @param  integer  $clientId Id of the client
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unRevoke($clientId)
+	{
+		return new GeneralResource($this->repo->unRevoke($clientId));
+	}
 }

src/Modules/Acl/Proxy/LoginProxy.php

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/Reporting/Http/Resources/Report.php

Indentation +16 added lines, -16 removed lines

@@ -6,20 +6,20 @@
 
 class Report extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'reportName' => $this->report_name,
-            'viewName' => $this->view_name,
-            'createdAt' => $this->created_at,
-            'updatedAt' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'reportName' => $this->report_name,
+			'viewName' => $this->view_name,
+			'createdAt' => $this->created_at,
+			'updatedAt' => $this->updated_at,
+		];
+	}
 }

src/Modules/Reporting/Http/Controllers/ReportsController.php

Indentation +29 added lines, -29 removed lines

@@ -9,35 +9,35 @@
 
 class ReportsController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['getReport'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['getReport'];
 
-    /**
-     * Init new object.
-     *
-     * @param   ReportRepository $repo
-     * @param   CoreConfig       $config
-     * @return  void
-     */
-    public function __construct(ReportRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Reporting\Http\Resources\Report');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   ReportRepository $repo
+	 * @param   CoreConfig       $config
+	 * @return  void
+	 */
+	public function __construct(ReportRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Reporting\Http\Resources\Report');
+	}
 
-    /**
-     * Render the given report name with the given conditions.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $reportName Name of the requested report
-     * @param  integer $perPage    Number of rows per page default all data.
-     * @return \Illuminate\Http\Response
-     */
-    public function getReport(Request $request, $reportName, $perPage = 0)
-    {
-        return \Response::json($this->repo->getReport($reportName, $request->all(), $perPage), 200);
-    }
+	/**
+	 * Render the given report name with the given conditions.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $reportName Name of the requested report
+	 * @param  integer $perPage    Number of rows per page default all data.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getReport(Request $request, $reportName, $perPage = 0)
+	{
+		return \Response::json($this->repo->getReport($reportName, $request->all(), $perPage), 200);
+	}
 }