fix idp on started

2026-06-24 16:53:06 +03:00
parent d16eccb4c2
commit e60d55f6bd
15 changed files with 709 additions and 52 deletions
--- a/apps/frontend/app/admin/settings/page.tsx
+++ b/apps/frontend/app/admin/settings/page.tsx
@@ -9,7 +9,8 @@ import { useToast } from '@/components/id/toast-provider';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { apiFetch, buildSystemSettingPayload, SocialProvider, SystemSetting } from '@/lib/api';
-import { getSettingMeta, sortSettingsByCatalog, SYSTEM_SETTING_GROUPS } from '@/lib/system-settings-catalog';
+import { getSettingMeta, isSettingVisible, MESSAGING_SETTING_KEYS, sortSettingsByCatalog, SYSTEM_SETTING_GROUPS } from '@/lib/system-settings-catalog';
+import { MessagingSettingsSection } from '@/components/id/messaging-settings-section';

 function parseBoolean(value: string) {
  return ['true', '1', 'yes'].includes(value.trim().toLowerCase());
@@ -41,6 +42,7 @@ export default function AdminSettingsPage() {
  const groupedSettings = useMemo(() => {
    const groups = new Map<string, SystemSetting[]>();
    for (const setting of settings) {
+      if (MESSAGING_SETTING_KEYS.includes(setting.key)) continue;
      const meta = getSettingMeta(setting.key);
      const group = meta?.group ?? 'other';
      const list = groups.get(group) ?? [];
@@ -126,7 +128,7 @@ export default function AdminSettingsPage() {
            <section key={groupKey} className="mb-10">
              <h3 className="mb-4 text-xl font-medium">{SYSTEM_SETTING_GROUPS[groupKey] ?? 'Прочие настройки'}</h3>
              <div className="space-y-3">
-                {groupSettings.map((setting) => {
+                {groupSettings.filter((setting) => isSettingVisible(setting, settings)).map((setting) => {
                  const meta = getSettingMeta(setting.key);
                  const label = meta?.label ?? setting.key;
                  const type = meta?.type ?? 'text';
@@ -153,6 +155,18 @@ export default function AdminSettingsPage() {
                            >
                              {parseBoolean(setting.value) ? <ToggleRight className="h-9 w-9 text-green-600" /> : <ToggleLeft className="h-9 w-9 text-[#a8adbc]" />}
                            </button>
+                          ) : type === 'select' ? (
+                            <select
+                              className="h-10 rounded-xl border border-[#e4e7ec] bg-white px-3 text-sm outline-none focus:border-[#98a2b3]"
+                              value={setting.value}
+                              onChange={(event) => updateSettingValue(setting.key, event.target.value)}
+                            >
+                              {(meta?.options ?? []).map((option) => (
+                                <option key={option.value} value={option.value}>
+                                  {option.label}
+                                </option>
+                              ))}
+                            </select>
                          ) : (
                            <div className="flex items-center gap-2">
                              <Input
@@ -178,6 +192,15 @@ export default function AdminSettingsPage() {
            </section>
          ))}

+          <MessagingSettingsSection
+            settings={settings}
+            token={token}
+            savingKey={savingKey}
+            onUpdateValue={updateSettingValue}
+            onSave={saveSetting}
+            showToast={showToast}
+          />
+
          <section className="mt-10">
            <h3 className="text-xl font-medium">OAuth Social Providers</h3>
            <div className="mt-4 grid gap-4 md:grid-cols-2">
--- a/apps/frontend/components/id/messaging-settings-section.tsx
+++ b/apps/frontend/components/id/messaging-settings-section.tsx
@@ -0,0 +1,212 @@
+'use client';
+
+import { Loader2, Mail, MessageSquare, Save, Send, ToggleLeft, ToggleRight } from 'lucide-react';
+import { useMemo, useState } from 'react';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { PhoneInput, phoneCountries } from '@/components/ui/phone-input';
+import { apiFetch, buildSystemSettingPayload, SystemSetting } from '@/lib/api';
+import { getSettingMeta, isSettingVisible, MESSAGING_SETTING_KEYS } from '@/lib/system-settings-catalog';
+
+function parseBoolean(value: string) {
+  return ['true', '1', 'yes'].includes(value.trim().toLowerCase());
+}
+
+interface MessagingSettingsSectionProps {
+  settings: SystemSetting[];
+  token: string | null;
+  savingKey: string | null;
+  onUpdateValue: (key: string, value: string) => void;
+  onSave: (setting: SystemSetting) => Promise<void>;
+  showToast: (message: string) => void;
+}
+
+function getSettingValue(settings: SystemSetting[], key: string) {
+  return settings.find((item) => item.key === key)?.value ?? '';
+}
+
+function shouldShowMessagingField(setting: SystemSetting, settings: SystemSetting[]) {
+  if (!isSettingVisible(setting, settings)) return false;
+
+  const provider = getSettingValue(settings, 'SMS_PROVIDER');
+  if (setting.key === 'SMS_API_KEY') return provider === 'smsru';
+  if (setting.key === 'SMS_LOGIN' || setting.key === 'SMS_PASSWORD') return provider === 'smsc';
+
+  const emailProvider = getSettingValue(settings, 'EMAIL_PROVIDER');
+  if (setting.key.startsWith('EMAIL_SMTP_') || setting.key.startsWith('EMAIL_FROM_')) {
+    return parseBoolean(getSettingValue(settings, 'EMAIL_ENABLED')) && emailProvider === 'smtp';
+  }
+  if (setting.key === 'EMAIL_PROVIDER') {
+    return parseBoolean(getSettingValue(settings, 'EMAIL_ENABLED'));
+  }
+  if (setting.key === 'SMS_PROVIDER') {
+    return parseBoolean(getSettingValue(settings, 'SMS_ENABLED'));
+  }
+
+  return true;
+}
+
+export function MessagingSettingsSection({
+  settings,
+  token,
+  savingKey,
+  onUpdateValue,
+  onSave,
+  showToast
+}: MessagingSettingsSectionProps) {
+  const [testEmail, setTestEmail] = useState('');
+  const [testPhone, setTestPhone] = useState('');
+  const [testPhoneCountry, setTestPhoneCountry] = useState(phoneCountries[0]);
+  const [testingChannel, setTestingChannel] = useState<'email' | 'sms' | null>(null);
+
+  const messagingSettings = useMemo(
+    () => settings.filter((item) => MESSAGING_SETTING_KEYS.includes(item.key)),
+    [settings]
+  );
+
+  async function sendTest(channel: 'email' | 'sms') {
+    if (!token) return;
+    const target = channel === 'email' ? testEmail.trim() : `${testPhoneCountry.code}${testPhone}`;
+    if (!target) {
+      showToast(channel === 'email' ? 'Укажите email для теста' : 'Укажите номер телефона для теста');
+      return;
+    }
+
+    setTestingChannel(channel);
+    try {
+      const response = await apiFetch<{ message?: string }>(
+        '/admin/settings/messaging/test',
+        {
+          method: 'POST',
+          body: JSON.stringify({ channel, target })
+        },
+        token
+      );
+      showToast(response.message ?? 'Тестовое сообщение отправлено');
+    } catch (error) {
+      showToast(error instanceof Error ? error.message : 'Не удалось отправить тестовое сообщение');
+    } finally {
+      setTestingChannel(null);
+    }
+  }
+
+  const emailEnabled = parseBoolean(getSettingValue(messagingSettings, 'EMAIL_ENABLED'));
+  const smsEnabled = parseBoolean(getSettingValue(messagingSettings, 'SMS_ENABLED'));
+
+  return (
+    <section className="mb-10">
+      <div className="mb-4 flex items-center gap-3">
+        <MessageSquare className="h-6 w-6" />
+        <div>
+          <h3 className="text-xl font-medium">Email и SMS провайдеры</h3>
+          <p className="mt-1 text-sm text-[#667085]">
+            Настройте SMTP и SMS — OTP-коды при входе и регистрации будут отправляться автоматически.
+          </p>
+        </div>
+      </div>
+
+      <div className="space-y-3">
+        {messagingSettings.filter((setting) => shouldShowMessagingField(setting, messagingSettings)).map((setting) => {
+          const meta = getSettingMeta(setting.key);
+          const label = meta?.label ?? setting.key;
+          const type = meta?.type ?? 'text';
+
+          return (
+            <div key={setting.key} className="rounded-[24px] bg-[#f4f5f8] p-5">
+              <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+                <div className="min-w-0 flex-1">
+                  <div className="font-semibold">{label}</div>
+                  <p className="mt-1 text-sm text-[#667085]">{meta?.hint ?? setting.description ?? setting.key}</p>
+                </div>
+
+                <div className="flex flex-wrap items-center gap-3">
+                  {type === 'boolean' ? (
+                    <button
+                      type="button"
+                      aria-label={label}
+                      onClick={() => onUpdateValue(setting.key, parseBoolean(setting.value) ? 'false' : 'true')}
+                    >
+                      {parseBoolean(setting.value) ? <ToggleRight className="h-9 w-9 text-green-600" /> : <ToggleLeft className="h-9 w-9 text-[#a8adbc]" />}
+                    </button>
+                  ) : type === 'select' ? (
+                    <select
+                      className="h-10 rounded-xl border border-[#e4e7ec] bg-white px-3 text-sm outline-none focus:border-[#98a2b3]"
+                      value={setting.value}
+                      onChange={(event) => onUpdateValue(setting.key, event.target.value)}
+                    >
+                      {(meta?.options ?? []).map((option) => (
+                        <option key={option.value} value={option.value}>
+                          {option.label}
+                        </option>
+                      ))}
+                    </select>
+                  ) : (
+                    <div className="flex items-center gap-2">
+                      <Input
+                        type={setting.isSecret ? 'password' : type === 'number' ? 'number' : 'text'}
+                        value={setting.value}
+                        className={setting.isSecret ? 'w-[240px] bg-white' : 'w-[220px] bg-white'}
+                        onChange={(event) => onUpdateValue(setting.key, event.target.value)}
+                      />
+                      {meta?.unit ? <span className="text-sm text-[#667085]">{meta.unit}</span> : null}
+                    </div>
+                  )}
+
+                  <Button disabled={savingKey === setting.key} onClick={() => void onSave(setting)}>
+                    {savingKey === setting.key ? <Loader2 className="h-4 w-4 animate-spin" /> : <Save className="h-4 w-4" />}
+                    Сохранить
+                  </Button>
+                </div>
+              </div>
+            </div>
+          );
+        })}
+      </div>
+
+      <div className="mt-6 grid gap-4 md:grid-cols-2">
+        <div className="rounded-[24px] border border-[#e4e7ec] bg-white p-5">
+          <div className="flex items-center gap-2 font-semibold">
+            <Mail className="h-5 w-5" />
+            Тест email
+          </div>
+          <p className="mt-2 text-sm text-[#667085]">
+            {emailEnabled ? 'Отправит тестовый OTP-код через SMTP.' : 'Сначала включите Email и сохраните настройки SMTP.'}
+          </p>
+          <Input
+            className="mt-4 bg-[#f9fafb]"
+            type="email"
+            placeholder="admin@example.com"
+            value={testEmail}
+            onChange={(event) => setTestEmail(event.target.value)}
+          />
+          <Button className="mt-3" disabled={!emailEnabled || testingChannel === 'email'} onClick={() => void sendTest('email')}>
+            {testingChannel === 'email' ? <Loader2 className="h-4 w-4 animate-spin" /> : <Send className="h-4 w-4" />}
+            Отправить тест
+          </Button>
+        </div>
+
+        <div className="rounded-[24px] border border-[#e4e7ec] bg-white p-5">
+          <div className="flex items-center gap-2 font-semibold">
+            <MessageSquare className="h-5 w-5" />
+            Тест SMS
+          </div>
+          <p className="mt-2 text-sm text-[#667085]">
+            {smsEnabled ? 'Отправит тестовый OTP-код через SMS-провайдера.' : 'Сначала включите SMS и сохраните ключ API.'}
+          </p>
+          <div className="mt-4">
+            <PhoneInput
+              country={testPhoneCountry}
+              value={testPhone}
+              onCountryChange={setTestPhoneCountry}
+              onValueChange={setTestPhone}
+            />
+          </div>
+          <Button className="mt-3" disabled={!smsEnabled || testingChannel === 'sms'} onClick={() => void sendTest('sms')}>
+            {testingChannel === 'sms' ? <Loader2 className="h-4 w-4 animate-spin" /> : <Send className="h-4 w-4" />}
+            Отправить тест
+          </Button>
+        </div>
+      </div>
+    </section>
+  );
+}
--- a/apps/frontend/lib/system-settings-catalog.ts
+++ b/apps/frontend/lib/system-settings-catalog.ts
@@ -1,4 +1,4 @@
-export type SystemSettingFieldType = 'text' | 'number' | 'boolean';
+export type SystemSettingFieldType = 'text' | 'number' | 'boolean' | 'select';

 export interface SystemSettingMeta {
  key: string;
@@ -7,6 +7,8 @@ export interface SystemSettingMeta {
  type: SystemSettingFieldType;
  unit?: string;
  hint?: string;
+  options?: Array<{ value: string; label: string }>;
+  showWhen?: { key: string; equals: string };
 }

 export const SYSTEM_SETTING_GROUPS: Record<string, string> = {
@@ -14,6 +16,7 @@ export const SYSTEM_SETTING_GROUPS: Record<string, string> = {
  pin: 'PIN-код и блокировка сессии',
  auth: 'Аутентификация и регистрация',
  ldap: 'LDAP / Active Directory',
+  messaging: 'Email и SMS',
  limits: 'Лимиты и ограничения',
  media: 'Медиа и файлы'
 };
@@ -47,6 +50,42 @@ export const SYSTEM_SETTING_CATALOG: SystemSettingMeta[] = [
  { key: 'LDAP_USERNAME_ATTR', label: 'Атрибут логина', group: 'ldap', type: 'text' },
  { key: 'LDAP_EMAIL_ATTR', label: 'Атрибут почты', group: 'ldap', type: 'text' },
  { key: 'LDAP_DISPLAY_NAME_ATTR', label: 'Атрибут имени', group: 'ldap', type: 'text' },
+  { key: 'EMAIL_ENABLED', label: 'Email включён', group: 'messaging', type: 'boolean', hint: 'Отправка OTP-кодов на почту через SMTP' },
+  {
+    key: 'EMAIL_PROVIDER',
+    label: 'Email-провайдер',
+    group: 'messaging',
+    type: 'select',
+    options: [
+      { value: 'smtp', label: 'SMTP (Yandex, Gmail, Mail.ru и др.)' },
+      { value: 'console', label: 'Только лог (отладка)' }
+    ],
+    showWhen: { key: 'EMAIL_ENABLED', equals: 'true' }
+  },
+  { key: 'EMAIL_SMTP_HOST', label: 'SMTP-хост', group: 'messaging', type: 'text', hint: 'smtp.yandex.ru, smtp.gmail.com', showWhen: { key: 'EMAIL_ENABLED', equals: 'true' } },
+  { key: 'EMAIL_SMTP_PORT', label: 'SMTP-порт', group: 'messaging', type: 'number', unit: 'порт', showWhen: { key: 'EMAIL_ENABLED', equals: 'true' } },
+  { key: 'EMAIL_SMTP_SECURE', label: 'SMTP SSL/TLS', group: 'messaging', type: 'boolean', hint: 'Включите для порта 465', showWhen: { key: 'EMAIL_ENABLED', equals: 'true' } },
+  { key: 'EMAIL_SMTP_USER', label: 'SMTP-логин', group: 'messaging', type: 'text', showWhen: { key: 'EMAIL_ENABLED', equals: 'true' } },
+  { key: 'EMAIL_SMTP_PASSWORD', label: 'SMTP-пароль', group: 'messaging', type: 'text', hint: 'App-password для Gmail/Yandex', showWhen: { key: 'EMAIL_ENABLED', equals: 'true' } },
+  { key: 'EMAIL_FROM_ADDRESS', label: 'Email отправителя', group: 'messaging', type: 'text', hint: 'noreply@yourdomain.ru', showWhen: { key: 'EMAIL_ENABLED', equals: 'true' } },
+  { key: 'EMAIL_FROM_NAME', label: 'Имя отправителя', group: 'messaging', type: 'text', showWhen: { key: 'EMAIL_ENABLED', equals: 'true' } },
+  { key: 'SMS_ENABLED', label: 'SMS включён', group: 'messaging', type: 'boolean', hint: 'Отправка OTP-кодов по SMS' },
+  {
+    key: 'SMS_PROVIDER',
+    label: 'SMS-провайдер',
+    group: 'messaging',
+    type: 'select',
+    options: [
+      { value: 'smsru', label: 'sms.ru' },
+      { value: 'smsc', label: 'smsc.ru' },
+      { value: 'console', label: 'Только лог (отладка)' }
+    ],
+    showWhen: { key: 'SMS_ENABLED', equals: 'true' }
+  },
+  { key: 'SMS_API_KEY', label: 'API-ключ sms.ru', group: 'messaging', type: 'text', hint: 'api_id из личного кабинета sms.ru', showWhen: { key: 'SMS_ENABLED', equals: 'true' } },
+  { key: 'SMS_LOGIN', label: 'Логин smsc.ru', group: 'messaging', type: 'text', showWhen: { key: 'SMS_ENABLED', equals: 'true' } },
+  { key: 'SMS_PASSWORD', label: 'Пароль smsc.ru', group: 'messaging', type: 'text', showWhen: { key: 'SMS_ENABLED', equals: 'true' } },
+  { key: 'SMS_SENDER', label: 'Имя отправителя SMS', group: 'messaging', type: 'text', hint: 'Опционально, если одобрено провайдером', showWhen: { key: 'SMS_ENABLED', equals: 'true' } },
  { key: 'MAX_FAMILY_MEMBERS', label: 'Макс. участников семьи', group: 'limits', type: 'number' },
  { key: 'MAX_ACTIVE_SESSIONS', label: 'Макс. активных сессий', group: 'limits', type: 'number' },
  { key: 'AVATAR_URL_TTL_MINUTES', label: 'TTL ссылки на аватар', group: 'media', type: 'number', unit: 'мин' }
@@ -56,6 +95,20 @@ export function getSettingMeta(key: string) {
  return SYSTEM_SETTING_CATALOG.find((item) => item.key === key);
 }

+export function isSettingVisible(setting: { key: string; value: string }, allSettings: Array<{ key: string; value: string }>) {
+  const meta = getSettingMeta(setting.key);
+  if (!meta?.showWhen) return true;
+  const parent = allSettings.find((item) => item.key === meta.showWhen!.key);
+  const parentValue = parent?.value ?? 'false';
+  return parseBooleanValue(parentValue) === parseBooleanValue(meta.showWhen.equals);
+}
+
+function parseBooleanValue(value: string) {
+  return ['true', '1', 'yes'].includes(value.trim().toLowerCase());
+}
+
+export const MESSAGING_SETTING_KEYS = SYSTEM_SETTING_CATALOG.filter((item) => item.group === 'messaging').map((item) => item.key);
+
 export function sortSettingsByCatalog<T extends { key: string }>(settings: T[]) {
  const order = new Map(SYSTEM_SETTING_CATALOG.map((item, index) => [item.key, index]));
  return [...settings].sort((a, b) => (order.get(a.key) ?? 999) - (order.get(b.key) ?? 999));