fix: DISABLE_ADMIN_PASSWORD_CHECK still show admin password modal (#406)

This commit is contained in:
Dream Hunter
2024-08-14 22:52:45 +08:00
committed by GitHub
parent d90f54345d
commit c969c4b082
9 changed files with 1672 additions and 1635 deletions

View File

@@ -18,32 +18,32 @@
},
"dependencies": {
"@simplewebauthn/browser": "^10.0.0",
"@unhead/vue": "^1.9.15",
"@unhead/vue": "^1.9.16",
"@vicons/material": "^0.12.0",
"@vueuse/core": "^10.11.0",
"@vueuse/core": "^10.11.1",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"axios": "^1.7.2",
"axios": "^1.7.3",
"jszip": "^3.10.1",
"mail-parser-wasm": "^0.1.8",
"naive-ui": "^2.38.2",
"postal-mime": "^2.2.5",
"naive-ui": "^2.39.0",
"postal-mime": "^2.2.7",
"vooks": "^0.2.12",
"vue": "^3.4.31",
"vue": "^3.4.37",
"vue-clipboard3": "^2.0.0",
"vue-i18n": "^9.13.1",
"vue-router": "^4.4.0"
"vue-router": "^4.4.3"
},
"devDependencies": {
"@vicons/fa": "^0.12.0",
"@vitejs/plugin-vue": "^5.0.5",
"unplugin-auto-import": "^0.17.6",
"unplugin-vue-components": "^0.27.2",
"vite": "^5.3.3",
"@vitejs/plugin-vue": "^5.1.2",
"unplugin-auto-import": "^0.18.2",
"unplugin-vue-components": "^0.27.4",
"vite": "^5.4.0",
"vite-plugin-pwa": "^0.19.8",
"vite-plugin-top-level-await": "^1.4.1",
"vite-plugin-top-level-await": "^1.4.4",
"vite-plugin-wasm": "^3.3.0",
"workbox-window": "^7.1.0",
"wrangler": "^3.63.1"
"wrangler": "^3.70.0"
}
}

2105
frontend/pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -56,6 +56,9 @@ const getOpenSettings = async (message) => {
try {
const res = await api.fetch("/open_api/settings");
const domainLabels = res["domainLabels"] || [];
if (res["domains"]?.length < 1) {
message.error("No domains found, please check your worker settings");
}
Object.assign(openSettings.value, {
...res,
title: res["title"] || "",

View File

@@ -27,6 +27,7 @@ export const useGlobalState = createGlobalState(
enableWebhook: false,
isS3Enabled: false,
showGithub: true,
disableAdminPasswordCheck: false,
})
const settings = ref({
fetched: false,
@@ -83,7 +84,11 @@ export const useGlobalState = createGlobalState(
/** @type {null | {domains: string[] | undefined | null, role: string, prefix: string | undefined | null}} */
user_role: null,
});
const showAdminPage = computed(() => !!adminAuth.value || userSettings.value.is_admin);
const showAdminPage = computed(() =>
!!adminAuth.value
|| userSettings.value.is_admin
|| openSettings.value.disableAdminPasswordCheck
);
const telegramApp = ref(window.Telegram?.WebApp || {});
const isTelegram = ref(!!window.Telegram?.WebApp?.initData);
return {