From b754c0cab6b95d410f91a80b3a5bc43dddeda146 Mon Sep 17 00:00:00 2001 From: jessikitty Date: Mon, 18 May 2026 11:54:56 +1000 Subject: [PATCH] =?UTF-8?q?Hardcode=20HA=20token=20in=20CONFIG=20block=20?= =?UTF-8?q?=E2=80=94=20set=20once,=20works=20on=20all=20devices?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaced parent-frame auto-detect (blocked by HA iframe sandboxing) with a CONFIG_HA_TOKEN constant at the top of the script. Set it once in the file, works on every device automatically. Falls back to localStorage/manual entry if CONFIG is empty. --- www/parental_controls.html | 43 ++++++++++++++------------------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/www/parental_controls.html b/www/parental_controls.html index 8275a6a..c8e7189 100644 --- a/www/parental_controls.html +++ b/www/parental_controls.html @@ -126,7 +126,7 @@ input[type=time]::-webkit-calendar-picker-indicator{filter:invert(.5)}

⚙ Settings

- +
Config not saving? Go to HA → Developer Tools → Actions → call input_text.reload, then hard-refresh this page.
@@ -146,21 +146,20 @@ let ws,wsId=1,pending={},retryTimer; let states={},cfg={users:[]},prefs={url:'',token:''}; let devTargetUser=null,schedOpen={},renderTimer=null,lastSaveTime=0; -let autoAuth=false; // true when auth was auto-detected from HA parent frame -function getHAAuthFromParent(){ - // When loaded as panel_iframe inside HA, grab the session token from the parent frame - try{ - const ha=window.parent.document.querySelector('home-assistant'); - if(ha&&ha.hass&&ha.hass.auth&&ha.hass.auth.data&&ha.hass.auth.data.access_token){ - return{url:window.location.origin,token:ha.hass.auth.data.access_token}; - } - }catch(e){/* cross-origin or not in HA iframe */} - return null; -} +// ===================================================================== +// CONFIGURATION — Set these once, works on every device automatically +// Generate a Long-Lived Access Token in HA: Profile → Security → Long-Lived Access Tokens +// ===================================================================== +const CONFIG_HA_URL = ''; // e.g. 'https://ha.hideawaygaming.com.au' — leave blank to auto-detect from page URL +const CONFIG_HA_TOKEN = ''; // Paste your Long-Lived Access Token here +// ===================================================================== + function loadPrefs(){ - // 1. Try auto-detect from HA parent frame (works on any device if logged into HA) - const ha=getHAAuthFromParent(); - if(ha){prefs=ha;autoAuth=true;return true;} + // 1. Use hardcoded config if token is set (works on all devices, no setup needed) + if(CONFIG_HA_TOKEN){ + prefs={url:CONFIG_HA_URL||window.location.origin,token:CONFIG_HA_TOKEN}; + return true; + } // 2. Fallback to localStorage (legacy / standalone use) try{const p=localStorage.getItem('pc2_prefs');if(p){prefs=JSON.parse(p);return true;}}catch(e){} return false; @@ -184,9 +183,6 @@ function saveSettings(){ } function connect(){ setHA('conn');clearTimeout(retryTimer); - // Refresh token from parent frame on each connect (session tokens rotate) - const ha=getHAAuthFromParent(); - if(ha){prefs.url=ha.url;prefs.token=ha.token;autoAuth=true;} const wsUrl=prefs.url.replace(/^https?/,m=>m==='https'?'wss':'ws')+'/api/websocket'; try{ ws=new WebSocket(wsUrl); @@ -199,13 +195,7 @@ function dispatch(msg){ switch(msg.type){ case 'auth_required': ws.send(JSON.stringify({type:'auth',access_token:prefs.token})); break; case 'auth_ok': onAuth(); break; - case 'auth_invalid': { - // If auto-auth failed, try refreshing token from parent once - const fresh=getHAAuthFromParent(); - if(fresh&&fresh.token!==prefs.token){prefs.token=fresh.token;ws.close();connect();} - else{setHA('err');toast('HA auth failed — check token','e');} - break; - } + case 'auth_invalid': setHA('err'); toast('HA auth failed — check token in parental_controls.html','e'); break; case 'result': if(pending[msg.id]){const{res,rej}=pending[msg.id];delete pending[msg.id];msg.success?res(msg):rej(new Error(msg.error?.message||'HA error'));} break; @@ -235,7 +225,6 @@ async function onAuth(){ } function onStateChange({entity_id,new_state}){ states[entity_id]=new_state; - // Only re-parse config if the change didn't come from our own save (5s grace period) if(entity_id===chunkId(0)){if(Date.now()-lastSaveTime>5000)parseCfg();schedRender();return;} if(entity_id===DHCP){updateDHCP();schedRender();return;} if(entity_id.startsWith('device_tracker.')){schedRender();} @@ -424,7 +413,7 @@ function renderDev(userId,dev){ function toggleSched(userId){schedOpen[userId]=!schedOpen[userId];render();} function buildColorPicker(presel){document.getElementById('col-picker').innerHTML=COLORS.map(c=>``).join('');} function pickColor(el){document.querySelectorAll('.copt').forEach(o=>o.classList.remove('sel'));el.classList.add('sel');} -function openModal(id){if(id==='add-user-modal')openAddUserModal();else{if(id==='settings-modal'){document.getElementById('set-url').value=prefs.url;document.getElementById('set-tok').value=prefs.token;document.getElementById('auto-auth-info').style.display=autoAuth?'block':'none';}document.getElementById(id).classList.add('open');}} +function openModal(id){if(id==='add-user-modal')openAddUserModal();else{if(id==='settings-modal'){document.getElementById('set-url').value=prefs.url;document.getElementById('set-tok').value=prefs.token;document.getElementById('auto-auth-info').style.display=CONFIG_HA_TOKEN?'block':'none';}document.getElementById(id).classList.add('open');}} function closeModal(id){document.getElementById(id).classList.remove('open');} function ovc(e,id){if(e.target===e.currentTarget)closeModal(id);} function setHA(state){