diff --git a/backend/main.py b/backend/main.py index eb694a0..a4c6b13 100644 --- a/backend/main.py +++ b/backend/main.py @@ -327,7 +327,7 @@ MEDIA_DIR = os.getenv("MEDIA_DIR", "/data/media") os.makedirs(MEDIA_DIR, exist_ok=True) app.mount("/media", StaticFiles(directory=MEDIA_DIR), name="media") -APP_VER = "737" # muss mit APP_VER in app.js übereinstimmen +APP_VER = "738" # muss mit APP_VER in app.js übereinstimmen @app.get("/api/version") async def app_version(): diff --git a/backend/static/index.html b/backend/static/index.html index cc3c9db..1973c24 100644 --- a/backend/static/index.html +++ b/backend/static/index.html @@ -578,7 +578,7 @@ - + diff --git a/backend/static/js/app.js b/backend/static/js/app.js index 4d15a48..b7a027c 100644 --- a/backend/static/js/app.js +++ b/backend/static/js/app.js @@ -3,7 +3,7 @@ Router, State-Management, Navigation, Initialisierung. ============================================================ */ -const APP_VER = '737'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen +const APP_VER = '738'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen const APP_VERSION = '1.4.0'; // ← semantische Version, wird bei make release gesetzt const IS_STAGING = location.hostname === 'staging.banyaro.app'; @@ -87,10 +87,13 @@ const App = (() => { // ---------------------------------------------------------- function _hasPro(user) { if (!user) return false; + const t = user.subscription_tier || 'standard'; + // _test-Tiers simulieren ihren Tier ohne Admin-Override — so sieht Admin was echte User sehen + if (t.endsWith('_test')) return ['pro_test','breeder_test'].includes(t); + // Normale Prüfung: Admin/Mod/Social bekommen immer Pro if (user.rolle === 'admin' || user.rolle === 'moderator') return true; if (user.is_moderator || user.is_social_media) return true; - const t = user.subscription_tier || 'standard'; - return ['pro','breeder','pro_test','breeder_test'].includes(t); + return ['pro','breeder'].includes(t); } // ---------------------------------------------------------- diff --git a/backend/static/js/worlds.js b/backend/static/js/worlds.js index 9587abf..8232c20 100644 --- a/backend/static/js/worlds.js +++ b/backend/static/js/worlds.js @@ -567,23 +567,29 @@ window.Worlds = (() => { } function _chipAllowed(chip) { const u = _state?.user; - // Pro-Check + const tier = u?.subscription_tier || 'standard'; + const isTest = tier.endsWith('_test'); + + // Pro-Check — _test-Tiers ignorieren Admin-Override if (chip.pro) { if (!u) return false; - const role = u.rolle; - if (role === 'admin' || role === 'moderator') {} // erlaubt - else if (u.is_moderator || u.is_social_media) {} // erlaubt - else { - const t = u.subscription_tier || 'standard'; - if (!['pro','breeder','pro_test','breeder_test'].includes(t)) return false; + if (isTest) { + if (!['pro_test','breeder_test'].includes(tier)) return false; + } else { + if (u.rolle === 'admin' || u.rolle === 'moderator') {} // erlaubt + else if (u.is_moderator || u.is_social_media) {} // erlaubt + else if (!['pro','breeder'].includes(tier)) return false; } } - // bestehende role-Checks + // Role-Checks — admin-Chip immer über echte Rolle, breeder respektiert _test if (!chip?.role) return true; - if (chip.role === 'breeder') return u?.rolle === 'breeder' || u?.rolle === 'admin'; + if (chip.role === 'breeder') { + if (isTest) return tier === 'breeder_test'; + return u?.rolle === 'breeder' || u?.rolle === 'admin'; + } if (chip.role === 'social') return u?.is_social_media || u?.rolle === 'admin'; if (chip.role === 'mod') return u?.rolle === 'admin' || u?.rolle === 'moderator' || u?.is_moderator; - if (chip.role === 'admin') return u?.rolle === 'admin'; + if (chip.role === 'admin') return u?.rolle === 'admin'; // immer echte Rolle return true; } function _chipsForWorld(world) { diff --git a/backend/static/sw.js b/backend/static/sw.js index 0ab1168..3a9be56 100644 --- a/backend/static/sw.js +++ b/backend/static/sw.js @@ -3,7 +3,7 @@ Offline-Cache + Push Notifications + Tile-Cache ============================================================ */ -const CACHE_VERSION = 'by-v737'; +const CACHE_VERSION = 'by-v738'; const CACHE_STATIC = `${CACHE_VERSION}-static`; const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten const CACHE_API = 'ban-yaro-api-v1'; // API-Response-Cache