Compare commits

...
2 Commits
2 changed files with 97 additions and 75 deletions
+90 -72
View File
@@ -283,86 +283,104 @@
var isAuth = !!token && !!uName; var isAuth = !!token && !!uName;
if (headerRight) { if (headerRight) {
var defaultLoginLink = headerRight.querySelector('my-login-link, a[href*="/login"], .login-button');
var liveWidget = headerRight.querySelector('#yaknet-header-account-widget'); var liveWidget = headerRight.querySelector('#yaknet-header-account-widget');
if (!liveWidget) {
var widgetWrap = document.createElement('div');
widgetWrap.id = 'yaknet-header-account-widget';
widgetWrap.className = 'yaknet-header-widget';
widgetWrap.style.display = 'inline-flex';
widgetWrap.style.alignItems = 'center';
widgetWrap.style.marginRight = '8px';
widgetWrap.innerHTML = if (isAuth) {
'<yaknet-account ' + // Logged In: Show YakNet Profile Menu, Hide default login link
'client-id="01a03c41-f758-721e-b927-619bffde5c23" ' +
'redirect-uri="https://yaktube.yakhub.com.tr/plugins/peertube-plugin-auth-yaknet/router/auth-callback" ' +
'base-url="https://auth.yakhub.com.tr" ' +
'login-url="/login" ' +
'authenticated="' +
(isAuth ? 'true' : 'false') +
'" ' +
'user-name="' +
(isAuth ? displayName.replace(/"/g, '&quot;') : '') +
'" ' +
'user-email="' +
(isAuth ? emailStr.replace(/"/g, '&quot;') : '') +
'" ' +
'theme="dark">' +
'</yaknet-account>';
var targetSibling =
headerRight.querySelector('my-user-menu') ||
headerRight.querySelector('my-login-link') ||
headerRight.querySelector('.user-menu') ||
headerRight.querySelector('.settings-button') ||
headerRight.querySelector('my-user-notifications') ||
headerRight.querySelector('my-notification-bell');
if (targetSibling && targetSibling.parentElement === headerRight) {
headerRight.insertBefore(widgetWrap, targetSibling);
} else {
headerRight.prepend(widgetWrap);
}
var defaultLoginLink = headerRight.querySelector('my-login-link');
if (defaultLoginLink) { if (defaultLoginLink) {
defaultLoginLink.setAttribute('aria-hidden', 'true');
defaultLoginLink.setAttribute('tabindex', '-1');
defaultLoginLink.style.display = 'none'; defaultLoginLink.style.display = 'none';
defaultLoginLink.setAttribute('aria-hidden', 'true');
} }
} else {
// Sync widget attributes dynamically if auth state changed if (!liveWidget) {
var el = liveWidget.querySelector('yaknet-account'); var widgetWrap = document.createElement('div');
if (el) { widgetWrap.id = 'yaknet-header-account-widget';
if (el.shadowRoot) { widgetWrap.className = 'yaknet-header-widget';
var shadowLogoutBtn = widgetWrap.style.display = 'inline-flex';
el.shadowRoot.getElementById('logoutBtn') || widgetWrap.style.alignItems = 'center';
el.shadowRoot.querySelector('.yn-logout-btn') || widgetWrap.style.marginRight = '8px';
el.shadowRoot.querySelector('button[title*="Çıkış"], button[aria-label*="Çıkış"]');
if (shadowLogoutBtn && !shadowLogoutBtn.hasAttribute('data-yaktube-hooked')) { widgetWrap.innerHTML =
shadowLogoutBtn.setAttribute('data-yaktube-hooked', 'true'); '<yaknet-account ' +
shadowLogoutBtn.addEventListener( 'client-id="01a03c41-f758-721e-b927-619bffde5c23" ' +
'click', 'redirect-uri="https://yaktube.yakhub.com.tr/plugins/peertube-plugin-auth-yaknet/router/auth-callback" ' +
function (ev) { 'base-url="https://auth.yakhub.com.tr" ' +
ev.preventDefault(); 'login-url="/login" ' +
ev.stopPropagation(); 'authenticated="true" ' +
performUnifiedLogout(); 'user-name="' +
}, displayName.replace(/"/g, '&quot;') +
true '" ' +
); 'user-email="' +
emailStr.replace(/"/g, '&quot;') +
'" ' +
'theme="dark">' +
'</yaknet-account>';
var targetSibling =
headerRight.querySelector('my-user-menu') ||
headerRight.querySelector('.user-menu') ||
headerRight.querySelector('.settings-button') ||
headerRight.querySelector('my-user-notifications') ||
headerRight.querySelector('my-notification-bell');
if (targetSibling && targetSibling.parentElement === headerRight) {
headerRight.insertBefore(widgetWrap, targetSibling);
} else {
headerRight.prepend(widgetWrap);
}
} else {
var el = liveWidget.querySelector('yaknet-account');
if (el) {
if (el.shadowRoot) {
var shadowLogoutBtn =
el.shadowRoot.getElementById('logoutBtn') ||
el.shadowRoot.querySelector('.yn-logout-btn') ||
el.shadowRoot.querySelector('button[title*="Çıkış"], button[aria-label*="Çıkış"]');
if (shadowLogoutBtn && !shadowLogoutBtn.hasAttribute('data-yaktube-hooked')) {
shadowLogoutBtn.setAttribute('data-yaktube-hooked', 'true');
shadowLogoutBtn.addEventListener(
'click',
function (ev) {
ev.preventDefault();
ev.stopPropagation();
performUnifiedLogout();
},
true
);
}
}
if (el.getAttribute('authenticated') !== 'true' || el.getAttribute('user-name') !== displayName) {
el.setAttribute('authenticated', 'true');
el.setAttribute('user-name', displayName);
el.setAttribute('user-email', emailStr);
if (typeof el.syncStateFromAttributes === 'function') {
el.syncStateFromAttributes();
el.render();
}
} }
} }
}
} else {
// Not Logged In: Remove YakNet widget to eliminate duplicate button, keep PeerTube native login button clean
if (liveWidget) {
liveWidget.remove();
}
if (defaultLoginLink) {
defaultLoginLink.style.display = '';
defaultLoginLink.removeAttribute('aria-hidden');
var expectedAuth = isAuth ? 'true' : 'false'; var loginAnchor =
var expectedName = isAuth ? displayName : ''; defaultLoginLink.tagName.toLowerCase() === 'a' ? defaultLoginLink : defaultLoginLink.querySelector('a');
var expectedEmail = isAuth ? emailStr : ''; if (loginAnchor) {
if (el.getAttribute('authenticated') !== expectedAuth || el.getAttribute('user-name') !== expectedName) { loginAnchor.setAttribute('aria-label', 'YakNet ile Giriş Yap');
el.setAttribute('authenticated', expectedAuth); loginAnchor.setAttribute('title', 'YakNet Hesabınız ile Giriş Yapın');
el.setAttribute('user-name', expectedName); var spanText = loginAnchor.querySelector('span');
el.setAttribute('user-email', expectedEmail); if (spanText) {
if (typeof el.syncStateFromAttributes === 'function') { spanText.textContent = 'YakNet ile Giriş Yap';
el.syncStateFromAttributes(); } else {
el.render(); loginAnchor.textContent = 'YakNet ile Giriş Yap';
} }
} }
} }
+7 -3
View File
@@ -1,14 +1,17 @@
{ {
"name": "peertube-plugin-yaktube-ondemand", "name": "peertube-plugin-yaktube-ondemand",
"version": "1.4.2", "version": "1.4.4",
"description": "Accessible On-Demand YouTube Import, Live Streams, Smart Recommendations and A11y Engine for PeerTube", "description": "Accessible On-Demand YouTube Import, Live Streams, Smart Recommendations and A11y Engine for PeerTube",
"main": "main.js", "main": "main.js",
"library": "./main.js",
"staticDirs": {},
"translations": {},
"clientScripts": [ "clientScripts": [
{ {
"script": "client.js",
"scopes": [ "scopes": [
"common" "common"
], ]
"script": "client.js"
} }
], ],
"css": [ "css": [
@@ -39,5 +42,6 @@
"url": "https://github.com/yakistir98/peertube-plugin-yaktube-ondemand.git" "url": "https://github.com/yakistir98/peertube-plugin-yaktube-ondemand.git"
}, },
"homepage": "https://yaktube.yakhub.com.tr", "homepage": "https://yaktube.yakhub.com.tr",
"bugs": "https://github.com/yakistir98/peertube-plugin-yaktube-ondemand/issues",
"license": "AGPL-3.0-or-later" "license": "AGPL-3.0-or-later"
} }