diff --git a/worker/src/commom_api.ts b/worker/src/commom_api.ts index 7d8a3e16..72599832 100644 --- a/worker/src/commom_api.ts +++ b/worker/src/commom_api.ts @@ -1,6 +1,6 @@ import { Hono } from 'hono' -import { getDomains, getPasswords, getBooleanValue, getIntValue, getStringArray, getDefaultDomains, getStringValue } from './utils'; +import utils from './utils'; import { CONSTANTS } from './constants'; import { isS3Enabled } from './mails_api/s3_attachment'; @@ -9,35 +9,35 @@ const api = new Hono api.get('/open_api/settings', async (c) => { // check header x-custom-auth let needAuth = false; - const passwords = getPasswords(c); + const passwords = utils.getPasswords(c); if (passwords && passwords.length > 0) { const auth = c.req.raw.headers.get("x-custom-auth"); needAuth = !auth || !passwords.includes(auth); } return c.json({ "title": c.env.TITLE, - "announcement": getStringValue(c.env.ANNOUNCEMENT), - "prefix": getStringValue(c.env.PREFIX), - "addressRegex": getStringValue(c.env.ADDRESS_REGEX), - "minAddressLen": getIntValue(c.env.MIN_ADDRESS_LEN, 1), - "maxAddressLen": getIntValue(c.env.MAX_ADDRESS_LEN, 30), - "defaultDomains": getDefaultDomains(c), - "domains": getDomains(c), - "domainLabels": getStringArray(c.env.DOMAIN_LABELS), + "announcement": utils.getStringValue(c.env.ANNOUNCEMENT), + "prefix": utils.getStringValue(c.env.PREFIX), + "addressRegex": utils.getStringValue(c.env.ADDRESS_REGEX), + "minAddressLen": utils.getIntValue(c.env.MIN_ADDRESS_LEN, 1), + "maxAddressLen": utils.getIntValue(c.env.MAX_ADDRESS_LEN, 30), + "defaultDomains": utils.getDefaultDomains(c), + "domains": utils.getDomains(c), + "domainLabels": utils.getStringArray(c.env.DOMAIN_LABELS), "needAuth": needAuth, "adminContact": c.env.ADMIN_CONTACT, - "enableUserCreateEmail": getBooleanValue(c.env.ENABLE_USER_CREATE_EMAIL), - "disableAnonymousUserCreateEmail": getBooleanValue(c.env.DISABLE_ANONYMOUS_USER_CREATE_EMAIL), - "enableUserDeleteEmail": getBooleanValue(c.env.ENABLE_USER_DELETE_EMAIL), - "enableAutoReply": getBooleanValue(c.env.ENABLE_AUTO_REPLY), - "enableIndexAbout": getBooleanValue(c.env.ENABLE_INDEX_ABOUT), + "enableUserCreateEmail": utils.getBooleanValue(c.env.ENABLE_USER_CREATE_EMAIL), + "disableAnonymousUserCreateEmail": utils.getBooleanValue(c.env.DISABLE_ANONYMOUS_USER_CREATE_EMAIL), + "enableUserDeleteEmail": utils.getBooleanValue(c.env.ENABLE_USER_DELETE_EMAIL), + "enableAutoReply": utils.getBooleanValue(c.env.ENABLE_AUTO_REPLY), + "enableIndexAbout": utils.getBooleanValue(c.env.ENABLE_INDEX_ABOUT), "copyright": c.env.COPYRIGHT, "cfTurnstileSiteKey": c.env.CF_TURNSTILE_SITE_KEY, - "enableWebhook": getBooleanValue(c.env.ENABLE_WEBHOOK), + "enableWebhook": utils.getBooleanValue(c.env.ENABLE_WEBHOOK), "isS3Enabled": isS3Enabled(c), "version": CONSTANTS.VERSION, - "showGithub": !getBooleanValue(c.env.DISABLE_SHOW_GITHUB), - "disableAdminPasswordCheck": getBooleanValue(c.env.DISABLE_ADMIN_PASSWORD_CHECK) + "showGithub": !utils.getBooleanValue(c.env.DISABLE_SHOW_GITHUB), + "disableAdminPasswordCheck": utils.getBooleanValue(c.env.DISABLE_ADMIN_PASSWORD_CHECK) }); })