mirror of
https://github.com/screentinker/screentinker.git
synced 2026-06-14 18:22:46 -06:00
4d81bb112f
A never-visited org had no cached white-label, so brand-prime fell through to the ScreenTinker default baked into the static index.html and flashed it before branding.js fetched the org brand. Now the /app route injects the resolved instance / custom-domain branding into the shell as a <meta name="ssr-brand"> (CSP blocks inline <script>, so a meta carries it), and brand-prime applies that as the fallback when the per-workspace brand is not cached yet - so the page paints the configured brand on first load instead of ScreenTinker. - server.js: /app resolves branding (publicBranding strips internal columns) and injects the HTML-escaped JSON as a meta tag; falls back to plain sendFile on any error so branding can never break the app shell. - brand-prime.js: read meta[name=ssr-brand] when there is no rd_branding_<ws>. Verified: the meta carries the resolved brand (default ScreenTinker and a platform-default white-label), internal columns do not leak, 66 unit tests pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
55 lines
2.4 KiB
JavaScript
55 lines
2.4 KiB
JavaScript
// Render-blocking branding primer (#38). Loaded as a synchronous same-origin
|
|
// <script> right after the sidebar logo, so it runs DURING parse, before first
|
|
// paint — applying the current workspace's CACHED white-label so the page paints
|
|
// branded instead of flashing the "ScreenTinker" default. branding.js then
|
|
// refreshes it from the server and re-writes the cache. Plain script (not a
|
|
// module) so it's not deferred; keyed by workspace so a switch shows the right
|
|
// brand (or the neutral default for a workspace we haven't cached yet).
|
|
(function () {
|
|
try {
|
|
var token = localStorage.getItem('token');
|
|
if (!token) return;
|
|
var ws = 'none';
|
|
try {
|
|
var seg = token.split('.')[1].replace(/-/g, '+').replace(/_/g, '/');
|
|
ws = (JSON.parse(atob(seg)) || {}).current_workspace_id || 'none';
|
|
} catch (e) { /* malformed token -> treat as no workspace */ }
|
|
|
|
var wl = JSON.parse(localStorage.getItem('rd_branding_' + ws) || 'null');
|
|
if (!wl) {
|
|
// #76: no per-workspace cache yet (e.g. a never-visited org). Fall back to
|
|
// the server-injected instance / custom-domain branding so the page paints
|
|
// the configured brand instead of flashing the ScreenTinker default;
|
|
// branding.js then fetches and caches the workspace-specific brand.
|
|
try {
|
|
var ssr = document.querySelector('meta[name="ssr-brand"]');
|
|
if (ssr && ssr.content) wl = JSON.parse(ssr.content);
|
|
} catch (e) { /* ignore */ }
|
|
}
|
|
if (!wl) return;
|
|
|
|
var root = document.documentElement;
|
|
if (wl.primary_color) root.style.setProperty('--accent', wl.primary_color);
|
|
if (wl.bg_color) {
|
|
root.style.setProperty('--bg-primary', wl.bg_color);
|
|
var meta = document.querySelector('meta[name="theme-color"]');
|
|
if (meta) meta.setAttribute('content', wl.bg_color);
|
|
}
|
|
if (wl.brand_name) {
|
|
document.title = wl.brand_name;
|
|
var span = document.getElementById('brandName');
|
|
if (span) span.textContent = wl.brand_name;
|
|
}
|
|
if (wl.favicon_url) {
|
|
var links = document.querySelectorAll('link[rel="icon"], link[rel="apple-touch-icon"]');
|
|
for (var i = 0; i < links.length; i++) links[i].setAttribute('href', wl.favicon_url);
|
|
}
|
|
if (wl.custom_css) {
|
|
var s = document.createElement('style');
|
|
s.id = 'wl-custom-css';
|
|
s.textContent = wl.custom_css;
|
|
document.head.appendChild(s);
|
|
}
|
|
} catch (e) { /* never let branding break boot */ }
|
|
})();
|