Use base64 encoding for .env.site-configs

vivid-planet · Jan 9, 2025 · e755b93 · e755b93
1 parent 3b978d6
commit e755b93
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/demo/admin/src/config.tsx b/demo/admin/src/config.tsx
@@ -21,7 +21,7 @@ export function createConfig() {
         ...cometConfig,
         apiUrl: environmentVariables.API_URL,
         adminUrl: environmentVariables.ADMIN_URL,
-        sitesConfig: JSON.parse(environmentVariables.PUBLIC_SITE_CONFIGS) as PublicSiteConfig[],
+        sitesConfig: JSON.parse(atob(environmentVariables.PUBLIC_SITE_CONFIGS)) as PublicSiteConfig[],
         buildDate: environmentVariables.BUILD_DATE,
         buildNumber: environmentVariables.BUILD_NUMBER,
         commitSha: environmentVariables.COMMIT_SHA,

diff --git a/demo/api/src/config/environment-variables.ts b/demo/api/src/config/environment-variables.ts
@@ -146,6 +146,6 @@ export class EnvironmentVariables {
     SITE_PREVIEW_SECRET: string;
 
     @IsArray()
-    @Transform(({ value }) => JSON.parse(value))
+    @Transform(({ value }) => JSON.parse(Buffer.from(value, "base64").toString()))
     PRIVATE_SITE_CONFIGS: PrivateSiteConfig[];
 }
diff --git a/demo/site/src/util/siteConfig.ts b/demo/site/src/util/siteConfig.ts
@@ -28,7 +28,7 @@ export function getSiteConfigs() {
     if (!siteConfigs) {
         const json = process.env.PUBLIC_SITE_CONFIGS;
         if (!json) throw new Error("process.env.PUBLIC_SITE_CONFIGS must be set.");
-        siteConfigs = JSON.parse(json) as PublicSiteConfig[];
+        siteConfigs = JSON.parse(atob(json)) as PublicSiteConfig[];
     }
     return siteConfigs;
 }

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     },
     "license": "BSD-2-Clause",
     "scripts": {
-        "create-site-configs-env": "npx @comet/cli inject-site-configs -f demo/site-configs/site-configs.ts -i demo/.env.site-configs.tpl -o demo/.env.site-configs -d",
+        "create-site-configs-env": "npx @comet/cli inject-site-configs -f demo/site-configs/site-configs.ts -i demo/.env.site-configs.tpl -o demo/.env.site-configs -b",
         "build:storybook": "pnpm recursive --filter '@comet/*admin*' --filter '@comet/eslint-plugin' --filter '@comet/cli' run build && pnpm --filter comet-storybook run build-storybook",
         "build:packages": "pnpm recursive --filter '@comet/*' run build",
         "build:docs": "pnpm recursive --filter '@comet/eslint-plugin' --filter '@comet/admin*' --filter 'comet-docs' run build",