SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Database/Seeds/GroupsTableSeeder.php

Indentation +90 added lines, -90 removed lines

@@ -6,94 +6,94 @@
 
 class GroupsTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Insert the permissions related to groups table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Groups model permissions.
-                 */
-                [
-                'name'       => 'save',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'delete',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'find',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'search',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'list',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'findby',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'first',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'paginate',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'paginateby',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'assignpermissions',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'deleted',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'restore',
-                'model'      => 'groups',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ]
-            ]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to groups table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Groups model permissions.
+				 */
+				[
+				'name'       => 'save',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'delete',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignpermissions',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'deleted',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'restore',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

src/Modules/Acl/Database/Seeds/AclDatabaseSeeder.php

Indentation +14 added lines, -14 removed lines

@@ -6,18 +6,18 @@
 
 class AclDatabaseSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $this->call(ClearDataSeeder::class);
-        $this->call(UsersTableSeeder::class);
-        $this->call(GroupsTableSeeder::class);
-        $this->call(PermissionsTableSeeder::class);
-        $this->call(OauthClientsTableSeeder::class);
-        $this->call(AssignRelationsSeeder::class);
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$this->call(ClearDataSeeder::class);
+		$this->call(UsersTableSeeder::class);
+		$this->call(GroupsTableSeeder::class);
+		$this->call(PermissionsTableSeeder::class);
+		$this->call(OauthClientsTableSeeder::class);
+		$this->call(AssignRelationsSeeder::class);
+	}
 }

src/Modules/Acl/Database/Seeds/OauthClientsTableSeeder.php

Indentation +78 added lines, -78 removed lines

@@ -6,82 +6,82 @@
 
 class OauthClientsTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Insert the permissions related to oauthClients table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Users model permissions.
-                 */
-                [
-                'name'       => 'list',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'find',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'search',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'paginate',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'revoke',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'unRevoke',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'first',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'findby',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'paginateby',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'save',
-                'model'      => 'oauthClients',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ]
-            ]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to oauthClients table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Users model permissions.
+				 */
+				[
+				'name'       => 'list',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'revoke',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'unRevoke',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'save',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

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

Indentation +6 added lines, -6 removed lines

@@ -7,10 +7,10 @@
 
 class PermissionsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model = 'permissions';
+	/**
+	 * The name of the model that is used by the base api controller
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model = 'permissions';
 }

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

Indentation +278 added lines, -278 removed lines

@@ -8,282 +8,282 @@
 
 class UsersController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model = 'users';
-
-    /**
-     * 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;
-
-    public function __construct(LoginProxy $loginProxy)
-    {
-        $this->loginProxy = $loginProxy;
-        parent::__construct();
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function account()
-    {
-        return \Response::json($this->repo->account($this->relations), 200);
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return \Response::json($this->repo->block($id), 200);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return \Response::json($this->repo->unblock($id), 200);
-    }
-
-    /**
-     * Logout the user.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return \Response::json($this->loginProxy->logout(), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->register($request->only('name', 'email', 'password')), 200);
-    }
-
-    /**
-     * 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'
-            ]);
-
-        return \Response::json($this->loginProxy->login($request->only('email', 'password'), $request->get('admin')), 200);
-    }
-
-    /**
-     * 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'
-            ]);
-
-        return \Response::json($this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type')), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->sendReset($request->get('email')), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->confirmEmail($request->only('confirmation_code')), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->sendConfirmationEmail($request->get('email')), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->loginProxy->refreshtoken($request->get('refreshtoken')), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc), 200);
-    }
-
-    /**
-     * 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 \Response::json($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')), 200);
-    }
+	/**
+	 * The name of the model that is used by the base api controller
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model = 'users';
+
+	/**
+	 * 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;
+
+	public function __construct(LoginProxy $loginProxy)
+	{
+		$this->loginProxy = $loginProxy;
+		parent::__construct();
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account()
+	{
+		return \Response::json($this->repo->account($this->relations), 200);
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return \Response::json($this->repo->block($id), 200);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return \Response::json($this->repo->unblock($id), 200);
+	}
+
+	/**
+	 * Logout the user.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return \Response::json($this->loginProxy->logout(), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->register($request->only('name', 'email', 'password')), 200);
+	}
+
+	/**
+	 * 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'
+			]);
+
+		return \Response::json($this->loginProxy->login($request->only('email', 'password'), $request->get('admin')), 200);
+	}
+
+	/**
+	 * 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'
+			]);
+
+		return \Response::json($this->repo->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type')), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->sendReset($request->get('email')), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->confirmEmail($request->only('confirmation_code')), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->sendConfirmationEmail($request->get('email')), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->loginProxy->refreshtoken($request->get('refreshtoken')), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc), 200);
+	}
+
+	/**
+	 * 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 \Response::json($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')), 200);
+	}
 }

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

Indentation +37 added lines, -37 removed lines

@@ -7,44 +7,44 @@
 
 class OauthClientsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model = 'oauthClients';
+	/**
+	 * The name of the model that is used by the base api controller
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model = 'oauthClients';
 
-    /**
-     * 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'
+	];
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId Id of the client
-     * @return \Illuminate\Http\Response
-     */
-    public function revoke($clientId)
-    {
-        return \Response::json($this->repo->revoke($clientId), 200);
-    }
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId Id of the client
+	 * @return \Illuminate\Http\Response
+	 */
+	public function revoke($clientId)
+	{
+		return \Response::json($this->repo->revoke($clientId), 200);
+	}
 
-    /**
-     * Un revoke the given client.
-     *
-     * @param  integer  $clientId Id of the client
-     * @return \Illuminate\Http\Response
-     */
-    public function unRevoke($clientId)
-    {
-        return \Response::json($this->repo->unRevoke($clientId), 200);
-    }
+	/**
+	 * Un revoke the given client.
+	 *
+	 * @param  integer  $clientId Id of the client
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unRevoke($clientId)
+	{
+		return \Response::json($this->repo->unRevoke($clientId), 200);
+	}
 }

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

Indentation +28 added lines, -28 removed lines

@@ -7,35 +7,35 @@
 
 class GroupsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model = 'groups';
+	/**
+	 * The name of the model that is used by the base api controller
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model = 'groups';
 
-    /**
-     * 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}'
+	];
 
-    /**
-     * 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 \Response::json($this->repo->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
-    }
+		return \Response::json($this->repo->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
+	}
 }

src/Modules/Acl/Proxy/LoginProxy.php

Indentation +63 added lines, -63 removed lines

@@ -5,76 +5,76 @@
 
 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)
-    {
-        \Core::users()->login($credentials, $adminLogin);
+	/**
+	 * Attempt to create an access token using user credentials.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return array
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		\Core::users()->login($credentials, $adminLogin);
 
-        return $this->proxy('password', [
-            'username' => $credentials['email'],
-            'password' => $credentials['password']
-        ]);
-    }
+		return $this->proxy('password', [
+			'username' => $credentials['email'],
+			'password' => $credentials['password']
+		]);
+	}
 
-    /**
-     * 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());
+	}
 }

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();
             }

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');