Fix: _test-Tiers ignorieren Admin-Override — standard_test sieht kein Züchter/Pro, Admin-Panel bleibt (SW by-v738)
This commit is contained in:
parent
a6c25cf0f0
commit
3a28673015
5 changed files with 25 additions and 16 deletions
|
|
@ -327,7 +327,7 @@ MEDIA_DIR = os.getenv("MEDIA_DIR", "/data/media")
|
||||||
os.makedirs(MEDIA_DIR, exist_ok=True)
|
os.makedirs(MEDIA_DIR, exist_ok=True)
|
||||||
app.mount("/media", StaticFiles(directory=MEDIA_DIR), name="media")
|
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")
|
@app.get("/api/version")
|
||||||
async def app_version():
|
async def app_version():
|
||||||
|
|
|
||||||
|
|
@ -578,7 +578,7 @@
|
||||||
<script src="/js/api.js?v=94"></script>
|
<script src="/js/api.js?v=94"></script>
|
||||||
<script src="/js/ui.js?v=94"></script>
|
<script src="/js/ui.js?v=94"></script>
|
||||||
<script src="/js/app.js?v=94"></script>
|
<script src="/js/app.js?v=94"></script>
|
||||||
<script src="/js/worlds.js?v=737"></script>
|
<script src="/js/worlds.js?v=738"></script>
|
||||||
|
|
||||||
<!-- Feature-Seiten werden lazy geladen -->
|
<!-- Feature-Seiten werden lazy geladen -->
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Router, State-Management, Navigation, Initialisierung.
|
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 APP_VERSION = '1.4.0'; // ← semantische Version, wird bei make release gesetzt
|
||||||
const IS_STAGING = location.hostname === 'staging.banyaro.app';
|
const IS_STAGING = location.hostname === 'staging.banyaro.app';
|
||||||
|
|
||||||
|
|
@ -87,10 +87,13 @@ const App = (() => {
|
||||||
// ----------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
function _hasPro(user) {
|
function _hasPro(user) {
|
||||||
if (!user) return false;
|
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.rolle === 'admin' || user.rolle === 'moderator') return true;
|
||||||
if (user.is_moderator || user.is_social_media) return true;
|
if (user.is_moderator || user.is_social_media) return true;
|
||||||
const t = user.subscription_tier || 'standard';
|
return ['pro','breeder'].includes(t);
|
||||||
return ['pro','breeder','pro_test','breeder_test'].includes(t);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -567,23 +567,29 @@ window.Worlds = (() => {
|
||||||
}
|
}
|
||||||
function _chipAllowed(chip) {
|
function _chipAllowed(chip) {
|
||||||
const u = _state?.user;
|
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 (chip.pro) {
|
||||||
if (!u) return false;
|
if (!u) return false;
|
||||||
const role = u.rolle;
|
if (isTest) {
|
||||||
if (role === 'admin' || role === 'moderator') {} // erlaubt
|
if (!['pro_test','breeder_test'].includes(tier)) return false;
|
||||||
else if (u.is_moderator || u.is_social_media) {} // erlaubt
|
} else {
|
||||||
else {
|
if (u.rolle === 'admin' || u.rolle === 'moderator') {} // erlaubt
|
||||||
const t = u.subscription_tier || 'standard';
|
else if (u.is_moderator || u.is_social_media) {} // erlaubt
|
||||||
if (!['pro','breeder','pro_test','breeder_test'].includes(t)) return false;
|
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) 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 === '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 === '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;
|
return true;
|
||||||
}
|
}
|
||||||
function _chipsForWorld(world) {
|
function _chipsForWorld(world) {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Offline-Cache + Push Notifications + Tile-Cache
|
Offline-Cache + Push Notifications + Tile-Cache
|
||||||
============================================================ */
|
============================================================ */
|
||||||
|
|
||||||
const CACHE_VERSION = 'by-v737';
|
const CACHE_VERSION = 'by-v738';
|
||||||
const CACHE_STATIC = `${CACHE_VERSION}-static`;
|
const CACHE_STATIC = `${CACHE_VERSION}-static`;
|
||||||
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten
|
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten
|
||||||
const CACHE_API = 'ban-yaro-api-v1'; // API-Response-Cache
|
const CACHE_API = 'ban-yaro-api-v1'; // API-Response-Cache
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue