Skip to content

chore: sync nightly → production (2026-01-11) #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 5 commits into
base: production
Choose a base branch
from
Open

chore: sync nightly → production (2026-01-11) #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9772d85
Update env example
CodeMeAPixel Jan 8, 2026
01a491b
Merge pull request #46 from NodeByteHosting/development
github-actions[bot] Jan 9, 2026
3171c9d
feat(add): add client api key support
RizonFTW Jan 8, 2026
8a5fcf6
Merge remote-tracking branch 'origin/development' into development
RizonFTW Jan 9, 2026
96a7999
Merge pull request #47 from NodeByteHosting/development
github-actions[bot] Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,3 @@ AUTH_SECRET="your_auth_secret_here"

# Database
DATABASE_URL="postgresql://user:password@127.0.0.1:65420/nodebyte-site"

# Crowdin (for translations)
CROWDIN_PROJECT_ID=""
CROWDIN_PERSONAL_TOKEN=""

# GitHub (for changelog releases)
GITHUB_TOKEN=""
89 changes: 73 additions & 16 deletions app/admin/settings/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ interface SystemSettings {
// Pterodactyl
pterodactylUrl: string
pterodactylApiKey: string
pterodactylClientApiKey: string
pterodactylApi: string

// Virtfusion
virtfusionUrl: string
virtfusionApiKey: string
Expand Down Expand Up @@ -117,6 +118,7 @@ export default function SettingsPage() {
const [resetting, setResetting] = useState<string | null>(null)
const [testingConnection, setTestingConnection] = useState<string | null>(null)
const [showApiKey, setShowApiKey] = useState(false)
const [showApiKeyclient, setShowApiKeyclient] = useState(false)
const [showResend, setShowResend] = useState(false)
const [showCrowdin, setShowCrowdin] = useState(false)
const [showGithub, setShowGithub] = useState(false)
Expand Down Expand Up @@ -153,6 +155,7 @@ export default function SettingsPage() {
const [settings, setSettings] = useState<SystemSettings>({
pterodactylUrl: "",
pterodactylApiKey: "",
pterodactylClientApiKey: "",
pterodactylApi: "",
virtfusionUrl: "",
virtfusionApiKey: "",
Expand Down Expand Up @@ -189,6 +192,7 @@ export default function SettingsPage() {
// Track which fields are masked (already set)
const masked = new Set<string>()
if (data.settings.pterodactylApiKey === MASKED_VALUE) masked.add("pterodactylApiKey")
if (data.settings.pterodactylClientApiKey === MASKED_VALUE) masked.add("pterodactylClientApiKey")
if (data.settings.virtfusionApiKey === MASKED_VALUE) masked.add("virtfusionApiKey")
if (data.settings.crowdinPersonalToken === MASKED_VALUE) masked.add("crowdinPersonalToken")
if (data.settings.githubToken === MASKED_VALUE) masked.add("githubToken")
Expand Down Expand Up @@ -255,6 +259,7 @@ export default function SettingsPage() {
body: JSON.stringify({
pterodactylUrl: settings.pterodactylUrl,
pterodactylApiKey: settings.pterodactylApiKey,
pterodactylClientApiKey: settings.pterodactylClientApiKey,
virtfusionUrl: settings.virtfusionUrl,
virtfusionApiKey: settings.virtfusionApiKey,
}),
Expand Down Expand Up @@ -776,21 +781,73 @@ export default function SettingsPage() {
</p>
</div>
</div>
<div className="space-y-2">
<Label htmlFor="panel-api">{t("settings.pterodactyl.apiUrl")}</Label>
<Input
id="panel-api"
placeholder="https://panel.example.com/api"
value={settings.pterodactylApi}
onChange={(e) => setSettings({
...settings,
pterodactylApi: e.target.value
})}
/>
<p className="text-xs text-muted-foreground">
{t("settings.pterodactyl.apiUrlNote")}
</p>
</div>
<div className="grid gap-4 sm:grid-cols-2">
<div className="space-y-2">
<Label htmlFor="panel-api">{t("settings.pterodactyl.apiUrl")}</Label>
<Input
id="panel-api"
placeholder="https://panel.example.com/api"
value={settings.pterodactylApi}
onChange={(e) => setSettings({
...settings,
pterodactylApi: e.target.value
})}
/>
<p className="text-xs text-muted-foreground">
{t("settings.pterodactyl.apiUrlNote")}
</p>
</div>
<div className="space-y-2">
<Label htmlFor="panel-client-key">{t("settings.pterodactyl.apiKeyclient")}</Label>
<div className="flex gap-2">
<div className="relative flex-1">
<Input
id="panel-client-key"
type={showApiKeyclient ? "text" : "password"}
placeholder="ptlc_xxxxxxxxxx"
className="pr-10"
value={settings.pterodactylClientApiKey ?? ''}
onChange={(e) => setSettings({
...settings,
pterodactylClientApiKey: e.target.value
})}
disabled={maskedFields.has("pterodactylClientApiKey")}
/>
<div className="absolute right-1 top-1/2 -translate-y-1/2 flex">
<Button
variant="ghost"
size="sm"
className="h-7 w-7 p-0"
onClick={() => setShowApiKeyclient(!showApiKeyclient)}
>
{showApiKeyclient ? (
<EyeOff className="h-3.5 w-3.5" />
) : (
<Eye className="h-3.5 w-3.5" />
)}
</Button>
</div>
</div>
{maskedFields.has("pterodactylClientApiKey") && (
<Button
variant="outline"
size="sm"
onClick={() => resetKey("pterodactylClientApiKey")}
disabled={resetting === "pterodactylClientApiKey"}
>
{resetting === "pterodactylClientApiKey" ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
<Trash2 className="h-4 w-4" />
)}
</Button>
)}
</div>
<p className="text-xs text-muted-foreground">
{t("settings.pterodactyl.apiKeyNoteclient")}
</p>
</div>
</div>
{pterodactylStatus.version && (
<div className="text-sm text-muted-foreground">
{t("settings.pterodactyl.version")}: <span className="font-medium">{pterodactylStatus.version}</span>
Expand Down
6 changes: 6 additions & 0 deletions app/api/admin/settings/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export async function GET() {
settings: {
pterodactylUrl: allSettings.pterodactyl_url || "",
pterodactylApiKey: isSuperAdmin(userRoles) && allSettings.pterodactyl_api_key ? allSettings.pterodactyl_api_key : (allSettings.pterodactyl_api_key ? "••••••••••••••••••••" : ""),
pterodactylClientApiKey: isSuperAdmin(userRoles) && allSettings.pterodactyl_client_api_key ? allSettings.pterodactyl_client_api_key : (allSettings.pterodactyl_client_api_key ? "••••••••••••••••••••" : ""),
pterodactylApi: allSettings.pterodactyl_api || "",
virtfusionUrl: allSettings.virtfusion_url || "",
virtfusionApiKey: isSuperAdmin(userRoles) && allSettings.virtfusion_api_key ? allSettings.virtfusion_api_key : (allSettings.virtfusion_api_key ? "••••••••••••••••••••" : ""),
Expand Down Expand Up @@ -241,6 +242,11 @@ export async function POST(request: Request) {
changedFields.push("Pterodactyl API Key")
}

if (body.pterodactylClientApiKey && body.pterodactylClientApiKey !== MASKED_VALUE) {
await setConfig("pterodactyl_client_api_key", body.pterodactylClientApiKey)
changedFields.push("Pterodactyl Client API Key")
}

if (body.virtfusionUrl) {
await setConfig("virtfusion_url", body.virtfusionUrl)
changedFields.push("Virtfusion URL")
Expand Down
4 changes: 4 additions & 0 deletions packages/core/lib/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Configuration Keys - Panel Settings:
* - pterodactyl_url: Pterodactyl panel URL
* - pterodactyl_api_key: Pterodactyl admin API key
* - pterodactyl_client_api_key: Pterodactyl client API key
* - pterodactyl_api: Pterodactyl API endpoint path (default: /api/application)
* - virtfusion_url: Virtfusion panel URL
* - virtfusion_api_key: Virtfusion API key
Expand Down Expand Up @@ -51,6 +52,7 @@ import { prisma } from "./prisma"
export interface PterodactylSettings {
url: string | null
apiKey: string | null
clientapiKey: string | null
api: string | null
}

Expand Down Expand Up @@ -175,6 +177,7 @@ export async function getPanelSettings(): Promise<PanelSettings> {
const config = await getConfigs(
"pterodactyl_url",
"pterodactyl_api_key",
"pterodactyl_client_api_key",
"pterodactyl_api",
"virtfusion_url",
"virtfusion_api_key",
Expand All @@ -185,6 +188,7 @@ export async function getPanelSettings(): Promise<PanelSettings> {
pterodactyl: {
url: config.pterodactyl_url,
apiKey: config.pterodactyl_api_key,
clientapiKey: config.pterodactyl_client_api_key,
api: config.pterodactyl_api,
},
virtfusion: {
Expand Down
1 change: 1 addition & 0 deletions packages/core/lib/system-settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export interface SystemState {
export interface PterodactylSettings {
url: string | null
apiKey: string | null
clientapiKey: string | null
api: string | null
}

Expand Down