Joseph.Rawlings/Virtnet.bond
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Enhance ManualServers functionality: add user-provided information display and credential handling; improve TagsInput validation; update navigation properties

Browse Source
This commit is contained in:
Joseph.Rawlings
2026-03-13 05:58:51 -04:00
parent 0f36dba867
commit a8b6e5cfba
8 changed files with 951 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
extensions/Servers/ManualServers/ManualServers.php
View File

@@ -162,6 +162,70 @@ class ManualServers extends Server
return $config;
}
/**
* Get configuration options for checkout (user-provided data during purchase)
*
* @param Product $product
* @return array
*/
public function getCheckoutConfig($product = null): array
{
if (!$product) {
return [];
}
// Create a temporary service object to use getCredentialFieldsForService
$tempService = new Service(['product_id' => $product->id]);
$tempService->setRelation('product', $product);
$fields = $this->getCredentialFieldsForService($tempService);
// Convert to checkout config format
$checkoutFields = [];
foreach ($fields as $field) {
$checkoutFields[] = [
'name' => $field['name'],
'type' => $field['type'],
'label' => $field['label'],
'required' => true,
'placeholder' => 'Enter ' . strtolower($field['label']),
];
}
return $checkoutFields;
}
/**
* Get configuration options for admin when managing a service
* This allows admins to enter credentials and other service-specific data
*
* @param Service $service
* @return array
*/
public function getUserConfig(Service $service): array
{
$fields = $this->getCredentialFieldsForService($service);
// Get existing credentials
$credentialsJson = $service->properties->where('key', 'credentials_data')->first()?->value ?? '[]';
$existingCredentials = json_decode($credentialsJson, true) ?? [];
// Format fields for the admin interface
$configFields = [];
foreach ($fields as $field) {
$configFields[] = [
'name' => $field['name'],
'type' => $field['type'],
'label' => $field['label'],
'required' => false,
'default' => $existingCredentials[$field['name']] ?? '',
];
}
return $configFields;
}
public function createServer(Service $service, $params = []): bool
{
$processes = $this->getProcessesForService($service);
@@ -181,9 +245,20 @@ class ManualServers extends Server
['key' => 'processes_data'],
['value' => json_encode($processData)]
);
// Extract credential values from params (checkout form data)
$credentialFields = $this->getCredentialFieldsForService($service);
$credentials = [];
foreach ($credentialFields as $field) {
$fieldName = $field['name'];
if (isset($params[$fieldName])) {
$credentials[$fieldName] = $params[$fieldName];
}
}
$service->properties()->updateOrCreate(
['key' => 'credentials_data'],
['value' => json_encode([])]
['value' => json_encode($credentials)]
);
$service->properties()->updateOrCreate(
['key' => 'deployed_at'],
@@ -370,13 +445,30 @@ class ManualServers extends Server
$credentialsJson = $service->properties->where('key', 'credentials_data')->first()?->value ?? '[]';
$deployedAt = $service->properties->where('key', 'deployed_at')->first()?->value;
$feedback = $service->properties->where('key', 'feedback')->first()?->value ?? '';
// Read credentials from individual properties
$credentialFields = $this->getCredentialFieldsForService($service);
$credentials = [];
foreach ($credentialFields as $field) {
$fieldName = $field['name'];
$value = $service->properties->where('key', $fieldName)->first()?->value;
if ($value !== null) {
$credentials[$fieldName] = $value;
}
}
// Fallback to credentials_data JSON if individual properties are empty
if (empty($credentials)) {
$credentials = json_decode($credentialsJson, true) ?? [];
}
return [
'status' => $status,
'processes' => json_decode($processesJson, true) ?? [],
'credentials' => json_decode($credentialsJson, true) ?? [],
'credentials' => $credentials,
'deployed_at' => $deployedAt,
'feedback' => $feedback,
'credential_fields' => $this->getCredentialFieldsForService($service),
'credential_fields' => $credentialFields,
'buttons' => $this->getButtonsForService($service),
'instructions' => $service->product->settings->where('key', 'instructions')->first()?->value ?? '',
];