pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-17 21:15:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(setup): show the setup token step in the wizard (#3442)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-10-13 03:22:42 +02:00
1 parent 922ff5ea64
commit 3d4b2933e1
7 files changed
+144 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/instance_bootstrap/src/ClientRuntimeDiscovery.ts
+1
View File
@@ -133,6 +133,7 @@ function projectAppPublic(appPublic: InstanceDiscoveryDocument['appPublic']): In
premium_info_url: value.branding.premium_info_url ?? null,
},
setup: {
...value.setup,
configured: requireDefined(value.setup.configured, 'app_public.setup.configured'),
admin_url: requireDefined(value.setup.admin_url, 'app_public.setup.admin_url'),
},
packages/instance_bootstrap/src/Discovery.ts
+19 -8
View File
@@ -75,6 +75,16 @@ const BRANDING_URL_KEYS = Object.freeze([
'premium_info_url',
] as const) satisfies ReadonlyArray<keyof InstanceBranding>;
const SETUP_FLAG_KEYS = Object.freeze([
'configured',
'account_identity_locked',
'setup_token_required',
] as const) satisfies ReadonlyArray<keyof InstanceSetup>;
const LEGAL_URL_KEYS = Object.freeze(['terms_url', 'privacy_url', 'guidelines_url'] as const) satisfies ReadonlyArray<
keyof InstanceLegal
>;
interface InstanceDiscoveryEndpoints {
readonly api: string;
readonly gateway: string;
@@ -744,9 +754,11 @@ function parseSetup(value: unknown): Readonly<Partial<InstanceSetup>> {
return {};
}
const setup: Partial<InstanceSetup> = {};
const configured = readBoolean(source, 'configured');
if (configured != null) {
setup.configured = configured;
for (const key of SETUP_FLAG_KEYS) {
const flag = readBoolean(source, key);
if (flag != null) {
setup[key] = flag;
}
}
if (Object.hasOwn(source, 'admin_url')) {
setup.admin_url = readAbsoluteHTTPURL(source, 'admin_url');
@@ -760,11 +772,10 @@ function parseLegal(value: unknown): Readonly<Partial<InstanceLegal>> {
return {};
}
const legal: Partial<InstanceLegal> = {};
if (Object.hasOwn(source, 'terms_url')) {
legal.terms_url = readAbsoluteHTTPURL(source, 'terms_url');
}
if (Object.hasOwn(source, 'privacy_url')) {
legal.privacy_url = readAbsoluteHTTPURL(source, 'privacy_url');
for (const key of LEGAL_URL_KEYS) {
if (Object.hasOwn(source, key)) {
legal[key] = readAbsoluteHTTPURL(source, key);
}
}
return legal;
}