π The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.
Vue dockergolangkanbanknowledge-baseknowledge-managementmarkdownnote-takingnotesnotes-appnotionnuxtnuxtjsoffline-firstoidcpwaselfhostedssovuevuejswiki
feat: support native login disable in frontend
Smaug6739402fa5d5bf52
diff --git a/frontend/.env b/frontend/.envindex 54449d8d..ae113dcd 100644--- a/frontend/.env+++ b/frontend/.env@@ -2,4 +2,5 @@ NUXT_PUBLIC_BASE_API=http://localhost:8201NUXT_PUBLIC_BASE_CDN=http://localhost:9000NUXT_PUBLIC_CONFIG_DISABLE_LANDING_PAGE=false-NUXT_PUBLIC_CONFIG_DISABLE_SIGNUP_PAGE=false\ No newline at end of file+NUXT_PUBLIC_CONFIG_DISABLE_SIGNUP_PAGE=false+NUXT_PUBLIC_CONFIG_DISABLE_NATIVE_LOGIN=false\ No newline at end of filediff --git a/frontend/app/components/OIDCProviders.vue b/frontend/app/components/OIDCProviders.vueindex 01adcccf..bc306cba 100644--- a/frontend/app/components/OIDCProviders.vue+++ b/frontend/app/components/OIDCProviders.vue@@ -1,6 +1,6 @@<template><div v-if="isEnabled && providers.length > 0" class="oidc-providers">- <div class="divider">+ <div v-if="!noDivider" class="divider"><span>or continue with</span></div><div class="providers-grid">@@ -22,6 +22,11 @@<script setup lang="ts">import { getProviderConfig } from '~/helpers/oidc-providers';++defineProps<{+ noDivider?: boolean;+}>();+const { providers, isEnabled, isLoading, fetchProviders, loginWithProvider } = useOIDC();onMounted(() => {@@ -112,11 +117,6 @@ onMounted(() => {align-items: center;flex-shrink: 0;justify-content: center;-- :deep(svg) {- width: 100%;- height: 100%;- }}.provider-label {diff --git a/frontend/app/pages/(public)/login/index.vue b/frontend/app/pages/(public)/login/index.vueindex 4ca7259e..a7ed1f37 100644--- a/frontend/app/pages/(public)/login/index.vue+++ b/frontend/app/pages/(public)/login/index.vue@@ -4,37 +4,41 @@<div class="body-container"><IconApp style="width: 120px" /><h1>Connection</h1>- <div class="form-group">- <label for="username">Username</label>- <input id="username" v-model="username" type="username" :class="{ 'is-invalid': errors.username }" />- <p v-if="errors.username" class="invalid-feedback">{{ errors.username }}</p>- </div>- <div class="form-group">- <label for="password">Password</label>- <div class="password-input">- <input- id="password"- :key="`password-${showPassword}`"- v-model="password"- :type="showPassword ? 'text' : 'password'"- :class="{ 'is-invalid': errors.password }"- />- <button type="button" class="password-toggle" @click="togglePassword">- <div class="eye-icon" :class="{ show: showPassword }">- <Icon v-if="showPassword" name="eye" />- <Icon v-else name="eye_off" />- </div>- </button>+ <template v-if="!loginDisabled">+ <div class="form-group">+ <label for="username">Username</label>+ <input id="username" v-model="username" type="username" :class="{ 'is-invalid': errors.username }" />+ <p v-if="errors.username" class="invalid-feedback">{{ errors.username }}</p></div>- <p v-if="errors.password" class="invalid-feedback">{{ errors.password }}</p>- </div>- <NuxtLink to="/signup" class="signup-link">Need an account? Sign up</NuxtLink>- <button class="btn" @click="login">Login</button>- <p v-if="errors.general" class="invalid-feedback">{{ errors.general }}</p>- <p class="forgot-password-link">Forgot your password? <NuxtLink to="/login/request-reset">Click here</NuxtLink></p>+ <div class="form-group">+ <label for="password">Password</label>+ <div class="password-input">+ <input+ id="password"+ :key="`password-${showPassword}`"+ v-model="password"+ :type="showPassword ? 'text' : 'password'"+ :class="{ 'is-invalid': errors.password }"+ />+ <button type="button" class="password-toggle" @click="togglePassword">+ <div class="eye-icon" :class="{ show: showPassword }">+ <Icon v-if="showPassword" name="eye" />+ <Icon v-else name="eye_off" />+ </div>+ </button>+ </div>+ <p v-if="errors.password" class="invalid-feedback">{{ errors.password }}</p>+ </div>+ <NuxtLink to="/signup" class="signup-link">Need an account? Sign up</NuxtLink>+ <button class="btn" @click="login">Login</button>+ <OIDCProviders :no-divider="loginDisabled" />+ </template>+ <template v-else>+ <OIDCProviders :no-divider="loginDisabled" />+ </template>- <!-- OIDC Providers -->- <OIDCProviders />+ <p v-if="errors.general" class="invalid-feedback general">{{ errors.general }}</p>+ <p class="forgot-password-link">Forgot your password? <NuxtLink to="/login/request-reset">Click here</NuxtLink></p></div><AppFooter /></div>@@ -44,13 +48,18 @@import AppHeader from '../_components/AppHeader.vue';import AppFooter from '../_components/AppFooter.vue';+const userStore = useUserStore();+const router = useRouter();const route = useRoute();+const config = useRuntimeConfig();+const username = ref('');const password = ref('');const errors = ref({ username: '', password: '', general: '' });const { showPassword, togglePassword } = usePasswordField();-const userStore = useUserStore();++const loginDisabled = config.public.configDisableNativeLogin;// Check for OIDC error redirectonMounted(() => {@@ -181,12 +190,6 @@ input {&.show {transform: scale(1.1);}-- svg {- width: 18px;- height: 18px;- transition: transform $transition-medium ease;- }}/* ===== Links ===== */@@ -260,5 +263,9 @@ input {font-size: 0.8rem;color: var(--red);text-align: center;+ &.general {+ margin-top: 1rem;+ font-size: 0.9rem;+ }}</style>diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.tsindex 730023b8..492d5b31 100644--- a/frontend/nuxt.config.ts+++ b/frontend/nuxt.config.ts@@ -13,6 +13,7 @@ export default defineNuxtConfig({// Feature flagsconfigDisableSignupPage: '',configDisableLandingPage: '',+ configDisableNativeLogin: false,},},vite: {