Remove api permissions table

Author: DaneEveritt

app/Http/Controllers/Base/APIController.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Models\APIPermission;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Api\KeyCreationService;
 use Pterodactyl\Http\Requests\Base\ApiKeyFormRequest;
@@ -65,12 +64,6 @@ public function index(Request $request)
      */
     public function create(Request $request)
     {
-        return view('base.api.new', [
-            'permissions' => [
-                'user' => collect(APIPermission::CONST_PERMISSIONS)->pull('_user'),
-                'admin' => ! $request->user()->root_admin ? null : collect(APIPermission::CONST_PERMISSIONS)->except('_user')->toArray(),
-            ],
-        ]);
     }
 
     /**

app/Models/APIPermission.php

@@ -13,7 +13,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     protected $policies = [
         'Pterodactyl\Models\Server' => 'Pterodactyl\Policies\ServerPolicy',
-        'Pterodactyl\Models\APIKey' => 'Pterodactyl\Policies\APIKeyPolicy',
     ];
 
     /**

app/Policies/APIKeyPolicy.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Providers;
 
@@ -39,7 +32,6 @@
 use Pterodactyl\Contracts\Repository\TaskRepositoryInterface;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
-use Pterodactyl\Repositories\Eloquent\ApiPermissionRepository;
 use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Repositories\Eloquent\ServerVariableRepository;
@@ -56,7 +48,6 @@
 use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ApiPermissionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\CommandRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface;
@@ -73,7 +64,6 @@ public function register()
         // Eloquent Repositories
         $this->app->bind(AllocationRepositoryInterface::class, AllocationRepository::class);
         $this->app->bind(ApiKeyRepositoryInterface::class, ApiKeyRepository::class);
-        $this->app->bind(ApiPermissionRepositoryInterface::class, ApiPermissionRepository::class);
         $this->app->bind(DaemonKeyRepositoryInterface::class, DaemonKeyRepository::class);
         $this->app->bind(DatabaseRepositoryInterface::class, DatabaseRepository::class);
         $this->app->bind(DatabaseHostRepositoryInterface::class, DatabaseHostRepository::class);
@@ -93,21 +83,11 @@ public function register()
         $this->app->bind(TaskRepositoryInterface::class, TaskRepository::class);
         $this->app->bind(UserRepositoryInterface::class, UserRepository::class);
 
-        $this->app->alias(SettingsRepositoryInterface::class, 'settings');
-
         // Daemon Repositories
-        if ($this->app->make('config')->get('pterodactyl.daemon.use_new_daemon')) {
-            $this->app->bind(ConfigurationRepositoryInterface::class, \Pterodactyl\Repositories\Wings\ConfigurationRepository::class);
-            $this->app->bind(CommandRepositoryInterface::class, \Pterodactyl\Repositories\Wings\CommandRepository::class);
-            $this->app->bind(DaemonServerRepositoryInterface::class, \Pterodactyl\Repositories\Wings\ServerRepository::class);
-            $this->app->bind(FileRepositoryInterface::class, \Pterodactyl\Repositories\Wings\FileRepository::class);
-            $this->app->bind(PowerRepositoryInterface::class, \Pterodactyl\Repositories\Wings\PowerRepository::class);
-        } else {
-            $this->app->bind(ConfigurationRepositoryInterface::class, ConfigurationRepository::class);
-            $this->app->bind(CommandRepositoryInterface::class, CommandRepository::class);
-            $this->app->bind(DaemonServerRepositoryInterface::class, DaemonServerRepository::class);
-            $this->app->bind(FileRepositoryInterface::class, FileRepository::class);
-            $this->app->bind(PowerRepositoryInterface::class, PowerRepository::class);
-        }
+        $this->app->bind(ConfigurationRepositoryInterface::class, ConfigurationRepository::class);
+        $this->app->bind(CommandRepositoryInterface::class, CommandRepository::class);
+        $this->app->bind(DaemonServerRepositoryInterface::class, DaemonServerRepository::class);
+        $this->app->bind(FileRepositoryInterface::class, FileRepository::class);
+        $this->app->bind(PowerRepositoryInterface::class, PowerRepository::class);
     }
 }

app/Providers/AuthServiceProvider.php

@@ -13,6 +13,8 @@ class AddApiKeyPermissionColumns extends Migration
      */
     public function up()
     {
+        Schema::dropIfExists('api_permissions');
+
         Schema::table('api_keys', function (Blueprint $table) {
             $table->unsignedTinyInteger('r_servers')->default(0);
             $table->unsignedTinyInteger('r_nodes')->default(0);
@@ -33,6 +35,14 @@ public function up()
      */
     public function down()
     {
+        Schema::create('api_permissions', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('key_id');
+            $table->string('permission');
+
+            $table->foreign('key_id')->references('id')->on('keys')->onDelete('cascade');
+        });
+
         Schema::table('api_keys', function (Blueprint $table) {
             $table->dropColumn([
                 'r_servers',