diff --git a/frontend/src/css/login.css b/frontend/src/css/login.css index b97ae7cd..8bd0105e 100644 --- a/frontend/src/css/login.css +++ b/frontend/src/css/login.css @@ -25,7 +25,7 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - max-width: 16em; + max-width: 17em; width: 90%; } diff --git a/frontend/src/i18n/ar.json b/frontend/src/i18n/ar.json index 443b30e3..f286cf59 100644 --- a/frontend/src/i18n/ar.json +++ b/frontend/src/i18n/ar.json @@ -102,6 +102,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Create an account", "loginInstead": "Already have an account", "password": "كلمة المرور", @@ -165,6 +166,7 @@ "allowEdit": "تعديل، إعادة تسمية وحذف الملفات والمجلدات", "allowNew": "إنشاء ملفات ومجلدات جديدة", "allowPublish": "نشر مقالات وصفحات جديدة", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Allow users to signup", "avoidChanges": "(أتركه فارغاً إن لم ترد تغييره)", "branding": "Branding", diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json index ad8aadc4..a23e3636 100644 --- a/frontend/src/i18n/de.json +++ b/frontend/src/i18n/de.json @@ -108,6 +108,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Account erstellen", "loginInstead": "Account besteht bereits", "password": "Passwort", @@ -174,6 +175,7 @@ "allowEdit": "Bearbeiten, Umbenennen und Löschen von Dateien oder Ordnern", "allowNew": "Erstellen neuer Dateien und Ordner", "allowPublish": "Veröffentlichen von neuen Beiträgen und Seiten", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Erlaube Benutzern sich zu registrieren", "avoidChanges": "(leer lassen um Änderungen zu vermeiden)", "branding": "Design", diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index a348b488..5310d8f4 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -110,6 +110,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Create an account", "loginInstead": "Already have an account", "password": "Password", @@ -176,6 +177,7 @@ "allowEdit": "Edit, rename and delete files or directories", "allowNew": "Create new files and directories", "allowPublish": "Publish new posts and pages", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Allow users to signup", "avoidChanges": "(leave blank to avoid changes)", "branding": "Branding", diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json index bd247627..a621db0a 100644 --- a/frontend/src/i18n/es.json +++ b/frontend/src/i18n/es.json @@ -108,6 +108,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Crear una cuenta", "loginInstead": "Usuario ya existente", "password": "Contraseña", @@ -174,6 +175,7 @@ "allowEdit": "Editar, renombrar y borrar archivos o carpetas", "allowNew": "Crear nuevos archivos y carpetas", "allowPublish": "Publicar nuevos posts y páginas", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Permitir registro de usuarios", "avoidChanges": "(dejar en blanco para evitar cambios)", "branding": "Marca", diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json index 0be93f1a..df260d42 100644 --- a/frontend/src/i18n/fr.json +++ b/frontend/src/i18n/fr.json @@ -108,6 +108,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Créer un compte", "loginInstead": "Vous avez déjà un compte", "password": "Mot de passe", @@ -174,6 +175,7 @@ "allowEdit": "Editer, renommer et supprimer des fichiers ou des dossiers", "allowNew": "Créer de nouveaux fichiers et dossiers", "allowPublish": "Publier de nouveaux posts et pages", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Autoriser les utilisateurs à s'inscrire", "avoidChanges": "(Laisser vide pour conserver l'actuel)", "branding": "Image de marque", diff --git a/frontend/src/i18n/he.json b/frontend/src/i18n/he.json index 630f4f73..982f0b96 100644 --- a/frontend/src/i18n/he.json +++ b/frontend/src/i18n/he.json @@ -108,6 +108,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "צור חשבון", "loginInstead": "חשבון קיים", "password": "סיסמא", @@ -174,6 +175,7 @@ "allowEdit": "ערוך, שנה שם ומחק קבצים או תקיות", "allowNew": "צור קבצים ותקיות חדשות", "allowPublish": "פרסם פוסטים ודפים חדשים", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "אפשר למשתמשים להירשם", "avoidChanges": "(השאר ריק כדי למנוע שינויים)", "branding": "מיתוג", diff --git a/frontend/src/i18n/hu.json b/frontend/src/i18n/hu.json index 7674e337..48b832f1 100644 --- a/frontend/src/i18n/hu.json +++ b/frontend/src/i18n/hu.json @@ -108,6 +108,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Fiók létrehozása", "loginInstead": "Már van fiókom", "password": "Jelszó", @@ -174,6 +175,7 @@ "allowEdit": "Fájlok és mappák szerkesztése, átnevezése és törlése", "allowNew": "Új fájlok és mappák létrehozása", "allowPublish": "Új bejegyzések és oldalak létrehozása", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Felhasználók regisztrációjának engedélyezése", "avoidChanges": "(üresen hagyva nincs változás)", "branding": "Márkázás", diff --git a/frontend/src/i18n/is.json b/frontend/src/i18n/is.json index 24d51b02..011e45f1 100644 --- a/frontend/src/i18n/is.json +++ b/frontend/src/i18n/is.json @@ -102,6 +102,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Búa til nýjan aðgang", "loginInstead": "Þú ert þegar með aðgang", "password": "Lykilorð", @@ -165,6 +166,7 @@ "allowEdit": "Breyta, endurnefna og eyða skjölum eða möppum", "allowNew": "Búa til ný skjöl og möppur", "allowPublish": "Gefa út nýjar færslur og síður", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Leyfa nýjum notendum að skrá sig", "avoidChanges": "(engar breytingar ef ekkert er skrifað)", "branding": "Útlit", diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json index 85360980..c90abb0a 100644 --- a/frontend/src/i18n/it.json +++ b/frontend/src/i18n/it.json @@ -102,6 +102,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Crea un account", "loginInstead": "Hai già un account", "password": "Password", @@ -165,6 +166,7 @@ "allowEdit": "Modifica, rinomina ed elimina file o cartelle", "allowNew": "Crea nuovi files o cartelle", "allowPublish": "Pubblica nuovi post e pagine", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Permetti agli utenti di registrarsi", "avoidChanges": "(lascia vuoto per evitare cambiamenti)", "branding": "Branding", diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json index d6253050..a8a3f6a9 100644 --- a/frontend/src/i18n/ja.json +++ b/frontend/src/i18n/ja.json @@ -102,6 +102,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Create an account", "loginInstead": "Already have an account", "password": "パスワード", @@ -165,6 +166,7 @@ "allowEdit": "ファイルやディレクトリの編集、名前変更と削除", "allowNew": "ファイルとディレクトリの作成", "allowPublish": "ポストとぺーじの発表", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Allow users to signup", "avoidChanges": "(変更を避けるために空白にしてください)", "branding": "Branding", diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json index 64a6eab9..bcc7d4e5 100644 --- a/frontend/src/i18n/ko.json +++ b/frontend/src/i18n/ko.json @@ -102,6 +102,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "계정 생성", "loginInstead": "이미 계정이 있습니다", "password": "비밀번호", @@ -165,6 +166,7 @@ "allowEdit": "파일/디렉토리의 수정/변경/삭제 허용", "allowNew": "파일/디렉토리 생성 허용", "allowPublish": "새 포스트/페이지 생성 허용", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "사용자 가입 허용", "avoidChanges": "(수정하지 않으면 비워두세요)", "branding": "브랜딩", diff --git a/frontend/src/i18n/nl-be.json b/frontend/src/i18n/nl-be.json index dec8d302..5ad0d925 100644 --- a/frontend/src/i18n/nl-be.json +++ b/frontend/src/i18n/nl-be.json @@ -102,6 +102,7 @@ "zhTW": "Chinees (traditioneel)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Account aanmaken", "loginInstead": "Heeft al een account", "password": "Wachtwoord", @@ -165,6 +166,7 @@ "allowEdit": "Bestanden of mappen aanpassen, hernoemen of verwijderen", "allowNew": "Nieuwe bestanden of mappen aanmaken", "allowPublish": "Publiceer nieuwe berichten en pagina's", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Sta gebruikers toe om zich te registreren", "avoidChanges": "(laat leeg om wijzigingen te voorkomen)", "branding": "Branding", diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json index a66facb2..b5e454ae 100644 --- a/frontend/src/i18n/pl.json +++ b/frontend/src/i18n/pl.json @@ -102,6 +102,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Utwórz konto", "loginInstead": "Takie konto już istnieje", "password": "Hasło", @@ -166,6 +167,7 @@ "allowEdit": "Edycja, zmiana nazwy i usuniecie plików lub folderów", "allowNew": "Tworzenie nowych plików lub folderów", "allowPublish": "Tworzenie nowych wpisów i stron", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Zezwól na rejestrację użytkowników", "avoidChanges": "(pozostaw puste aby nie zosatało zmienione)", "branding": "Branding", diff --git a/frontend/src/i18n/pt-br.json b/frontend/src/i18n/pt-br.json index 51355a9c..b3950f6b 100644 --- a/frontend/src/i18n/pt-br.json +++ b/frontend/src/i18n/pt-br.json @@ -108,6 +108,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Criar uma conta", "loginInstead": "Já possui uma conta", "password": "Senha", @@ -174,6 +175,7 @@ "allowEdit": "Editar, renomear e apagar arquivos ou pastas", "allowNew": "Criar novos arquivos e pastas", "allowPublish": "Publicar novas páginas e conteúdos", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Permitir cadastro de usuários", "avoidChanges": "(deixe em branco para manter)", "branding": "Customização", diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json index 93ac94f6..0b15f24f 100644 --- a/frontend/src/i18n/pt.json +++ b/frontend/src/i18n/pt.json @@ -102,6 +102,7 @@ "zhTW": "Chinês tradicional" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Criar uma conta", "loginInstead": "Já tenho uma conta", "password": "Palavra-passe", @@ -165,6 +166,7 @@ "allowEdit": "Editar, renomear e eliminar ficheiros ou pastas", "allowNew": "Criar novos ficheiros e pastas", "allowPublish": "Publicar novas páginas e conteúdos", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Permitir que os utilizadores criem contas", "avoidChanges": "(deixe em branco para manter)", "branding": "Marca", diff --git a/frontend/src/i18n/ro.json b/frontend/src/i18n/ro.json index f2168a46..64e04d86 100644 --- a/frontend/src/i18n/ro.json +++ b/frontend/src/i18n/ro.json @@ -102,6 +102,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Crează cont", "loginInstead": "Am deja cont", "password": "Parola", @@ -165,6 +166,7 @@ "allowEdit": "Modifică, redenumește și șterge fișiere sau directoare", "allowNew": "Crează noi fișiere sau directoare", "allowPublish": "Publică noi pagini și postări", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Permite utilizatorilor să se înregistreze", "avoidChanges": "(lasă gol pentru a nu schimba)", "branding": "Branding", diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json index 5cf40b93..d11b4b82 100644 --- a/frontend/src/i18n/ru.json +++ b/frontend/src/i18n/ru.json @@ -108,6 +108,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Создать аккаунт", "loginInstead": "Уже есть аккаунт", "password": "Пароль", @@ -173,6 +174,7 @@ "allowEdit": "Редактирование, переименование и удаление файлов или каталогов", "allowNew": "Создание новых файлов или каталогов", "allowPublish": "Публикация новых записей и страниц", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Разрешить пользователям регистрироваться", "avoidChanges": "(оставьте поле пустым, чтобы избежать изменений)", "branding": "Брендинг", diff --git a/frontend/src/i18n/sk.json b/frontend/src/i18n/sk.json index 414a8b4d..9f160574 100644 --- a/frontend/src/i18n/sk.json +++ b/frontend/src/i18n/sk.json @@ -108,6 +108,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Vytvoriť účet", "loginInstead": "Už mám účet", "password": "Heslo", @@ -173,6 +174,7 @@ "allowEdit": "Upravovať, premenovať a odstraňovať súbory a priečinky", "allowNew": "Vytvárať nové súbory a priečinky", "allowPublish": "Zverejňovať nové príspevky a stránky", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Povoliť registráciu používateľov", "avoidChanges": "(nechajte prázdne, aby sa nezmenilo)", "branding": "Vlastný vzhľad", diff --git a/frontend/src/i18n/sv-se.json b/frontend/src/i18n/sv-se.json index df0537ec..425d19c5 100644 --- a/frontend/src/i18n/sv-se.json +++ b/frontend/src/i18n/sv-se.json @@ -102,6 +102,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Skapa ett konto", "loginInstead": "Du har redan ett konto", "password": "Lösenord", @@ -165,6 +166,7 @@ "allowEdit": "Ändra, döp om och ta bort filer eller mappar", "allowNew": "Skapa nya filer eller mappar", "allowPublish": "Publicera nya inlägg och sidor", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Tillåt användare att registrera sig", "avoidChanges": "(lämna blankt för att undvika ändringar)", "branding": "Varumärke", diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json index 77ebb3f6..326c520c 100644 --- a/frontend/src/i18n/tr.json +++ b/frontend/src/i18n/tr.json @@ -106,6 +106,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Bir hesap oluşturun", "loginInstead": "Zaten hesabınız var mı", "password": "Şifre", @@ -171,6 +172,7 @@ "allowEdit": "Dosyaları veya dizinleri düzenleyin, yeniden adlandırın ve silin", "allowNew": "Yeni dosyalar ve dizinler oluşturun", "allowPublish": "Yeni linkler ve sayfaları yayınlayın", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", "allowSignup": "Kullanıcıların kaydolmasına izin ver", "avoidChanges": "(değişiklikleri önlemek için boş bırakın)", "branding": "Marka", diff --git a/frontend/src/i18n/ua.json b/frontend/src/i18n/ua.json index cfc42ca2..e936e354 100644 --- a/frontend/src/i18n/ua.json +++ b/frontend/src/i18n/ua.json @@ -108,6 +108,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "Guest mod on, buuto login failed", "createAnAccount": "Створити обліковий запис", "loginInstead": "Вже є обліковий запис", "password": "Пароль", @@ -173,7 +174,8 @@ "allowEdit": "Редагування, перейменування та видалення файлів чи каталогів", "allowNew": "Створення нових файлів або каталогів", "allowPublish": "Публікація нових записів та сторінок", - "allowSignup": "Дозволити користувачам реєструватися", + "enableGuest": "Open guest mod & guest auto login (Please add user：guest/guest and permission)", + "allowSignup": "Дозволити користувачам реєструватися", "avoidChanges": "(залишіть поле порожнім, щоб уникнути змін)", "branding": "Брендинг", "brandingDirectoryPath": "Шлях до каталогу брендів", diff --git a/frontend/src/i18n/zh-cn.json b/frontend/src/i18n/zh-cn.json index f5b730f6..13786ec3 100644 --- a/frontend/src/i18n/zh-cn.json +++ b/frontend/src/i18n/zh-cn.json @@ -108,6 +108,7 @@ "zhTW": "中文（繁體）" }, "login": { + "guestLoginFail": "已开启guest模式，但无法自动登录", "createAnAccount": "创建用户", "loginInstead": "已有用户登录", "password": "密码", @@ -173,6 +174,7 @@ "allowEdit": "编辑、重命名或删除文件/目录", "allowNew": "创建新文件和目录", "allowPublish": "发布新的帖子与页面", + "enableGuest": "开启Guest模式，并自动登录（注意手动添加用户：guest/guest，并注意权限）", "allowSignup": "允许用户注册", "avoidChanges": "（留空以避免更改）", "branding": "品牌", diff --git a/frontend/src/i18n/zh-tw.json b/frontend/src/i18n/zh-tw.json index 096a9fbc..10764da4 100644 --- a/frontend/src/i18n/zh-tw.json +++ b/frontend/src/i18n/zh-tw.json @@ -102,6 +102,7 @@ "zhTW": "中文 (繁體)" }, "login": { + "guestLoginFail": "已開啟guest模式，但無法自動登錄", "createAnAccount": "新建賬戶", "loginInstead": "已有賬戶登錄", "password": "密碼", @@ -165,6 +166,7 @@ "allowEdit": "編輯、重命名或刪除檔案/目錄", "allowNew": "創建新檔案和目錄", "allowPublish": "發佈新的貼文與頁面", + "enableGuest": "開啟Guest模式，並自動登錄（註意手動添加用戶：guest/guest，並註意權限）", "allowSignup": "允許使用者註冊", "avoidChanges": "(留空以避免更改)", "branding": "品牌", diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index 2dbe44a1..7738a798 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -6,6 +6,7 @@ const staticURL = window.FileBrowser.StaticURL; const recaptcha = window.FileBrowser.ReCaptcha; const recaptchaKey = window.FileBrowser.ReCaptchaKey; const signup = window.FileBrowser.Signup; +const enableGuest = window.FileBrowser.EnableGuest; const version = window.FileBrowser.Version; const logoURL = `${staticURL}/img/logo.svg`; const noAuth = window.FileBrowser.NoAuth; @@ -27,6 +28,7 @@ export { logoURL, recaptcha, recaptchaKey, + enableGuest, signup, version, noAuth, diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue index 51e5d1cb..97f1548b 100644 --- a/frontend/src/views/Login.vue +++ b/frontend/src/views/Login.vue @@ -51,14 +51,25 @@ import { recaptcha, recaptchaKey, signup, + enableGuest, } from "@/utils/constants"; +let isFromLogOut = false; + export default { name: "login", computed: { + enableGuest: () => enableGuest, signup: () => signup, name: () => name, logoURL: () => logoURL, + redirectURL() { + let redirect = this.$route.query.redirect; + if (redirect === "" || redirect === undefined || redirect === null) { + redirect = "/files/"; + } + return redirect; + }, }, data: function () { return { @@ -70,6 +81,22 @@ export default { passwordConfirm: "", }; }, + beforeRouteEnter(to, from, next) { + if (from.path.startsWith("/files")) { + isFromLogOut = true; + } + next(); + }, + async beforeMount() { + if (this.enableGuest && !isFromLogOut) { + try { + await auth.login("guest", "guest", ""); + await this.$router.push({ path: this.redirectURL }); + } catch (e) { + this.error = this.$t("login.guestLoginFail"); + } + } + }, mounted() { if (!recaptcha) return; @@ -87,11 +114,6 @@ export default { event.preventDefault(); event.stopPropagation(); - let redirect = this.$route.query.redirect; - if (redirect === "" || redirect === undefined || redirect === null) { - redirect = "/files/"; - } - let captcha = ""; if (recaptcha) { captcha = window.grecaptcha.getResponse(); @@ -115,9 +137,10 @@ export default { } await auth.login(this.username, this.password, captcha); - this.$router.push({ path: redirect }); + this.$router.push({ path: this.redirectURL }); } catch (e) { - if (e.message == 409) { + console.error(e); + if (e.message === 409) { this.error = this.$t("login.usernameTaken"); } else { this.error = this.$t("login.wrongCredentials"); diff --git a/frontend/src/views/settings/Global.vue b/frontend/src/views/settings/Global.vue index c79fcc08..39b8ceed 100644 --- a/frontend/src/views/settings/Global.vue +++ b/frontend/src/views/settings/Global.vue @@ -8,6 +8,10 @@
+

