push

package-lock.json

@@ -22,6 +22,7 @@
         "paystack-node": "*",
         "pg": "*",
         "pinata": "*",
+        "react-router-dom": "^7.9.6",
         "reflect-metadata": "*",
         "swagger-jsdoc": "*",
         "swagger-ui-express": "*",
@@ -5528,12 +5529,77 @@
         "url": "https://opencollective.com/express"
       }
     },
+    "node_modules/react": {
+      "version": "19.2.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
+      "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "19.2.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
+      "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
+      "peer": true,
+      "dependencies": {
+        "scheduler": "^0.27.0"
+      },
+      "peerDependencies": {
+        "react": "^19.2.0"
+      }
+    },
     "node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
       "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true
     },
+    "node_modules/react-router": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.9.6.tgz",
+      "integrity": "sha512-Y1tUp8clYRXpfPITyuifmSoE2vncSME18uVLgaqyxh9H35JWpIfzHo+9y3Fzh5odk/jxPW29IgLgzcdwxGqyNA==",
+      "dependencies": {
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=18",
+        "react-dom": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-router-dom": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.9.6.tgz",
+      "integrity": "sha512-2MkC2XSXq6HjGcihnx1s0DBWQETI4mlis4Ux7YTLvP67xnGxCvq+BcCQSO81qQHVUTM1V53tl4iVVaY5sReCOA==",
+      "dependencies": {
+        "react-router": "7.9.6"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=18",
+        "react-dom": ">=18"
+      }
+    },
+    "node_modules/react-router/node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -5716,6 +5782,12 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
+    "node_modules/scheduler": {
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+      "peer": true
+    },
     "node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -5760,6 +5832,11 @@
         "node": ">= 18"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
+      "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw=="
+    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",

package.json

@@ -14,45 +14,51 @@
     "type": "git",
     "url": "https://huggingface.co/spaces/nexusbert/zurri"
   },
-  "keywords": ["ai", "agents", "marketplace", "chat"],
+  "keywords": [
+    "ai",
+    "agents",
+    "marketplace",
+    "chat"
+  ],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "express": "*",
-    "typeorm": "*",
-    "pg": "*",
-    "jsonwebtoken": "*",
-    "dotenv": "*",
-    "cors": "*",
-    "helmet": "*",
-    "express-rate-limit": "*",
     "axios": "*",
-    "uuid": "*",
-    "reflect-metadata": "*",
     "bcryptjs": "*",
-    "pinata": "*",
-    "multer": "*",
+    "cors": "*",
+    "dotenv": "*",
+    "express": "*",
+    "express-rate-limit": "*",
     "form-data": "*",
-    "swagger-ui-express": "*",
+    "helmet": "*",
+    "jsonwebtoken": "*",
+    "multer": "*",
+    "paystack-node": "*",
+    "pg": "*",
+    "pinata": "*",
+    "react-router-dom": "^7.9.6",
+    "reflect-metadata": "*",
     "swagger-jsdoc": "*",
-    "paystack-node": "*"
+    "swagger-ui-express": "*",
+    "typeorm": "*",
+    "uuid": "*"
   },
   "devDependencies": {
+    "@types/bcryptjs": "*",
+    "@types/cors": "*",
     "@types/express": "*",
-    "@types/node": "*",
+    "@types/jest": "*",
     "@types/jsonwebtoken": "*",
-    "@types/cors": "*",
-    "@types/uuid": "*",
-    "@types/bcryptjs": "*",
     "@types/multer": "*",
-    "@types/jest": "*",
-    "typescript": "*",
-    "ts-node-dev": "*",
-    "jest": "*",
-    "ts-jest": "*",
-    "supertest": "*",
+    "@types/node": "*",
     "@types/supertest": "*",
+    "@types/swagger-jsdoc": "*",
     "@types/swagger-ui-express": "*",
-    "@types/swagger-jsdoc": "*"
+    "@types/uuid": "*",
+    "jest": "*",
+    "supertest": "*",
+    "ts-jest": "*",
+    "ts-node-dev": "*",
+    "typescript": "*"
   }
 }

