v0.7.4 bug fixes

backend/src/index.js

@@ -21,7 +21,14 @@ const PORT = process.env.PORT || 3000;
 // Init DB
 initDb();
 seedAdmin();
-getOrCreateSupportGroup(); // Ensure Support group exists
+// Ensure Support group exists and all admins are members
+const supportGroupId = getOrCreateSupportGroup();
+if (supportGroupId) {
+  const db = getDb();
+  const admins = db.prepare("SELECT id FROM users WHERE role = 'admin' AND status = 'active'").all();
+  const insert = db.prepare('INSERT OR IGNORE INTO group_members (group_id, user_id) VALUES (?, ?)');
+  for (const a of admins) insert.run(supportGroupId, a.id);
+}
 
 // Middleware
 app.use(cors());

backend/src/routes/about.js

@@ -29,6 +29,9 @@ router.get('/', (req, res) => {
     ...DEFAULTS,
     ...overrides,
     version: process.env.JAMA_VERSION || process.env.TEAMCHAT_VERSION || 'dev',
+    // Always expose original app identity — not overrideable via about.json or settings
+    default_app_name: 'jama',
+    default_logo: '/icons/jama.png',
   };
 
   // Never expose docker_image — removed from UI

backend/src/routes/users.js

@@ -3,7 +3,7 @@ const bcrypt = require('bcryptjs');
 const multer = require('multer');
 const path = require('path');
 const router = express.Router();
-const { getDb, addUserToPublicGroups } = require('../models/db');
+const { getDb, addUserToPublicGroups, getOrCreateSupportGroup } = require('../models/db');
 const { authMiddleware, adminMiddleware } = require('../middleware/auth');
 
 const avatarStorage = multer.diskStorage({
@@ -121,6 +121,13 @@ router.post('/', authMiddleware, adminMiddleware, (req, res) => {
   `).run(resolvedName, email, hash, role === 'admin' ? 'admin' : 'member');
 
   addUserToPublicGroups(result.lastInsertRowid);
+  // Admin users are automatically added to the Support group
+  if (role === 'admin') {
+    const supportGroupId = getOrCreateSupportGroup();
+    if (supportGroupId) {
+      db.prepare('INSERT OR IGNORE INTO group_members (group_id, user_id) VALUES (?, ?)').run(supportGroupId, result.lastInsertRowid);
+    }
+  }
   const user = db.prepare('SELECT id, name, email, role, status, must_change_password, created_at FROM users WHERE id = ?').get(result.lastInsertRowid);
   res.json({ user });
 });
@@ -151,8 +158,15 @@ router.post('/bulk', authMiddleware, adminMiddleware, (req, res) => {
       const resolvedName = resolveUniqueName(db, name);
       const pw = (u.password || '').trim() || defaultPw;
       const hash = bcrypt.hashSync(pw, 10);
-      const r = insertUser.run(resolvedName, email, hash, u.role === 'admin' ? 'admin' : 'member');
+      const newRole = u.role === 'admin' ? 'admin' : 'member';
+      const r = insertUser.run(resolvedName, email, hash, newRole);
       addUserToPublicGroups(r.lastInsertRowid);
+      if (newRole === 'admin') {
+        const supportGroupId = getOrCreateSupportGroup();
+        if (supportGroupId) {
+          db.prepare('INSERT OR IGNORE INTO group_members (group_id, user_id) VALUES (?, ?)').run(supportGroupId, r.lastInsertRowid);
+        }
+      }
       results.created.push(email);
     } catch (e) {
       results.skipped.push({ email, reason: e.message });
@@ -184,6 +198,13 @@ router.patch('/:id/role', authMiddleware, adminMiddleware, (req, res) => {
   if (target.is_default_admin) return res.status(403).json({ error: 'Cannot modify default admin role' });
   if (!['member', 'admin'].includes(role)) return res.status(400).json({ error: 'Invalid role' });
   db.prepare("UPDATE users SET role = ?, updated_at = datetime('now') WHERE id = ?").run(role, target.id);
+  // If promoted to admin, ensure they're in the Support group
+  if (role === 'admin') {
+    const supportGroupId = getOrCreateSupportGroup();
+    if (supportGroupId) {
+      db.prepare('INSERT OR IGNORE INTO group_members (group_id, user_id) VALUES (?, ?)').run(supportGroupId, target.id);
+    }
+  }
   res.json({ success: true });
 });