mirror of
https://github.com/coollabsio/coolify.git
synced 2026-11-06 13:10:37 -04:00
Merge remote-tracking branch 'origin/main' into next
This commit is contained in:
@@ -258,19 +258,7 @@ class DatabasesController extends Controller
|
||||
$this->hideNestedServerSecrets($database, $loadNestedServerSecrets);
|
||||
}
|
||||
|
||||
$payload = serializeApiResponse($database);
|
||||
|
||||
// A locked password variable is never shown again, also not inside the connection URLs.
|
||||
if (request()->attributes->get('can_read_sensitive', false) === true
|
||||
&& method_exists($database, 'isCredentialLocked') && $database->isCredentialLocked()) {
|
||||
foreach (['internal_db_url', 'external_db_url'] as $key) {
|
||||
if ($payload->has($key)) {
|
||||
$payload->put($key, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $payload;
|
||||
return redactLockedApiResourceValues($database, serializeApiResponse($database));
|
||||
}
|
||||
|
||||
private function hideNestedServerSecrets(Model $model, bool $loadRelations = false): void
|
||||
|
||||
Reference in New Issue
Block a user