src/scripts/createAdmin.ts

@@ -10,8 +10,13 @@ if (fs.existsSync(envPath)) {
   dotenv.config();
 }
 
-const ADMIN_EMAIL = (process.env.EMAIL || 'omezirizion@gmail.com').trim();
-const ADMIN_PASSWORD = (process.env.PASSWORD || 'Amazon1@').trim();
+const ADMIN_EMAIL = process.env.ADMIN_EMAIL?.trim();
+const ADMIN_PASSWORD = process.env.ADMIN_PASSWORD?.trim();
+
+if (!ADMIN_EMAIL || !ADMIN_PASSWORD) {
+  console.error('❌ ADMIN_EMAIL and ADMIN_PASSWORD must be set in environment variables');
+  process.exit(1);
+}
 
 console.log('📧 Admin Email:', ADMIN_EMAIL);
 console.log('🔑 Password:', ADMIN_PASSWORD ? 'SET' : 'NOT SET');
@@ -22,7 +27,82 @@ import { AppDataSource } from '../config/database';
 import { User } from '../entities/User';
 import bcrypt from 'bcryptjs';
 
+/**
+ * Initialize permanent admin user from environment variables
+ * This ensures the admin user always exists and maintains admin status
+ */
+export async function initializeAdmin(): Promise<void> {
+  const adminEmail = process.env.ADMIN_EMAIL?.trim();
+  const adminPassword = process.env.ADMIN_PASSWORD?.trim();
+
+  if (!adminEmail || !adminPassword) {
+    console.log('⚠️  ADMIN_EMAIL and ADMIN_PASSWORD not set - skipping admin initialization');
+    return;
+  }
+
+  try {
+    // Check if database is already initialized
+    if (!AppDataSource.isInitialized) {
+      await AppDataSource.initialize();
+    }
+
+    const userRepository = AppDataSource.getRepository(User);
+    
+    let user = await userRepository.findOne({ where: { email: adminEmail.toLowerCase() } });
+
+    if (user) {
+      // User exists - ensure they are admin and update password if needed
+      const needsUpdate = !user.isAdmin || !user.isActive;
+      
+      if (needsUpdate) {
+        user.isAdmin = true;
+        user.isActive = true;
+        console.log(`✅ Updated user ${adminEmail} to admin status`);
+      }
+      
+      // Always update password to match env (ensures it stays in sync)
+      const hashedPassword = await bcrypt.hash(adminPassword, 12);
+      user.password = hashedPassword;
+      
+      await userRepository.save(user);
+      console.log(`✅ Permanent admin user maintained: ${adminEmail}`);
+    } else {
+      // Create new admin user
+      const hashedPassword = await bcrypt.hash(adminPassword, 12);
+      
+      user = userRepository.create({
+        email: adminEmail.toLowerCase(),
+        password: hashedPassword,
+        name: process.env.ADMIN_NAME || 'Admin User',
+        isAdmin: true,
+        isActive: true,
+        isCreator: false,
+      });
+
+      await userRepository.save(user);
+      console.log(`✅ Permanent admin user created: ${adminEmail}`);
+    }
+  } catch (error) {
+    console.error('❌ Error initializing admin:', error);
+    if (error instanceof Error) {
+      console.error('Error message:', error.message);
+    }
+    // Don't throw - allow app to continue even if admin init fails
+  }
+}
+
+/**
+ * Standalone script to create/update admin user
+ */
 async function createAdmin() {
+  const adminEmail = ADMIN_EMAIL;
+  const adminPassword = ADMIN_PASSWORD;
+
+  if (!adminEmail || !adminPassword) {
+    console.error('❌ ADMIN_EMAIL and ADMIN_PASSWORD must be set in environment variables');
+    process.exit(1);
+  }
+
   try {
     console.log('\n🔧 Initializing database connection...');
     await AppDataSource.initialize();
@@ -30,43 +110,40 @@ async function createAdmin() {
 
     const userRepository = AppDataSource.getRepository(User);
 
-    console.log(`\n🔍 Looking for user: ${ADMIN_EMAIL}`);
+    console.log(`\n🔍 Looking for user: ${adminEmail}`);
     
-    let user = await userRepository.findOne({ where: { email: ADMIN_EMAIL.toLowerCase() } });
+    let user = await userRepository.findOne({ where: { email: adminEmail.toLowerCase() } });
 
     if (user) {
-      console.log('✅ User found, updating to admin...');
+      console.log('✅ User found, updating to permanent admin...');
       user.isAdmin = true;
       user.isActive = true;
       
-      const passwordValidation = /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]).{8,}$/;
-      if (passwordValidation.test(ADMIN_PASSWORD)) {
-        const hashedPassword = await bcrypt.hash(ADMIN_PASSWORD, 12);
-        user.password = hashedPassword;
-        console.log('✅ Password updated');
-      }
+      const hashedPassword = await bcrypt.hash(adminPassword, 12);
+      user.password = hashedPassword;
+      console.log('✅ Password updated');
       
       await userRepository.save(user);
-      console.log('✅ User updated to admin successfully!');
+      console.log('✅ User updated to permanent admin successfully!');
       console.log(`\n📧 Email: ${user.email}`);
       console.log(`👤 Admin: ${user.isAdmin}`);
       console.log(`🆔 User ID: ${user.id}`);
     } else {
-      console.log('⚠️  User not found, creating new admin user...');
+      console.log('⚠️  User not found, creating new permanent admin user...');
       
-      const hashedPassword = await bcrypt.hash(ADMIN_PASSWORD, 12);
+      const hashedPassword = await bcrypt.hash(adminPassword, 12);
       
       user = userRepository.create({
-        email: ADMIN_EMAIL.toLowerCase(),
+        email: adminEmail.toLowerCase(),
         password: hashedPassword,
-        name: 'Admin User',
+        name: process.env.ADMIN_NAME || 'Admin User',
         isAdmin: true,
         isActive: true,
         isCreator: false,
       });
 
       await userRepository.save(user);
-      console.log('✅ Admin user created successfully!');
+      console.log('✅ Permanent admin user created successfully!');
       console.log(`\n📧 Email: ${user.email}`);
       console.log(`👤 Admin: ${user.isAdmin}`);
       console.log(`🆔 User ID: ${user.id}`);
@@ -85,4 +162,7 @@ async function createAdmin() {
   }
 }
 
-createAdmin();
+// Only run if this file is executed directly (not imported)
+if (require.main === module) {
+  createAdmin();
+}

src/server.ts

@@ -21,6 +21,7 @@ if (!isHuggingFaceSpace && !isProduction) {
 import 'reflect-metadata';
 import { AppDataSource } from './config/database';
 import app from './app';
+import { initializeAdmin } from './scripts/createAdmin';
 
 const PORT = parseInt(process.env.PORT || process.env.SPACE_PORT || '7860', 10);
 
@@ -51,6 +52,9 @@ AppDataSource.initialize()
       }
     }
 
+    // Initialize permanent admin user from environment variables
+    await initializeAdmin();
+
     app.listen(PORT, '0.0.0.0', () => {
       console.log(`🚀 Server running on port ${PORT}`);
       console.log(`🌍 Server accessible at http://0.0.0.0:${PORT}`);

zurri-mock-frontend

@@ -1 +1 @@
-Subproject commit 5bd3ab29cf56611ae3a97d0fdd81f97ddb9fa1d2
+Subproject commit 05aab1df678d680e947fa3e24b05c8fd35266c7b

zurriwebsite

@@ -0,0 +1 @@
+Subproject commit 4013f080c954f64ecc95a16ae6477460eb8b0762