S-VPN/panel-web
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 fix(auth): Update authentication configuration and localization strings

Browse Source
This commit is contained in:
web@ppanel
2025-02-08 23:58:03 +07:00
parent 3a3d2236e2
commit 47f2c5853c
48 changed files with 749 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin/app/(auth)/email/register-form.tsx
+4 -4
View File
@@ -33,8 +33,8 @@ export default function RegisterForm({
try {
const domain = email.split('@')[1];
const isValid =
!auth.email.email_enable_verify ||
auth.email?.email_domain_suffix_list.split('\n').includes(domain || '');
!auth.email.enable_verify ||
auth.email?.domain_suffix_list.split('\n').includes(domain || '');
return !isValid;
} catch (error) {
console.log('Error checking user:', error);
@@ -52,7 +52,7 @@ export default function RegisterForm({
}),
password: z.string(),
repeat_password: z.string(),
code: auth.email.email_enable_verify ? z.string() : z.string().nullish(),
code: auth.email.enable_verify ? z.string() : z.string().nullish(),
invite: invite.forced_invite ? z.string() : z.string().nullish(),
cf_token:
verify.enable_register_verify && verify.turnstile_site_key
@@ -120,7 +120,7 @@ export default function RegisterForm({
</FormItem>
)}
/>
{auth.email.email_enable_verify && (
{auth.email.enable_verify && (
<FormField
control={form.control}
name='code'
apps/admin/app/(auth)/email/reset-form.tsx
+2 -2
View File
@@ -32,7 +32,7 @@ export default function ResetForm({
const formSchema = z.object({
email: z.string().email(t('email')),
password: z.string(),
code: auth?.email?.email_enable_verify ? z.string() : z.string().nullish(),
code: auth?.email?.enable_verify ? z.string() : z.string().nullish(),
cf_token:
verify.enable_register_verify && verify.turnstile_site_key
? z.string()
@@ -72,7 +72,7 @@ export default function ResetForm({
)}
/>
{auth?.email?.email_enable_verify && (
{auth?.email?.enable_verify && (
<FormField
control={form.control}
name='code'
apps/admin/app/dashboard/auth-control/apple/page.tsx
+14 -9
View File
@@ -1,6 +1,6 @@
'use client';
import { getOAuthByPlatform, updateOAuthConfig } from '@/services/admin/system';
import { getAuthMethodConfig, updateAuthMethodConfig } from '@/services/admin/authMethod';
import { useQuery } from '@tanstack/react-query';
import { Label } from '@workspace/ui/components/label';
import { Switch } from '@workspace/ui/components/switch';
@@ -14,21 +14,21 @@ export default function Page() {
const t = useTranslations('apple');
const { data, refetch } = useQuery({
queryKey: ['getOAuthByPlatform', 'apple'],
queryKey: ['getAuthMethodConfig', 'apple'],
queryFn: async () => {
const { data } = await getOAuthByPlatform({
platform: 'apple',
const { data } = await getAuthMethodConfig({
method: 'apple',
});
return data.data;
},
});
async function updateConfig(key: keyof API.UpdateOAuthConfig, value: unknown) {
async function updateConfig(key: keyof API.UpdataAuthMethodConfigRequest, value: unknown) {
try {
await updateOAuthConfig({
await updateAuthMethodConfig({
...data,
[key]: value,
} as API.UpdateOAuthConfig);
} as API.UpdataAuthMethodConfigRequest);
toast.success(t('saveSuccess'));
refetch();
} catch (error) {
@@ -132,8 +132,13 @@ export default function Page() {
<TableCell className='text-right'>
<EnhancedInput
placeholder='https://your-domain.com/v1/auth/oauth/callback/apple'
value={data?.redirect}
onValueBlur={(value) => updateConfig('redirect', value)}
value={data?.config.redirect_url}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
redirect_url: value,
})
}
/>
</TableCell>
</TableRow>
apps/admin/app/dashboard/auth-control/email/page.tsx
+208 -98
View File
@@ -1,6 +1,10 @@
'use client';
import { getEmailSmtpConfig, testEmailSmtp, updateEmailSmtpConfig } from '@/services/admin/system';
import {
getAuthMethodConfig,
testEmailSend,
updateAuthMethodConfig,
} from '@/services/admin/authMethod';
import { useQuery } from '@tanstack/react-query';
import { Button } from '@workspace/ui/components/button';
import {
@@ -23,14 +27,16 @@ import { toast } from 'sonner';
export default function Page() {
const t = useTranslations('email');
const ref = useRef<Partial<API.EmailSmtpConfig>>({});
const ref = useRef<Partial<API.AuthMethodConfig>>({});
const [email, setEmail] = useState<string>();
const { data, refetch, isFetching } = useQuery({
queryKey: ['getEmailSmtpConfig'],
queryKey: ['getAuthMethodConfig', 'email'],
queryFn: async () => {
const { data } = await getEmailSmtpConfig();
ref.current = data.data as API.EmailSmtpConfig;
const { data } = await getAuthMethodConfig({
method: 'email',
});
ref.current = data.data as API.AuthMethodConfig;
return data.data;
},
});
@@ -38,10 +44,10 @@ export default function Page() {
async function updateConfig(key: string, value: unknown) {
if (data?.[key] === value) return;
try {
await updateEmailSmtpConfig({
await updateAuthMethodConfig({
...ref.current,
[key]: value,
} as API.EmailSmtpConfig);
} as API.UpdataAuthMethodConfigRequest);
toast.success(t('saveSuccess'));
refetch();
} catch (error) {
@@ -59,94 +65,193 @@ export default function Page() {
<TabsContent value='basic'>
<Table>
<TableBody>
{[
{
key: 'email_enabled',
label: t('enable'),
description: t('enableDescription'),
component: 'switch',
},
{
key: 'enable_email_verify',
label: t('emailVerification'),
description: t('emailVerificationDescription'),
component: 'switch',
},
{
key: 'enable_email_domain_suffix',
label: t('emailSuffixWhitelist'),
description: t('emailSuffixWhitelistDescription'),
component: 'switch',
},
{
key: 'email_domain_suffix_list',
label: t('whitelistSuffixes'),
description: t('whitelistSuffixesDescription'),
component: 'textarea',
},
{
key: 'email_smtp_host',
label: t('smtpServerAddress'),
description: t('smtpServerAddressDescription'),
},
{
key: 'email_smtp_port',
label: t('smtpServerPort'),
description: t('smtpServerPortDescription'),
type: 'number',
},
{
key: 'email_smtp_ssl',
label: t('smtpEncryptionMethod'),
description: t('smtpEncryptionMethodDescription'),
component: 'switch',
},
{
key: 'email_smtp_user',
label: t('smtpAccount'),
description: t('smtpAccountDescription'),
},
{
key: 'email_smtp_pass',
label: t('smtpPassword'),
description: t('smtpPasswordDescription'),
type: 'password',
},
{
key: 'email_smtp_from',
label: t('senderAddress'),
description: t('senderAddressDescription'),
},
].map(({ key, label, description, type = 'text', component = 'input' }) => (
<TableRow key={key}>
<TableCell className={component === 'textarea' ? 'align-top' : undefined}>
<Label>{label}</Label>
<p className='text-muted-foreground text-xs'>{description}</p>
</TableCell>
<TableCell className='text-right'>
{component === 'input' ? (
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={data?.[key]}
type={type}
onValueBlur={(value) => updateConfig(key, value)}
/>
) : component === 'switch' ? (
<Switch
checked={data?.[key]}
onCheckedChange={(checked) => updateConfig(key, checked)}
/>
) : (
<Textarea
className='h-32'
placeholder={t('whitelistSuffixesPlaceholder')}
defaultValue={data?.[key]}
onBlur={(e) => updateConfig(key, e.target.value)}
/>
)}
</TableCell>
</TableRow>
))}
<TableRow>
<TableCell>
<Label>{t('enable')}</Label>
<p className='text-muted-foreground text-xs'>{t('enableDescription')}</p>
</TableCell>
<TableCell className='text-right'>
<Switch
checked={data?.enabled}
onCheckedChange={(checked) => updateConfig('enabled', checked)}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('emailVerification')}</Label>
<p className='text-muted-foreground text-xs'>{t('emailVerificationDescription')}</p>
</TableCell>
<TableCell className='text-right'>
<Switch
checked={data?.config?.enable_verify}
onCheckedChange={(checked) =>
updateConfig('config', { ...data?.config, enable_verify: checked })
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('emailSuffixWhitelist')}</Label>
<p className='text-muted-foreground text-xs'>
{t('emailSuffixWhitelistDescription')}
</p>
</TableCell>
<TableCell className='text-right'>
<Switch
checked={data?.config?.enable_domain_suffix}
onCheckedChange={(checked) =>
updateConfig('config', { ...data?.config, enable_domain_suffix: checked })
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell className='align-top'>
<Label>{t('whitelistSuffixes')}</Label>
<p className='text-muted-foreground text-xs'>{t('whitelistSuffixesDescription')}</p>
</TableCell>
<TableCell className='text-right'>
<Textarea
className='h-32'
placeholder={t('whitelistSuffixesPlaceholder')}
defaultValue={data?.config?.domain_suffix_list}
onBlur={(e) =>
updateConfig('config', { ...data?.config, domain_suffix_list: e.target.value })
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('smtpServerAddress')}</Label>
<p className='text-muted-foreground text-xs'>{t('smtpServerAddressDescription')}</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={data?.config?.platform_config?.host}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.platform_config,
host: value,
},
})
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('smtpServerPort')}</Label>
<p className='text-muted-foreground text-xs'>{t('smtpServerPortDescription')}</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={data?.config?.platform_config?.port}
type='number'
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.platform_config,
port: value,
},
})
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('smtpEncryptionMethod')}</Label>
<p className='text-muted-foreground text-xs'>
{t('smtpEncryptionMethodDescription')}
</p>
</TableCell>
<TableCell className='text-right'>
<Switch
checked={data?.config?.platform_config?.ssl}
onCheckedChange={(checked) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.platform_config,
ssl: checked,
},
})
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('smtpAccount')}</Label>
<p className='text-muted-foreground text-xs'>{t('smtpAccountDescription')}</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={data?.config?.platform_config?.user}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.platform_config,
user: value,
},
})
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('smtpPassword')}</Label>
<p className='text-muted-foreground text-xs'>{t('smtpPasswordDescription')}</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={data?.config?.platform_config?.pass}
type='password'
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.platform_config,
pass: value,
},
})
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('senderAddress')}</Label>
<p className='text-muted-foreground text-xs'>{t('senderAddressDescription')}</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={data?.config?.platform_config?.from}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.platform_config,
from: value,
},
})
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('sendTestEmail')}</Label>
@@ -164,7 +269,7 @@ export default function Page() {
onClick={async () => {
if (!email) return;
try {
await testEmailSmtp({ email });
await testEmailSend({ email });
toast.success(t('sendSuccess'));
} catch {
toast.error(t('sendFailure'));
@@ -193,8 +298,13 @@ export default function Page() {
<CardContent>
<HTMLEditor
placeholder={t('inputPlaceholder')}
value={data?.[templateKey as keyof API.EmailSmtpConfig] as string}
onBlur={(value) => updateConfig(templateKey, value)}
value={data?.config?.[templateKey] as string}
onBlur={(value) =>
updateConfig('config', {
...data?.config,
[templateKey]: value,
})
}
/>
</CardContent>
</Card>
apps/admin/app/dashboard/auth-control/facebook/page.tsx
+14 -9
View File
@@ -1,6 +1,6 @@
'use client';
import { getOAuthByPlatform, updateOAuthConfig } from '@/services/admin/system';
import { getAuthMethodConfig, updateAuthMethodConfig } from '@/services/admin/authMethod';
import { useQuery } from '@tanstack/react-query';
import { Label } from '@workspace/ui/components/label';
import { Switch } from '@workspace/ui/components/switch';
@@ -13,21 +13,21 @@ export default function Page() {
const t = useTranslations('facebook');
const { data, refetch } = useQuery({
queryKey: ['getOAuthByPlatform', 'facebook'],
queryKey: ['getAuthMethodConfig', 'facebook'],
queryFn: async () => {
const { data } = await getOAuthByPlatform({
platform: 'facebook',
const { data } = await getAuthMethodConfig({
method: 'facebook',
});
return data.data;
},
});
async function updateConfig(key: keyof API.UpdateOAuthConfig, value: unknown) {
async function updateConfig(key: keyof API.UpdataAuthMethodConfigRequest, value: unknown) {
try {
await updateOAuthConfig({
await updateAuthMethodConfig({
...data,
[key]: value,
} as API.UpdateOAuthConfig);
} as API.UpdataAuthMethodConfigRequest);
toast.success(t('saveSuccess'));
refetch();
} catch (error) {
@@ -94,8 +94,13 @@ export default function Page() {
<TableCell className='text-right'>
<EnhancedInput
placeholder='https://your-domain.com/v1/auth/oauth/callback/facebook'
value={data?.redirect}
onValueBlur={(value) => updateConfig('redirect', value)}
value={data?.config.redirect_url}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
redirect_url: value,
})
}
/>
</TableCell>
</TableRow>
apps/admin/app/dashboard/auth-control/github/page.tsx
+14 -9
View File
@@ -1,6 +1,6 @@
'use client';
import { getOAuthByPlatform, updateOAuthConfig } from '@/services/admin/system';
import { getAuthMethodConfig, updateAuthMethodConfig } from '@/services/admin/authMethod';
import { useQuery } from '@tanstack/react-query';
import { Label } from '@workspace/ui/components/label';
import { Switch } from '@workspace/ui/components/switch';
@@ -13,21 +13,21 @@ export default function Page() {
const t = useTranslations('github');
const { data, refetch } = useQuery({
queryKey: ['getOAuthByPlatform', 'github'],
queryKey: ['getAuthMethodConfig', 'github'],
queryFn: async () => {
const { data } = await getOAuthByPlatform({
platform: 'github',
const { data } = await getAuthMethodConfig({
method: 'github',
});
return data.data;
},
});
async function updateConfig(key: keyof API.UpdateOAuthConfig, value: unknown) {
async function updateConfig(key: keyof API.UpdataAuthMethodConfigRequest, value: unknown) {
try {
await updateOAuthConfig({
await updateAuthMethodConfig({
...data,
[key]: value,
} as API.UpdateOAuthConfig);
} as API.UpdataAuthMethodConfigRequest);
toast.success(t('saveSuccess'));
refetch();
} catch (error) {
@@ -93,8 +93,13 @@ export default function Page() {
<TableCell className='text-right'>
<EnhancedInput
placeholder='https://your-domain.com/v1/auth/oauth/callback/github'
value={data?.redirect}
onValueBlur={(value) => updateConfig('redirect', value)}
value={data?.config.redirect_url}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
redirect_url: value,
})
}
/>
</TableCell>
</TableRow>
apps/admin/app/dashboard/auth-control/google/page.tsx
+14 -9
View File
@@ -1,6 +1,6 @@
'use client';
import { getOAuthByPlatform, updateOAuthConfig } from '@/services/admin/system';
import { getAuthMethodConfig, updateAuthMethodConfig } from '@/services/admin/authMethod';
import { useQuery } from '@tanstack/react-query';
import { Label } from '@workspace/ui/components/label';
import { Switch } from '@workspace/ui/components/switch';
@@ -13,21 +13,21 @@ export default function Page() {
const t = useTranslations('google');
const { data, refetch } = useQuery({
queryKey: ['getOAuthByPlatform', 'google'],
queryKey: ['getAuthMethodConfig', 'google'],
queryFn: async () => {
const { data } = await getOAuthByPlatform({
platform: 'google',
const { data } = await getAuthMethodConfig({
method: 'google',
});
return data.data;
},
});
async function updateConfig(key: keyof API.UpdateOAuthConfig, value: unknown) {
async function updateConfig(key: keyof API.UpdataAuthMethodConfigRequest, value: unknown) {
try {
await updateOAuthConfig({
await updateAuthMethodConfig({
...data,
[key]: value,
} as API.UpdateOAuthConfig);
} as API.UpdataAuthMethodConfigRequest);
toast.success(t('saveSuccess'));
refetch();
} catch (error) {
@@ -94,8 +94,13 @@ export default function Page() {
<TableCell className='text-right'>
<EnhancedInput
placeholder='https://your-domain.com/v1/auth/oauth/callback/google'
value={data?.redirect}
onValueBlur={(value) => updateConfig('redirect', value)}
value={data?.config.redirect_url}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
redirect_url: value,
})
}
/>
</TableCell>
</TableRow>
apps/admin/app/dashboard/auth-control/phone/page.tsx
+180 -60
View File
@@ -1,13 +1,13 @@
'use client';
import { ProTable, ProTableActions } from '@/components/pro-table';
import { getSmsList } from '@/services/admin/sms';
import {
getSmsConfig,
getAuthMethodConfig,
getSmsPlatform,
testSmsSend,
updateSmsConfig,
} from '@/services/admin/system';
updateAuthMethodConfig,
} from '@/services/admin/authMethod';
import { getSmsList } from '@/services/admin/sms';
import { useQuery } from '@tanstack/react-query';
import { Badge } from '@workspace/ui/components/badge';
import { Button } from '@workspace/ui/components/button';
@@ -25,6 +25,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '@workspace/ui/componen
import { Textarea } from '@workspace/ui/components/textarea';
import { AreaCodeSelect } from '@workspace/ui/custom-components/area-code-select';
import { EnhancedInput } from '@workspace/ui/custom-components/enhanced-input';
import TagInput from '@workspace/ui/custom-components/tag-input';
import { formatDate } from '@workspace/ui/utils';
import { useTranslations } from 'next-intl';
import Link from 'next/link';
@@ -34,9 +35,11 @@ import { toast } from 'sonner';
export default function Page() {
const t = useTranslations('phone');
const { data, refetch, isFetching } = useQuery({
queryKey: ['getSmsConfig'],
queryKey: ['getAuthMethodConfig', 'mobile'],
queryFn: async () => {
const { data } = await getSmsConfig();
const { data } = await getAuthMethodConfig({
method: 'mobile',
});
return data.data;
},
});
@@ -49,25 +52,27 @@ export default function Page() {
},
});
const selectedPlatform = platforms?.find((platform) => platform.platform === data?.sms_platform);
const selectedPlatform = platforms?.find(
(platform) => platform.platform === data?.config?.platform,
);
const { platform_url, platform_field_description: platformConfig } = selectedPlatform ?? {};
async function updateConfig(key: string, value: unknown) {
if (data?.[key] === value) return;
try {
await updateSmsConfig({
await updateAuthMethodConfig({
...data,
[key]: value,
} as API.SmsConfig);
} as API.UpdataAuthMethodConfigRequest);
toast.success(t('updateSuccess'));
refetch();
} catch (error) {
/* empty */
}
}
const [params, setParams] = useState<API.SendSmsRequest>({
const [params, setParams] = useState<API.TestSmsSendRequest>({
telephone: '',
content: t('testSmsContent'),
area_code: '1',
});
@@ -88,8 +93,8 @@ export default function Page() {
</TableCell>
<TableCell className='text-right'>
<Switch
checked={data?.sms_enabled}
onCheckedChange={(checked) => updateConfig('sms_enabled', checked)}
checked={data?.enabled}
onCheckedChange={(checked) => updateConfig('enabled', checked)}
disabled={isFetching}
/>
</TableCell>
@@ -103,8 +108,13 @@ export default function Page() {
<EnhancedInput
type='number'
min={0}
value={data?.sms_expire_time ?? 300}
onValueBlur={(value) => updateConfig('sms_expire_time', value)}
value={data?.config?.expire_time ?? 300}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
expire_time: value,
})
}
suffix='S'
disabled={isFetching}
placeholder={t('placeholders.expireTime')}
@@ -119,9 +129,14 @@ export default function Page() {
<TableCell className='text-right'>
<EnhancedInput
type='number'
value={data?.sms_interval ?? 60}
value={data?.config?.interval ?? 60}
min={0}
onValueBlur={(value) => updateConfig('sms_interval', value)}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
interval: value,
})
}
suffix='S'
disabled={isFetching}
placeholder={t('placeholders.interval')}
@@ -136,14 +151,48 @@ export default function Page() {
<TableCell className='text-right'>
<EnhancedInput
type='number'
value={data?.sms_limit ?? 20}
value={data?.config?.limit ?? 20}
min={0}
onValueBlur={(value) => updateConfig('sms_limit', value)}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
limit: value,
})
}
disabled={isFetching}
placeholder={t('placeholders.limit')}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('whitelistValidation')}</Label>
<p className='text-muted-foreground text-xs'>{t('whitelistValidationTip')}</p>
</TableCell>
<TableCell className='text-right'>
<Switch
defaultValue={data?.config?.enable_whitelist}
onCheckedChange={(checked) =>
updateConfig('config', { ...data?.config, enable_whitelist: checked })
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('whitelistAreaCode')}</Label>
<p className='text-muted-foreground text-xs'>{t('whitelistAreaCodeTip')}</p>
</TableCell>
<TableCell className='w-1/2 text-right'>
<TagInput
placeholder='1, 852, 886, 888'
value={data?.config?.whitelist || []}
onChange={(value) =>
updateConfig('config', { ...data?.config, whitelist: value })
}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>{t('platform')}</Label>
@@ -151,8 +200,13 @@ export default function Page() {
</TableCell>
<TableCell className='flex items-center gap-1 text-right'>
<Select
value={data?.sms_platform}
onValueChange={(value) => updateConfig('sms_platform', value)}
value={data?.platform}
onValueChange={(value) =>
updateConfig('config', {
...data?.config,
platform: value,
})
}
disabled={isFetching}
>
<SelectTrigger>
@@ -177,70 +231,128 @@ export default function Page() {
</TableRow>
<TableRow>
<TableCell>
<Label>Key</Label>
<Label>{t('accessLabel')}</Label>
<p className='text-muted-foreground text-xs'>
{t('platformConfigTip', { key: platformConfig?.sms_key })}
{t('platformConfigTip', { key: platformConfig?.access })}
</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
value={data?.sms_key ?? ''}
onValueBlur={(value) => updateConfig('sms_key', value)}
value={data?.config?.platform_config.access ?? ''}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.config?.platform_config,
access: value,
},
})
}
disabled={isFetching}
placeholder={t('platformConfigTip', { key: platformConfig?.sms_key })}
placeholder={t('platformConfigTip', { key: platformConfig?.access })}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<Label>Secret</Label>
<p className='text-muted-foreground text-xs'>
{t('platformConfigTip', { key: platformConfig?.sms_secret })}
</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
value={data?.sms_secret ?? ''}
onValueBlur={(value) => updateConfig('sms_secret', value)}
disabled={isFetching}
type='password'
placeholder={t('platformConfigTip', { key: platformConfig?.sms_secret })}
/>
</TableCell>
</TableRow>
{platformConfig?.sms_template_code && (
{platformConfig?.endpoint && (
<TableRow>
<TableCell>
<Label>{t('templateCode')}</Label>
<Label>{t('endpointLabel')}</Label>
<p className='text-muted-foreground text-xs'>
{t('platformConfigTip', { key: platformConfig?.sms_template_code })}
{t('platformConfigTip', { key: platformConfig?.endpoint })}
</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
value={data?.sms_template_code ?? ''}
onValueBlur={(value) => updateConfig('sms_template_code', value)}
value={data?.config?.platform_config.endpoint ?? ''}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.config?.platform_config,
endpoint: value,
},
})
}
disabled={isFetching}
placeholder={t('platformConfigTip', { key: platformConfig?.sms_template_code })}
placeholder={t('platformConfigTip', { key: platformConfig?.endpoint })}
/>
</TableCell>
</TableRow>
)}
{platformConfig?.sms_template_param && (
<TableRow>
<TableCell>
<Label>{t('secretLabel')}</Label>
<p className='text-muted-foreground text-xs'>
{t('platformConfigTip', { key: platformConfig?.secret })}
</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
value={data?.config?.platform_config?.secret ?? ''}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.config?.platform_config,
secret: value,
},
})
}
disabled={isFetching}
type='password'
placeholder={t('platformConfigTip', { key: platformConfig?.secret })}
/>
</TableCell>
</TableRow>
{platformConfig?.template_code && (
<TableRow>
<TableCell>
<Label>{t('templateParam')}</Label>
<Label>{t('templateCodeLabel')}</Label>
<p className='text-muted-foreground text-xs'>
{t('platformConfigTip', { key: platformConfig?.sms_template_param })}
{t('platformConfigTip', { key: platformConfig?.template_code })}
</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
value={data?.sms_template_param ?? 'code'}
onValueBlur={(value) => updateConfig('sms_template_param', value)}
value={data?.config?.platform_config?.template_code ?? 'code'}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.config?.platform_config,
template_code: value,
},
})
}
disabled={isFetching}
placeholder={t('platformConfigTip', { key: platformConfig?.template_code })}
/>
</TableCell>
</TableRow>
)}
{platformConfig?.sign_name && (
<TableRow>
<TableCell>
<Label>{t('signNameLabel')}</Label>
<p className='text-muted-foreground text-xs'>
{t('platformConfigTip', { key: platformConfig?.sign_name })}
</p>
</TableCell>
<TableCell className='text-right'>
<EnhancedInput
value={data?.config?.platform_config?.sign_name ?? ''}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.config?.platform_config,
sign_name: value,
},
})
}
disabled={isFetching}
placeholder={t('platformConfigTip', {
key: platformConfig?.sms_template_param,
key: platformConfig?.sign_name,
})}
/>
</TableCell>
@@ -250,15 +362,23 @@ export default function Page() {
<TableCell>
<Label>{t('template')}</Label>
<p className='text-muted-foreground text-xs'>
{t('templateTip', { code: platformConfig?.sms_template })}
{t('templateTip', { code: platformConfig?.code_variable })}
</p>
</TableCell>
<TableCell className='text-right'>
<Textarea
defaultValue={data?.sms_template ?? ''}
onBlur={(e) => updateConfig('sms_template', e.target.value)}
defaultValue={data?.platform_config?.template ?? ''}
onBlur={(e) =>
updateConfig('config', {
...data?.config,
platform_config: {
...data?.config?.platform_config,
template: e.target.value,
},
})
}
disabled={isFetching}
placeholder={t('placeholders.template', { code: platformConfig?.sms_template })}
placeholder={t('placeholders.template', { code: platformConfig?.code_variable })}
/>
</TableCell>
</TableRow>
@@ -315,7 +435,7 @@ function LogsTable() {
const ref = useRef<ProTableActions>(null);
return (
<ProTable<API.Sms, { telephone: string }>
<ProTable<API.SMS, { telephone: string }>
action={ref}
header={{
title: t('SmsList'),
apps/admin/app/dashboard/auth-control/telegram/page.tsx
+14 -9
View File
@@ -1,6 +1,6 @@
'use client';
import { getOAuthByPlatform, updateOAuthConfig } from '@/services/admin/system';
import { getAuthMethodConfig, updateAuthMethodConfig } from '@/services/admin/authMethod';
import { useQuery } from '@tanstack/react-query';
import { Label } from '@workspace/ui/components/label';
import { Switch } from '@workspace/ui/components/switch';
@@ -13,21 +13,21 @@ export default function Page() {
const t = useTranslations('telegram');
const { data, refetch } = useQuery({
queryKey: ['getOAuthByPlatform', 'telegram'],
queryKey: ['getAuthMethodConfig', 'telegram'],
queryFn: async () => {
const { data } = await getOAuthByPlatform({
platform: 'telegram',
const { data } = await getAuthMethodConfig({
method: 'telegram',
});
return data.data;
},
});
async function updateConfig(key: keyof API.UpdateOAuthConfig, value: unknown) {
async function updateConfig(key: keyof API.UpdataAuthMethodConfigRequest, value: unknown) {
try {
await updateOAuthConfig({
await updateAuthMethodConfig({
...data,
[key]: value,
} as API.UpdateOAuthConfig);
} as API.UpdataAuthMethodConfigRequest);
toast.success(t('saveSuccess'));
refetch();
} catch (error) {
@@ -94,8 +94,13 @@ export default function Page() {
<TableCell className='text-right'>
<EnhancedInput
placeholder='https://your-domain.com/v1/auth/oauth/callback/telegram'
value={data?.redirect}
onValueBlur={(value) => updateConfig('redirect', value)}
value={data?.config.redirect_url}
onValueBlur={(value) =>
updateConfig('config', {
...data?.config,
redirect_url: value,
})
}
/>
</TableCell>
</TableRow>
apps/admin/app/dashboard/order/page.tsx
+1 -1
View File
@@ -17,7 +17,7 @@ import { cn } from '@workspace/ui/lib/utils';
import { formatDate } from '@workspace/ui/utils';
import { UserDetail } from '../user/user-detail';
export default function Page(props: { userId?: string }) {
export default function Page(props: any) {
const t = useTranslations('order');
const statusOptions = [
apps/admin/app/dashboard/user/[id]/page.tsx
+1 -1
View File
@@ -5,7 +5,7 @@ import UserLoginHistory from './user-login-history';
import { UserProfileForm } from './user-profile';
import UserSubscription from './user-subscription';
export default async function Page({ params }: { params: Promise<{ id: string }> }) {
export default async function Page({ params }: { params: Promise<{ id: number }> }) {
const t = await getTranslations('user');
const { id } = await params;
return (
apps/admin/app/dashboard/user/[id]/user-subscription/index.tsx
+5 -1
View File
@@ -30,12 +30,14 @@ export default function UserSubscription({ userId }: { userId: number }) {
loading={loading}
userId={userId}
onSubmit={async (values) => {
setLoading(true);
await createUserSubscribe({
user_id: userId,
...values,
});
toast.success(t('createSuccess'));
ref.current?.refresh();
setLoading(false);
return true;
}}
/>
@@ -122,6 +124,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
userId={userId}
initialData={row}
onSubmit={async (values) => {
setLoading(true);
await updateUserSubscribe({
user_id: userId,
user_subscribe_id: row.id,
@@ -129,6 +132,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
});
toast.success(t('updateSuccess'));
ref.current?.refresh();
setLoading(false);
return true;
}}
/>,
@@ -144,7 +148,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
title={t('confirmDelete')}
description={t('deleteSubscriptionDescription')}
onConfirm={async () => {
console.log('删除订阅:', row.id);
console.log('Delete subscription:', row.id);
}}
cancelText={t('cancel')}
confirmText={t('confirm')}