Skip to content

Commit 703f552

Browse files
committed
Remove all references to daemon keys from the codebase
1 parent 4dddcae commit 703f552

File tree

13 files changed

+43
-529
lines changed

13 files changed

+43
-529
lines changed

app/Contracts/Repository/DaemonKeyRepositoryInterface.php

Lines changed: 0 additions & 52 deletions
This file was deleted.

app/Models/DaemonKey.php

Lines changed: 0 additions & 78 deletions
This file was deleted.

app/Models/Server.php

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
* @property \Pterodactyl\Models\Schedule[]|\Illuminate\Database\Eloquent\Collection $schedule
4848
* @property \Pterodactyl\Models\Database[]|\Illuminate\Database\Eloquent\Collection $databases
4949
* @property \Pterodactyl\Models\Location $location
50-
* @property \Pterodactyl\Models\DaemonKey $key
51-
* @property \Pterodactyl\Models\DaemonKey[]|\Illuminate\Database\Eloquent\Collection $keys
5250
* @property \Pterodactyl\Models\ServerTransfer $transfer
5351
* @property \Pterodactyl\Models\Backup[]|\Illuminate\Database\Eloquent\Collection $backups
5452
* @property \Pterodactyl\Models\Mount[]|\Illuminate\Database\Eloquent\Collection $mounts
@@ -294,26 +292,6 @@ public function location()
294292
return $this->belongsToThrough(Location::class, Node::class);
295293
}
296294

297-
/**
298-
* Return the key belonging to the server owner.
299-
*
300-
* @return \Illuminate\Database\Eloquent\Relations\HasOne
301-
*/
302-
public function key()
303-
{
304-
return $this->hasOne(DaemonKey::class, 'user_id', 'owner_id');
305-
}
306-
307-
/**
308-
* Returns all of the daemon keys belonging to this server.
309-
*
310-
* @return \Illuminate\Database\Eloquent\Relations\HasMany
311-
*/
312-
public function keys()
313-
{
314-
return $this->hasMany(DaemonKey::class);
315-
}
316-
317295
/**
318296
* Returns the associated server transfer.
319297
*

app/Models/Subuser.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,4 @@ public function permissions()
9999
{
100100
return $this->hasMany(Permission::class);
101101
}
102-
103-
/**
104-
* Return the key that belongs to this subuser for the server.
105-
*
106-
* @return \Illuminate\Database\Eloquent\Relations\HasOne
107-
*/
108-
public function key()
109-
{
110-
return $this->hasOne(DaemonKey::class, 'server_id', 'server_id')->where('daemon_keys.user_id', '=', $this->user_id);
111-
}
112102
}

app/Models/User.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
* @property string $name
3939
* @property \Pterodactyl\Models\ApiKey[]|\Illuminate\Database\Eloquent\Collection $apiKeys
4040
* @property \Pterodactyl\Models\Server[]|\Illuminate\Database\Eloquent\Collection $servers
41-
* @property \Pterodactyl\Models\DaemonKey[]|\Illuminate\Database\Eloquent\Collection $keys
4241
* @property \Pterodactyl\Models\RecoveryToken[]|\Illuminate\Database\Eloquent\Collection $recoveryTokens
4342
*/
4443
class User extends Model implements
@@ -214,16 +213,6 @@ public function servers()
214213
return $this->hasMany(Server::class, 'owner_id');
215214
}
216215

217-
/**
218-
* Return all of the daemon keys that a user belongs to.
219-
*
220-
* @return \Illuminate\Database\Eloquent\Relations\HasMany
221-
*/
222-
public function keys()
223-
{
224-
return $this->hasMany(DaemonKey::class);
225-
}
226-
227216
/**
228217
* @return \Illuminate\Database\Eloquent\Relations\HasMany
229218
*/

app/Providers/RepositoryServiceProvider.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Pterodactyl\Repositories\Eloquent\LocationRepository;
1717
use Pterodactyl\Repositories\Eloquent\ScheduleRepository;
1818
use Pterodactyl\Repositories\Eloquent\SettingsRepository;
19-
use Pterodactyl\Repositories\Eloquent\DaemonKeyRepository;
2019
use Pterodactyl\Repositories\Eloquent\AllocationRepository;
2120
use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
2221
use Pterodactyl\Repositories\Eloquent\EggVariableRepository;
@@ -34,7 +33,6 @@
3433
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
3534
use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
3635
use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
37-
use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
3836
use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
3937
use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
4038
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
@@ -50,7 +48,6 @@ public function register()
5048
// Eloquent Repositories
5149
$this->app->bind(AllocationRepositoryInterface::class, AllocationRepository::class);
5250
$this->app->bind(ApiKeyRepositoryInterface::class, ApiKeyRepository::class);
53-
$this->app->bind(DaemonKeyRepositoryInterface::class, DaemonKeyRepository::class);
5451
$this->app->bind(DatabaseRepositoryInterface::class, DatabaseRepository::class);
5552
$this->app->bind(DatabaseHostRepositoryInterface::class, DatabaseHostRepository::class);
5653
$this->app->bind(EggRepositoryInterface::class, EggRepository::class);

app/Repositories/Eloquent/DaemonKeyRepository.php

Lines changed: 0 additions & 87 deletions
This file was deleted.

app/Transformers/Daemon/ApiKeyTransformer.php

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)