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

chore(marketing): remove the private marketing submodule (#2732)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-09-13 16:37:55 +02:00
1 parent 38b7c63431
commit 580401d2dc
71 files changed
+7 -96223
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/config/src/ConfigLoader.ts
-9
View File
@@ -149,12 +149,6 @@ function defaultConfig(): MasterConfig {
secret_key_base: '',
oauth_client_secret: '',
},
marketing: {
port: 3010,
host: '0.0.0.0',
base_path: '/marketing',
secret_key_base: '',
},
app_proxy: {
port: 8773,
assets_dir: 'fluxer_app/dist',
@@ -486,9 +480,6 @@ function normalizeConfig(config: MasterConfig): MasterConfig {
validateUploadRelaySecret(config.services.media_proxy.upload_relay.secret_base64, config.services.media_proxy.mode);
requireString(config.services.admin.secret_key_base, 'FLUXER_ADMIN_SECRET_KEY_BASE');
requireString(config.services.admin.oauth_client_secret, 'FLUXER_ADMIN_OAUTH_CLIENT_SECRET');
if (!config.instance.self_hosted) {
requireString(config.services.marketing.secret_key_base, 'FLUXER_MARKETING_SECRET_KEY_BASE');
}
requireString(config.services.gateway.rpc_auth_token, 'FLUXER_GATEWAY_RPC_AUTH_TOKEN');
return config;
}
packages/config/src/MasterConfig.ts
-6
View File
@@ -155,12 +155,6 @@ export interface MasterConfig {
secret_key_base: string;
oauth_client_secret: string;
};
marketing: {
port: number;
host: string;
base_path: string;
secret_key_base: string;
};
app_proxy: {
port: number;
assets_dir: string;
packages/config/src/__tests__/ConfigLoader.test.ts
-18
View File
@@ -22,7 +22,6 @@ const MINIMAL_ENV: Record<string, string> = {
FLUXER_MEDIA_PROXY_UPLOAD_RELAY_SECRET_BASE64: 'AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=',
FLUXER_ADMIN_SECRET_KEY_BASE: 'test-admin-secret',
FLUXER_ADMIN_OAUTH_CLIENT_SECRET: 'test-admin-oauth-secret',
FLUXER_MARKETING_SECRET_KEY_BASE: 'test-marketing-secret',
FLUXER_APP_PROXY_PORT: '8773',
FLUXER_GATEWAY_MEDIA_PROXY_ENDPOINT: 'http://127.0.0.1:8088/media',
FLUXER_GATEWAY_RPC_AUTH_TOKEN: 'test-gateway-token',
@@ -406,23 +405,6 @@ describe('ConfigLoader', () => {
expect(config.database.postgres.ssl).toBe(false);
});
test('does not require a marketing secret for self-hosted instances', async () => {
stubMinimalEnv({FLUXER_SELF_HOSTED: 'true'});
vi.stubEnv('FLUXER_MARKETING_SECRET_KEY_BASE', undefined);
const config = await loadConfig();
expect(config.instance.self_hosted).toBe(true);
expect(config.services.marketing.secret_key_base).toBe('');
});
test('requires a marketing secret for hosted instances', async () => {
stubMinimalEnv();
vi.stubEnv('FLUXER_MARKETING_SECRET_KEY_BASE', undefined);
await expect(loadConfig()).rejects.toThrow('FLUXER_MARKETING_SECRET_KEY_BASE');
});
test('still requires TLS for non-self-hosted production Postgres', async () => {
stubMinimalEnv({
FLUXER_ENV: 'production',
packages/config/src/config_loader/EnvironmentOverrides.ts
-4
View File
@@ -166,10 +166,6 @@ const NAMED_FLUXER_ENV_OVERRIDES: Record<string, NamedEnvOverride> = {
FLUXER_ADMIN_BASE_PATH: {path: ['services', 'admin', 'base_path']},
FLUXER_ADMIN_SECRET_KEY_BASE: {path: ['services', 'admin', 'secret_key_base']},
FLUXER_ADMIN_OAUTH_CLIENT_SECRET: {path: ['services', 'admin', 'oauth_client_secret']},
FLUXER_MARKETING_HOST: {path: ['services', 'marketing', 'host']},
FLUXER_MARKETING_PORT: {path: ['services', 'marketing', 'port'], parse: parseInteger},
FLUXER_MARKETING_BASE_PATH: {path: ['services', 'marketing', 'base_path']},
FLUXER_MARKETING_SECRET_KEY_BASE: {path: ['services', 'marketing', 'secret_key_base']},
FLUXER_APP_PROXY_PORT: {path: ['services', 'app_proxy', 'port'], parse: parseInteger},
FLUXER_STATIC_DIR: {path: ['services', 'app_proxy', 'assets_dir']},
FLUXER_GATEWAY_PORT: {path: ['services', 'gateway', 'port'], parse: parseInteger},