branding only works when licensed

server/index.ts

@@ -19,11 +19,16 @@ import { setHostMeta } from "@server/lib/hostMeta";
 import { initTelemetryClient } from "./lib/telemetry.js";
 import { TraefikConfigManager } from "./lib/traefik/TraefikConfigManager.js";
 import { initCleanup } from "#dynamic/cleanup";
+import license from "#dynamic/license/license";
 
 async function startServers() {
     await setHostMeta();
 
     await config.initServer();
+
+    license.setServerSecret(config.getRawConfig().server.secret!);
+    await license.check();
+
     await runSetupFunctions();
 
     initTelemetryClient();

server/lib/config.ts

@@ -3,11 +3,9 @@ import { __DIRNAME, APP_VERSION } from "@server/lib/consts";
 import { db } from "@server/db";
 import { SupporterKey, supporterKey } from "@server/db";
 import { eq } from "drizzle-orm";
-import { license } from "#dynamic/license/license";
 import { configSchema, readConfigFile } from "./readConfigFile";
 import { fromError } from "zod-validation-error";
 import { build } from "@server/build";
-import logger from "@server/logger";
 
 export class Config {
     private rawConfig!: z.infer<typeof configSchema>;
@@ -103,16 +101,10 @@ export class Config {
             throw new Error("Config not loaded. Call load() first.");
         }
 
-        license.setServerSecret(this.rawConfig.server.secret!);
-
         await this.checkKeyStatus();
     }
 
     private async checkKeyStatus() {
-        if (build === "enterprise") {
-            await license.check();
-        }
-
         if (build == "oss") {
             this.checkSupporterKey();
         }

server/private/lib/config.ts

@@ -19,8 +19,6 @@ import {
     privateConfigSchema,
     readPrivateConfigFile
 } from "#private/lib/readConfigFile";
-import { build } from "@server/build";
-import license from "#private/license/license";
 
 export class PrivateConfig {
     private rawPrivateConfig!: z.infer<typeof privateConfigSchema>;
@@ -47,99 +45,81 @@ export class PrivateConfig {
 
         this.rawPrivateConfig = parsedPrivateConfig;
 
-        this.loadEnv();
-    }
-
-    private async loadEnv() {
-        let isValidLicense = false;
-        if (build === "enterprise") {
-            const licenseData = await license.check();
-            if (licenseData.isLicenseValid) {
-                isValidLicense = true;
-            }
-        } else if (build === "saas") {
-            isValidLicense = true;
+        if (this.rawPrivateConfig.branding?.colors) {
+            process.env.BRANDING_COLORS = JSON.stringify(
+                this.rawPrivateConfig.branding?.colors
+            );
         }
 
-        if (isValidLicense) {
-            if (this.rawPrivateConfig.branding?.colors) {
-                process.env.BRANDING_COLORS = JSON.stringify(
-                    this.rawPrivateConfig.branding?.colors
-                );
-            }
+        if (this.rawPrivateConfig.branding?.logo?.light_path) {
+            process.env.BRANDING_LOGO_LIGHT_PATH =
+                this.rawPrivateConfig.branding?.logo?.light_path;
+        }
+        if (this.rawPrivateConfig.branding?.logo?.dark_path) {
+            process.env.BRANDING_LOGO_DARK_PATH =
+                this.rawPrivateConfig.branding?.logo?.dark_path || undefined;
+        }
 
-            if (this.rawPrivateConfig.branding?.logo?.light_path) {
-                process.env.BRANDING_LOGO_LIGHT_PATH =
-                    this.rawPrivateConfig.branding?.logo?.light_path;
-            }
-            if (this.rawPrivateConfig.branding?.logo?.dark_path) {
-                process.env.BRANDING_LOGO_DARK_PATH =
-                    this.rawPrivateConfig.branding?.logo?.dark_path ||
-                    undefined;
-            }
+        process.env.BRANDING_LOGO_AUTH_WIDTH = this.rawPrivateConfig.branding
+            ?.logo?.auth_page?.width
+            ? this.rawPrivateConfig.branding?.logo?.auth_page?.width.toString()
+            : undefined;
+        process.env.BRANDING_LOGO_AUTH_HEIGHT = this.rawPrivateConfig.branding
+            ?.logo?.auth_page?.height
+            ? this.rawPrivateConfig.branding?.logo?.auth_page?.height.toString()
+            : undefined;
 
-            process.env.BRANDING_LOGO_AUTH_WIDTH = this.rawPrivateConfig
-                .branding?.logo?.auth_page?.width
-                ? this.rawPrivateConfig.branding?.logo?.auth_page?.width.toString()
-                : undefined;
-            process.env.BRANDING_LOGO_AUTH_HEIGHT = this.rawPrivateConfig
-                .branding?.logo?.auth_page?.height
-                ? this.rawPrivateConfig.branding?.logo?.auth_page?.height.toString()
-                : undefined;
+        process.env.BRANDING_LOGO_NAVBAR_WIDTH = this.rawPrivateConfig.branding
+            ?.logo?.navbar?.width
+            ? this.rawPrivateConfig.branding?.logo?.navbar?.width.toString()
+            : undefined;
+        process.env.BRANDING_LOGO_NAVBAR_HEIGHT = this.rawPrivateConfig.branding
+            ?.logo?.navbar?.height
+            ? this.rawPrivateConfig.branding?.logo?.navbar?.height.toString()
+            : undefined;
 
-            process.env.BRANDING_LOGO_NAVBAR_WIDTH = this.rawPrivateConfig
-                .branding?.logo?.navbar?.width
-                ? this.rawPrivateConfig.branding?.logo?.navbar?.width.toString()
-                : undefined;
-            process.env.BRANDING_LOGO_NAVBAR_HEIGHT = this.rawPrivateConfig
-                .branding?.logo?.navbar?.height
-                ? this.rawPrivateConfig.branding?.logo?.navbar?.height.toString()
-                : undefined;
+        process.env.BRANDING_FAVICON_PATH =
+            this.rawPrivateConfig.branding?.favicon_path;
 
-            process.env.BRANDING_FAVICON_PATH =
-                this.rawPrivateConfig.branding?.favicon_path;
+        process.env.BRANDING_APP_NAME =
+            this.rawPrivateConfig.branding?.app_name || "Pangolin";
 
-            process.env.BRANDING_APP_NAME =
-                this.rawPrivateConfig.branding?.app_name || "Pangolin";
+        if (this.rawPrivateConfig.branding?.footer) {
+            process.env.BRANDING_FOOTER = JSON.stringify(
+                this.rawPrivateConfig.branding?.footer
+            );
+        }
 
-            if (this.rawPrivateConfig.branding?.footer) {
-                process.env.BRANDING_FOOTER = JSON.stringify(
-                    this.rawPrivateConfig.branding?.footer
-                );
-            }
+        process.env.LOGIN_PAGE_TITLE_TEXT =
+            this.rawPrivateConfig.branding?.login_page?.title_text || "";
+        process.env.LOGIN_PAGE_SUBTITLE_TEXT =
+            this.rawPrivateConfig.branding?.login_page?.subtitle_text || "";
 
-            process.env.LOGIN_PAGE_TITLE_TEXT =
-                this.rawPrivateConfig.branding?.login_page?.title_text || "";
-            process.env.LOGIN_PAGE_SUBTITLE_TEXT =
-                this.rawPrivateConfig.branding?.login_page?.subtitle_text || "";
+        process.env.SIGNUP_PAGE_TITLE_TEXT =
+            this.rawPrivateConfig.branding?.signup_page?.title_text || "";
+        process.env.SIGNUP_PAGE_SUBTITLE_TEXT =
+            this.rawPrivateConfig.branding?.signup_page?.subtitle_text || "";
 
-            process.env.SIGNUP_PAGE_TITLE_TEXT =
-                this.rawPrivateConfig.branding?.signup_page?.title_text || "";
-            process.env.SIGNUP_PAGE_SUBTITLE_TEXT =
-                this.rawPrivateConfig.branding?.signup_page?.subtitle_text ||
-                "";
+        process.env.RESOURCE_AUTH_PAGE_HIDE_POWERED_BY =
+            this.rawPrivateConfig.branding?.resource_auth_page
+                ?.hide_powered_by === true
+                ? "true"
+                : "false";
+        process.env.RESOURCE_AUTH_PAGE_SHOW_LOGO =
+            this.rawPrivateConfig.branding?.resource_auth_page?.show_logo ===
+            true
+                ? "true"
+                : "false";
+        process.env.RESOURCE_AUTH_PAGE_TITLE_TEXT =
+            this.rawPrivateConfig.branding?.resource_auth_page?.title_text ||
+            "";
+        process.env.RESOURCE_AUTH_PAGE_SUBTITLE_TEXT =
+            this.rawPrivateConfig.branding?.resource_auth_page?.subtitle_text ||
+            "";
 
-            process.env.RESOURCE_AUTH_PAGE_HIDE_POWERED_BY =
-                this.rawPrivateConfig.branding?.resource_auth_page
-                    ?.hide_powered_by === true
-                    ? "true"
-                    : "false";
-            process.env.RESOURCE_AUTH_PAGE_SHOW_LOGO =
-                this.rawPrivateConfig.branding?.resource_auth_page
-                    ?.show_logo === true
-                    ? "true"
-                    : "false";
-            process.env.RESOURCE_AUTH_PAGE_TITLE_TEXT =
-                this.rawPrivateConfig.branding?.resource_auth_page
-                    ?.title_text || "";
-            process.env.RESOURCE_AUTH_PAGE_SUBTITLE_TEXT =
-                this.rawPrivateConfig.branding?.resource_auth_page
-                    ?.subtitle_text || "";
-
-            if (this.rawPrivateConfig.branding?.background_image_path) {
-                process.env.BACKGROUND_IMAGE_PATH =
-                    this.rawPrivateConfig.branding?.background_image_path;
-            }
+        if (this.rawPrivateConfig.branding?.background_image_path) {
+            process.env.BACKGROUND_IMAGE_PATH =
+                this.rawPrivateConfig.branding?.background_image_path;
         }
 
         if (this.rawPrivateConfig.server.reo_client_id) {

server/private/lib/readConfigFile.ts

@@ -174,9 +174,9 @@ export function readPrivateConfigFile() {
 
     // test if the config file is there
     if (!fs.existsSync(privateConfigFilePath1)) {
-        console.warn(
-            `Private configuration file not found at ${privateConfigFilePath1}. Using default configuration.`
-        );
+        // console.warn(
+        //     `Private configuration file not found at ${privateConfigFilePath1}. Using default configuration.`
+        // );
         // load the default values of the zod schema and return those
         return privateConfigSchema.parse({});
     }