Merge pull request #919 from intuitem/CA-467-add-flag-to-hide-logo-on…

…-login-page-for-enterprise-version Ca 467 add flag to hide logo on login page for enterprise version
intuitem · Oct 14, 2024 · d8e6ad4 · d8e6ad4
2 parents de131f8 + aded679
commit d8e6ad4
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 7 deletions.
diff --git a/...nd/enterprise_core/migrations/0002_clientsettings_show_images_unauthenticated_and_more.py b/...nd/enterprise_core/migrations/0002_clientsettings_show_images_unauthenticated_and_more.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.1.1 on 2024-10-10 11:59
+
+import django.db.models.deletion
+import iam.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise_core', '0001_initial'),
+        ('iam', '0008_user_is_third_party'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='clientsettings',
+            name='show_images_unauthenticated',
+            field=models.BooleanField(default=True, help_text='Show logo and favicon to unauthenticated users'),
+        ),
+        migrations.AlterField(
+            model_name='clientsettings',
+            name='folder',
+            field=models.ForeignKey(default=iam.models.Folder.get_root_folder_id, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_folder', to='iam.folder'),
+        ),
+    ]
diff --git a/enterprise/backend/enterprise_core/models.py b/enterprise/backend/enterprise_core/models.py
@@ -1,13 +1,15 @@
-from enum import Enum
+import base64
 import os
+from enum import Enum
+
+import magic
 from django.core.validators import FileExtensionValidator
 from django.db import models
-from iam.models import FolderMixin
+from django.utils.translation import gettext_lazy as _
+
 from core.base_models import AbstractBaseModel
 from core.utils import sha256
-
-import base64
-import magic
+from iam.models import FolderMixin
 
 
 class ClientSettings(AbstractBaseModel, FolderMixin):
@@ -28,6 +30,9 @@ class FileField(Enum):
         blank=True,
         validators=[FileExtensionValidator(["ico", "png", "jpeg", "jpg", "webp"])],
     )
+    show_images_unauthenticated = models.BooleanField(
+        default=True, help_text=_("Show logo and favicon to unauthenticated users")
+    )
 
     @property
     def logo_base64(self):

diff --git a/enterprise/frontend/src/lib/utils/client-settings.ts b/enterprise/frontend/src/lib/utils/client-settings.ts
@@ -2,7 +2,8 @@ import { z } from 'zod';
 
 export const ClientSettingsSchema = z.object({
 	id: z.string().uuid(),
-	name: z.string().optional().nullable(),
+	name: z.string().optional().nullable().default(''),
 	logo: z.any().optional().nullable(),
-	favicon: z.any().optional().nullable()
+	favicon: z.any().optional().nullable(),
+  show_images_unauthenticated: z.boolean().default(true),
 });
diff --git a/enterprise/frontend/src/routes/(app)/(internal)/settings/client-settings/+page.svelte b/enterprise/frontend/src/routes/(app)/(internal)/settings/client-settings/+page.svelte
@@ -6,6 +6,7 @@
 	import { ClientSettingsSchema } from '$lib/utils/client-settings';
 	import { zod } from 'sveltekit-superforms/adapters';
 	import FileInput from '$lib/components/Forms/FileInput.svelte';
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
 	import * as m from '$paraglide/messages.js';
 
 	export let data: PageData;
@@ -41,6 +42,12 @@
 				: m.faviconHelpText()}
 			accept="image/*"
 		/>
+		<Checkbox
+			{form}
+			field="show_images_unauthenticated"
+			label={m.showImagesUnauthenticated()}
+			helpText={m.showImagesUnauthenticatedHelpText()}
+		/>
 		<button
 			class="btn variant-filled-primary font-semibold w-full"
 			data-testid="save-button"

diff --git a/enterprise/frontend/src/routes/+layout.server.ts b/enterprise/frontend/src/routes/+layout.server.ts
@@ -7,5 +7,11 @@ export const load: LayoutServerLoad = async ({ fetch, locals }) => {
 		const _settings = await fetch('/settings/client-settings').then((res) => res.json());
 		clientSettings = { name: 'clientSettings', settings: _settings };
 	} else clientSettings = locals.globalSettings;
+  if (!locals.user && clientSettings.settings.show_images_unauthenticated !== true) {
+    clientSettings.settings.logo = '';
+    clientSettings.settings.favicon = '';
+    clientSettings.settings.logo_hash = '';
+    clientSettings.settings.favicon_hash = '';
+  }
 	return { featureFlags: locals.featureFlags, clientSettings };
 };
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
@@ -771,6 +771,8 @@
 	"noMailerConfigured": "No mailer configured",
 	"errorLicenseSeatsExceeded": "The number of license seats is exceeded, you will not be able to grant editing rights to this user. Please contact your administrator.",
 	"availableSeats": "Available seats",
+	"showImagesUnauthenticated": "Show logo and favicon to unauthenticated users",
+	"showImagesUnauthenticatedHelpText": "If disabled, the regular CISO Assistant logo and favicon will be displayed on the login screen",
 	"librariesCanOnlyBeLoadedByAdmin": "Libraries can only be loaded by an administrator",
 	"catalog": "Catalog",
 	"actions": "Actions",