lee/OliveTin
1
0
Fork 0
mirror of https://github.com/OliveTin/OliveTin synced 2025-12-12 00:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: #696 - hide login link if login interactively isn't possible (local user or oauth2)

Browse Source
This commit is contained in:
jamesread
2025-11-06 15:29:39 +00:00
parent 822f3197b6
commit d688ab64e1
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/resources/vue/App.vue
View File

@@ -8,11 +8,11 @@
<template #user-info> <template #user-info>
<div class="flex-row user-info" style="gap: .5em;"> <div class="flex-row user-info" style="gap: .5em;">
<span id="link-login" v-if="!isLoggedIn"><router-link to="/login">Login</router-link></span> <span id="link-login" v-if="!isLoggedIn && showLoginLink"><router-link to="/login">Login</router-link></span>
<router-link v-else to="/user" class="user-link"> <router-link v-else to="/user" class="user-link" v-if="isLoggedIn">
<span id="username-text">{{ username }}</span> <span id="username-text">{{ username }}</span>
</router-link> </router-link>
<HugeiconsIcon :icon="UserCircle02Icon" width = "1.5em" height = "1.5em" /> <HugeiconsIcon :icon="UserCircle02Icon" width = "1.5em" height = "1.5em" v-if="isLoggedIn" />
</div> </div>
</template> </template>
@@ -71,7 +71,7 @@ import logoUrl from '../../OliveTinLogo.png';
const router = useRouter(); const router = useRouter();
const sidebar = ref(null); const sidebar = ref(null);
const username = ref('guest'); const username = ref('notset');
const isLoggedIn = ref(false); const isLoggedIn = ref(false);
const serverConnection = ref('Connected'); const serverConnection = ref('Connected');
const currentVersion = ref('?'); const currentVersion = ref('?');
@@ -84,6 +84,7 @@ const showLogs = ref(true)
const showDiagnostics = ref(true) const showDiagnostics = ref(true)
const initError = ref(false) const initError = ref(false)
const initErrorMessage = ref('') const initErrorMessage = ref('')
const showLoginLink = ref(true)
function toggleSidebar() { function toggleSidebar() {
if (sidebar.value && showNavigation.value) { if (sidebar.value && showNavigation.value) {
@@ -102,6 +103,10 @@ function updateHeaderFromInit() {
showNavigation.value = window.initResponse.showNavigation showNavigation.value = window.initResponse.showNavigation
showLogs.value = window.initResponse.showLogList showLogs.value = window.initResponse.showLogList
showDiagnostics.value = window.initResponse.showDiagnostics showDiagnostics.value = window.initResponse.showDiagnostics
if (!window.initResponse.authLocalLogin && window.initResponse.oAuth2Providers.length === 0) {
showLoginLink.value = false
}
} }
} }
@@ -124,15 +129,7 @@ async function requestInit() {
window.initErrorMessage = '' window.initErrorMessage = ''
window.initCompleted = true window.initCompleted = true
username.value = initResponse.authenticatedUser window.updateHeaderFromInit()
isLoggedIn.value = initResponse.authenticatedUser !== '' && initResponse.authenticatedUser !== 'guest'
currentVersion.value = initResponse.currentVersion
bannerMessage.value = initResponse.bannerMessage || '';
bannerCss.value = initResponse.bannerCss || '';
showFooter.value = initResponse.showFooter
showNavigation.value = initResponse.showNavigation
showLogs.value = initResponse.showLogList
showDiagnostics.value = initResponse.showDiagnostics
if (showNavigation.value && sidebar.value) { if (showNavigation.value && sidebar.value) {
for (const rootDashboard of initResponse.rootDashboards) { for (const rootDashboard of initResponse.rootDashboards) {