From 69deaf99699107b3a07f51c061a203e0bd63becc Mon Sep 17 00:00:00 2001
From: Marek Maslowski <marek1.maslowski@gmail.com>
Date: Fri, 3 Apr 2026 17:41:40 +0200
Subject: [PATCH] removing uneccessary login in admin.ts

---
 server/src/routes/admin.ts | 92 +++-----------------------------------
 1 file changed, 6 insertions(+), 86 deletions(-)

diff --git a/server/src/routes/admin.ts b/server/src/routes/admin.ts
index 86896ab..530a967 100644
--- a/server/src/routes/admin.ts
+++ b/server/src/routes/admin.ts
@@ -1,7 +1,6 @@
 import express, { Request, Response } from 'express';
 import { authenticate, adminOnly } from '../middleware/auth';
-import { db } from '../db/database';
-import { AuthRequest, Addon } from '../types';
+import { AuthRequest } from '../types';
 import { writeAudit, getClientIp, logInfo } from '../services/auditLog';
 import * as svc from '../services/adminService';
 
@@ -265,100 +264,21 @@ router.delete('/packing-templates/:templateId/items/:itemId', (req: Request, res
 // ── Addons ─────────────────────────────────────────────────────────────────
 
 router.get('/addons', (_req: Request, res: Response) => {
-  const addons = db.prepare('SELECT * FROM addons ORDER BY sort_order, id').all() as Addon[];
-  const providers = db.prepare(`
-    SELECT id, name, description, icon, enabled, config, sort_order
-    FROM photo_providers
-    ORDER BY sort_order, id
-  `).all() as Array<{ id: string; name: string; description?: string | null; icon: string; enabled: number; config: string; sort_order: number }>;
-  const fields = db.prepare(`
-    SELECT provider_id, field_key, label, input_type, placeholder, required, secret, settings_key, payload_key, sort_order
-    FROM photo_provider_fields
-    ORDER BY sort_order, id
-  `).all() as Array<{
-    provider_id: string;
-    field_key: string;
-    label: string;
-    input_type: string;
-    placeholder?: string | null;
-    required: number;
-    secret: number;
-    settings_key?: string | null;
-    payload_key?: string | null;
-    sort_order: number;
-  }>;
-  const fieldsByProvider = new Map<string, typeof fields>();
-  for (const field of fields) {
-    const arr = fieldsByProvider.get(field.provider_id) || [];
-    arr.push(field);
-    fieldsByProvider.set(field.provider_id, arr);
-  }
-
-  res.json({
-    addons: [
-      ...addons.map(a => ({ ...a, enabled: !!a.enabled, config: JSON.parse(a.config || '{}') })),
-      ...providers.map(p => ({
-        id: p.id,
-        name: p.name,
-        description: p.description,
-        type: 'photo_provider',
-        icon: p.icon,
-        enabled: !!p.enabled,
-        config: JSON.parse(p.config || '{}'),
-        fields: (fieldsByProvider.get(p.id) || []).map(f => ({
-          key: f.field_key,
-          label: f.label,
-          input_type: f.input_type,
-          placeholder: f.placeholder || '',
-          required: !!f.required,
-          secret: !!f.secret,
-          settings_key: f.settings_key || null,
-          payload_key: f.payload_key || null,
-          sort_order: f.sort_order,
-        })),
-        sort_order: p.sort_order,
-      })),
-    ],
-  });
+  res.json({ addons: svc.listAddons() });
 });
 
 router.put('/addons/:id', (req: Request, res: Response) => {
-  const addon = db.prepare('SELECT * FROM addons WHERE id = ?').get(req.params.id) as Addon | undefined;
-  const provider = db.prepare('SELECT * FROM photo_providers WHERE id = ?').get(req.params.id) as { id: string; name: string; description?: string | null; icon: string; enabled: number; config: string; sort_order: number } | undefined;
-  if (!addon && !provider) return res.status(404).json({ error: 'Addon not found' });
-  const { enabled, config } = req.body;
-  if (addon) {
-    if (enabled !== undefined) db.prepare('UPDATE addons SET enabled = ? WHERE id = ?').run(enabled ? 1 : 0, req.params.id);
-    if (config !== undefined) db.prepare('UPDATE addons SET config = ? WHERE id = ?').run(JSON.stringify(config), req.params.id);
-  } else {
-    if (enabled !== undefined) db.prepare('UPDATE photo_providers SET enabled = ? WHERE id = ?').run(enabled ? 1 : 0, req.params.id);
-    if (config !== undefined) db.prepare('UPDATE photo_providers SET config = ? WHERE id = ?').run(JSON.stringify(config), req.params.id);
-  }
-  const updatedAddon = db.prepare('SELECT * FROM addons WHERE id = ?').get(req.params.id) as Addon | undefined;
-  const updatedProvider = db.prepare('SELECT * FROM photo_providers WHERE id = ?').get(req.params.id) as { id: string; name: string; description?: string | null; icon: string; enabled: number; config: string; sort_order: number } | undefined;
-  const updated = updatedAddon
-    ? { ...updatedAddon, enabled: !!updatedAddon.enabled, config: JSON.parse(updatedAddon.config || '{}') }
-    : updatedProvider
-      ? {
-        id: updatedProvider.id,
-        name: updatedProvider.name,
-        description: updatedProvider.description,
-        type: 'photo_provider',
-        icon: updatedProvider.icon,
-        enabled: !!updatedProvider.enabled,
-        config: JSON.parse(updatedProvider.config || '{}'),
-        sort_order: updatedProvider.sort_order,
-      }
-      : null;
+  const result = svc.updateAddon(req.params.id, req.body || {});
+  if ('error' in result) return res.status(result.status!).json({ error: result.error });
   const authReq = req as AuthRequest;
   writeAudit({
     userId: authReq.user.id,
     action: 'admin.addon_update',
     resource: String(req.params.id),
     ip: getClientIp(req),
-    details: { enabled: req.body.enabled, config: req.body.config },
+    details: result.auditDetails,
   });
-  res.json({ addon: updated });
+  res.json({ addon: result.addon });
 });
 
 // ── MCP Tokens ─────────────────────────────────────────────────────────────