From c999ae4040bf2a223cd2dea9cbb9721b6e3541f7 Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Fri, 25 Apr 2025 16:25:45 +0800 Subject: [PATCH] fix: remove unused date variable from email parsing in BasicAuth --- .../@nocobase/plugin-auth/src/client/basic/Options.tsx | 3 +-- .../plugins/@nocobase/plugin-auth/src/server/basic-auth.ts | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/basic/Options.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/basic/Options.tsx index e3c73266df..7b83b07246 100644 --- a/packages/plugins/@nocobase/plugin-auth/src/client/basic/Options.tsx +++ b/packages/plugins/@nocobase/plugin-auth/src/client/basic/Options.tsx @@ -152,9 +152,8 @@ const useVariableOptionsOfForgetPassword = () => { const environmentVariables = useGlobalVariable('$env'); const { currentUserSettings } = useCurrentUserVariable({ maxDepth: 1 }); const { systemSettings } = useSystemSettingsVariable(); - const { datetimeSettings } = useDatetimeVariable({ noDisabled: true }); - return [environmentVariables, currentUserSettings, datetimeSettings, systemSettings, { + return [environmentVariables, currentUserSettings, systemSettings, { value: '$resetLink', label: t('Reset password link'), }, { diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts b/packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts index 5835c01563..92fb89b850 100644 --- a/packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts +++ b/packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts @@ -11,7 +11,7 @@ import { AuthConfig, BaseAuth } from '@nocobase/auth'; import { PasswordField } from '@nocobase/database'; import _ from 'lodash'; import { namespace } from '../preset'; -import { getDateVars, parsedValue } from '@nocobase/utils'; +import { parsedValue } from '@nocobase/utils'; export class BasicAuth extends BaseAuth { static readonly optionsKeysNotAllowedInEnv = ['emailContentText', 'emailContentHTML', 'emailSubject']; @@ -209,7 +209,6 @@ export class BasicAuth extends BaseAuth { const parsedSubject = parsedValue(emailSubject, { $user: user, $resetLink: resetLink, - $nDate: getDateVars(), $env: ctx.app.environment.getVariables(), $resetLinkExpiration: resetTokenExpiresIn, $systemSettings: systemSettings, @@ -218,7 +217,6 @@ export class BasicAuth extends BaseAuth { const parsedContent = parsedValue(emailContentType === 'html' ? emailContentHTML : emailContentText, { $user: user, $resetLink: resetLink, - $nDate: getDateVars(), $env: ctx.app.environment.getVariables(), $resetLinkExpiration: resetTokenExpiresIn, $systemSettings: systemSettings,