+ + {{ $t("settings.enableGuest") }} +

{{ $t("settings.allowSignup") }} diff --git a/http/settings.go b/http/settings.go index d0599207..a53ed40a 100644 --- a/http/settings.go +++ b/http/settings.go @@ -9,6 +9,7 @@ import ( ) type settingsData struct { + EnableGuest bool `json:"enableGuest"` Signup bool `json:"signup"` CreateUserDir bool `json:"createUserDir"` UserHomeBasePath string `json:"userHomeBasePath"` @@ -22,6 +23,7 @@ type settingsData struct { var settingsGetHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { data := &settingsData{ + EnableGuest: d.settings.EnableGuest, Signup: d.settings.Signup, CreateUserDir: d.settings.CreateUserDir, UserHomeBasePath: d.settings.UserHomeBasePath, @@ -43,6 +45,7 @@ var settingsPutHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, return http.StatusBadRequest, err } + d.settings.EnableGuest = req.EnableGuest d.settings.Signup = req.Signup d.settings.CreateUserDir = req.CreateUserDir d.settings.UserHomeBasePath = req.UserHomeBasePath diff --git a/http/static.go b/http/static.go index 75c6a4fe..501f04eb 100644 --- a/http/static.go +++ b/http/static.go @@ -34,6 +34,7 @@ func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, fSys "BaseURL": d.server.BaseURL, "Version": version.Version, "StaticURL": path.Join(d.server.BaseURL, "/static"), + "EnableGuest": d.settings.EnableGuest, "Signup": d.settings.Signup, "NoAuth": d.settings.AuthMethod == auth.MethodNoAuth, "AuthMethod": d.settings.AuthMethod, diff --git a/settings/settings.go b/settings/settings.go index 35ba1278..1c0a7582 100644 --- a/settings/settings.go +++ b/settings/settings.go @@ -15,6 +15,7 @@ type AuthMethod string // Settings contain the main settings of the application. type Settings struct { Key []byte `json:"key"` + EnableGuest bool `json:"enableGuest"` Signup bool `json:"signup"` CreateUserDir bool `json:"createUserDir"` UserHomeBasePath string `json:"userHomeBasePath"`