SherifElfadaly / Laravel-Api-Skeleton

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

Indentation +108 added lines, -108 removed lines

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

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

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class AssignRelationsSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id;
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id;
 
-        /**
-         * Assign the permissions to the admin group.
-         */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['users', 'permissions', 'groups', 'oauthClients'])->each(function ($permission) use ($adminGroupId) {
-            \DB::table('groups_permissions')->insert(
-                [
-                'permission_id' => $permission->id,
-                'group_id'      => $adminGroupId,
-                'created_at'    => \DB::raw('NOW()'),
-                'updated_at'    => \DB::raw('NOW()')
-                ]
-            );
-        });
-    }
+		/**
+		 * Assign the permissions to the admin group.
+		 */
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['users', 'permissions', 'groups', 'oauthClients'])->each(function ($permission) use ($adminGroupId) {
+			\DB::table('groups_permissions')->insert(
+				[
+				'permission_id' => $permission->id,
+				'group_id'      => $adminGroupId,
+				'created_at'    => \DB::raw('NOW()'),
+				'updated_at'    => \DB::raw('NOW()')
+				]
+			);
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         /**
          * Assign the permissions to the admin group.
          */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['users', 'permissions', 'groups', 'oauthClients'])->each(function ($permission) use ($adminGroupId) {
+        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['users', 'permissions', 'groups', 'oauthClients'])->each(function($permission) use ($adminGroupId) {
             \DB::table('groups_permissions')->insert(
                 [
                 'permission_id' => $permission->id,

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

Indentation +60 added lines, -60 removed lines

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

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/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)
+	{
+		//
+	}
 }