mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Fix installer database and secret key UI
This commit is contained in:
7 files changed
+9
-9
No files matched your search
@@ -14,7 +14,7 @@ $image = $this->getParam('image', '');
|
||||
$enableAssistant = $this->getParam('enableAssistant', false);
|
||||
$executorImages = $this->getParam('executorImages', '');
|
||||
$dbService = $this->getParam('database', 'mongodb');
|
||||
$allowedDbServices = ['mariadb', 'mongodb'];
|
||||
$allowedDbServices = ['mariadb', 'mongodb', 'postgresql'];
|
||||
if (!\in_array($dbService, $allowedDbServices, true)) {
|
||||
$dbService = 'mongodb';
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ $defaultAppDomain = ($defaultAppDomain === 'traefik') ? 'localhost' : $defaultAp
|
||||
$defaultEmailCertificates = $defaultEmailCertificates ?? '';
|
||||
$defaultDatabase = $vars['_APP_DB_ADAPTER']['default'] ?? 'mongodb';
|
||||
$lockedDatabase = $isUpgrade && empty($lockedDatabase) ? $defaultDatabase : $lockedDatabase;
|
||||
$enabledDatabases = $enabledDatabases ?? ['mongodb', 'mariadb', 'postgresql'];
|
||||
$enabledDatabases = $enabledDatabases ?? ['mongodb', 'mariadb'];
|
||||
$isLocalInstall = $isLocalInstall ?? false;
|
||||
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
const getLockedDatabase = () => getBodyDataset().lockedDatabase || '';
|
||||
const getEnabledDatabases = () => {
|
||||
const raw = getBodyDataset().enabledDatabases;
|
||||
if (!raw) return ['mongodb', 'mariadb', 'postgresql'];
|
||||
try { return JSON.parse(raw); } catch (e) { return ['mongodb', 'mariadb', 'postgresql']; }
|
||||
if (!raw) return ['mongodb', 'mariadb'];
|
||||
try { return JSON.parse(raw); } catch (e) { return ['mongodb', 'mariadb']; }
|
||||
};
|
||||
|
||||
const STEP_IDS = Object.freeze({
|
||||
|
||||
@@ -432,11 +432,11 @@
|
||||
const secretKey = root?.querySelector('#secret-key');
|
||||
const secretValue = secretKey?.value.trim() || '';
|
||||
if (!secretKey || !secretValue) {
|
||||
setFieldError?.(secretKey, 'Please enter or generate a secret API key');
|
||||
setFieldError?.(secretKey, 'Please enter or generate a secret key');
|
||||
return false;
|
||||
}
|
||||
if (secretValue.length > 64) {
|
||||
setFieldError?.(secretKey, 'Secret API key must be 1-64 characters');
|
||||
setFieldError?.(secretKey, 'Secret key must be 1-64 characters');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ $defaultHttpsPort = $defaultHttpsPort ?? '443';
|
||||
$defaultEmailCertificates = $defaultEmailCertificates ?? '';
|
||||
$defaultAssistantOpenAIKey = $defaultAssistantOpenAIKey ?? '';
|
||||
$defaultDatabase = $defaultDatabase ?? 'mongodb';
|
||||
$enabledDatabases = $enabledDatabases ?? ['mongodb', 'mariadb', 'postgresql'];
|
||||
$enabledDatabases = $enabledDatabases ?? ['mongodb', 'mariadb'];
|
||||
$selectedDatabase = $lockedDatabase ?: $defaultDatabase;
|
||||
$isDatabaseLocked = !empty($lockedDatabase);
|
||||
$mongoEnabled = in_array('mongodb', $enabledDatabases, true);
|
||||
|
||||
@@ -27,7 +27,7 @@ $secretKeyValue = htmlspecialchars((string) $defaultSecretKey, ENT_QUOTES, 'UTF-
|
||||
|
||||
<div class="input-row">
|
||||
<div class="input-group stack-xs">
|
||||
<label for="secret-key" class="label-text typography-text-m-500 text-neutral-secondary">Secret API key</label>
|
||||
<label for="secret-key" class="label-text typography-text-m-500 text-neutral-secondary">Secret key</label>
|
||||
<div class="input-action">
|
||||
<input
|
||||
type="text"
|
||||
|
||||
@@ -67,7 +67,7 @@ $badgeClass = $defaultSecretKey !== '' ? 'badge-success' : 'badge-warning';
|
||||
<span class="badge <?php echo $badgeClass; ?> typography-text-xs-400" data-review-badge>
|
||||
<?php echo htmlspecialchars((string) $badgeLabel, ENT_QUOTES, 'UTF-8'); ?>
|
||||
</span>
|
||||
<div class="review-label typography-text-xs-400 text-neutral-tertiary">Secret API key</div>
|
||||
<div class="review-label typography-text-xs-400 text-neutral-tertiary">Secret key</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user