millas 0.2.12-beta-1 → 0.2.12-beta-2

package/src/providers/AuthServiceProvider.js

@@ -22,10 +22,11 @@ class AuthServiceProvider extends ServiceProvider {
   }
 
   async boot(container, app) {
+    const basePath = container.make('basePath') || process.cwd();
     // Load auth config
     let authConfig;
     try {
-      authConfig = require(process.cwd() + '/config/auth');
+      authConfig = require(basePath + '/config/auth');
     } catch {
       authConfig = {
         default: 'jwt',
@@ -33,12 +34,46 @@ class AuthServiceProvider extends ServiceProvider {
       };
     }
 
-    // Load the app's User model if it exists.
-    // Falls back to the built-in AuthUser so Auth always has a model to work with.
+    // ── Resolve the User model ──────────────────────────────────────────────
+    //
+    // Priority order (mirrors Django's AUTH_USER_MODEL pattern):
+    //
+    //   1. config/app.js → auth_user: 'User'
+    //      The model name is looked up in app/models/index.js exports.
+    //      This is the recommended approach — explicit and refactor-safe.
+    //
+    //   2. app/models/User.js (default export or named User export)
+    //      Conventional fallback — works if auth_user is not set and
+    //      the file exists at the default path.
+    //
+    //   3. Built-in AuthUser
+    //      Abstract base class — no table. Used only as a last resort
+    //      so Auth always has a model to work with during early dev.
+    //
     let UserModel;
     try {
-      UserModel = require(process.cwd() + '/app/models/User');
-    } catch {
+      // Step 1: read auth_user from config/app.js
+      let authUserName = null;
+      try {
+        const appConfig = require(basePath + '/config/app');
+        authUserName = appConfig.auth_user || null;
+      } catch { /* config/app.js missing or has no auth_user key */ }
+
+      if (authUserName) {
+        // Resolve by name from app/models/index.js
+        const modelsIndex = require(basePath + '/app/models/index');
+        const resolved    = modelsIndex[authUserName];
+        if (!resolved) {
+          throw new Error(
+            `[AuthServiceProvider] auth_user: '${authUserName}' not found in app/models/index.js.\n` +
+            `  Available exports: ${Object.keys(modelsIndex).join(', ')}`
+          );
+        }
+        UserModel = resolved;
+      }
+    } catch (err) {
+      if (err.message.includes('[AuthServiceProvider]')) throw err; // re-throw config errors
+      // Step 3: fall back to built-in AuthUser (abstract — no table)
       UserModel = require('../auth/AuthUser');
     }
 

package/src/providers/CacheStorageServiceProvider.js

@@ -18,7 +18,7 @@ class CacheServiceProvider extends ServiceProvider {
   async boot() {
     let cacheConfig;
     try {
-      cacheConfig = require(process.cwd() + '/config/cache');
+      cacheConfig = require((container.make('basePath') || process.cwd()) + '/config/cache');
     } catch {
       cacheConfig = {
         default: process.env.CACHE_DRIVER || 'memory',
@@ -48,7 +48,7 @@ class StorageServiceProvider extends ServiceProvider {
   async boot() {
     let storageConfig;
     try {
-      storageConfig = require(process.cwd() + '/config/storage');
+      storageConfig = require((container.make('basePath') || process.cwd()) + '/config/storage');
     } catch {
       storageConfig = {
         default: process.env.STORAGE_DRIVER || 'local',

package/src/providers/DatabaseServiceProvider.js

@@ -21,10 +21,11 @@ class DatabaseServiceProvider extends ServiceProvider {
   }
 
   async boot(container) {
+    const basePath = container.make('basePath') || process.cwd();
     // Load the database config
     let dbConfig;
     try {
-      dbConfig = require(process.cwd() + '/config/database');
+      dbConfig = require(basePath + '/config/database');
     } catch {
       // Fallback for tests / programmatic use
       dbConfig = {
@@ -42,4 +43,4 @@ class DatabaseServiceProvider extends ServiceProvider {
   }
 }
 
-module.exports = DatabaseServiceProvider;
+module.exports = DatabaseServiceProvider;

package/src/providers/LogServiceProvider.js

@@ -59,6 +59,9 @@ class LogServiceProvider extends ServiceProvider {
   beforeBoot(container) {
     let config = {};
     try {
+      // Note: beforeBoot runs before any container bindings exist.
+      // basePath is not yet available — process.cwd() is the correct fallback here.
+      // The path will be correct as long as `millas serve` is run from project root.
       config = require(process.cwd() + '/config/logging');
     } catch {
       // No config file — defaults already applied in logger/index.js
@@ -206,4 +209,4 @@ class LogServiceProvider extends ServiceProvider {
   }
 }
 
-module.exports = LogServiceProvider;
+module.exports = LogServiceProvider;

package/src/providers/MailServiceProvider.js

@@ -27,7 +27,7 @@ class MailServiceProvider extends ServiceProvider {
   async boot(container) {
     let mailConfig;
     try {
-      mailConfig = require(process.cwd() + '/config/mail');
+      mailConfig = require((container.make('basePath') || process.cwd()) + '/config/mail');
     } catch {
       mailConfig = {
         default:  process.env.MAIL_DRIVER || 'log',

package/src/providers/QueueServiceProvider.js

@@ -29,7 +29,7 @@ class QueueServiceProvider extends ServiceProvider {
   async boot(container) {
     let queueConfig;
     try {
-      queueConfig = require(process.cwd() + '/config/queue');
+      queueConfig = require((container.make('basePath') || process.cwd()) + '/config/queue');
     } catch {
       queueConfig = {
         default: process.env.QUEUE_DRIVER || 'sync',

package/src/scaffold/templates.js

@@ -68,21 +68,6 @@ storage/logs/*.log
 storage/uploads/*
 !storage/uploads/.gitkeep
 database/database.sqlite
-`,
-
-    // ─── millas.config.js ─────────────────────────────────────────
-    'millas.config.js': `'use strict';
-
-module.exports = {
-  /*
-  |--------------------------------------------------------------------------
-  | Millas Framework Configuration
-  |--------------------------------------------------------------------------
-  */
-  providers: [
-    './providers/AppServiceProvider',
-  ],
-};
 `,
 
     // ─── bootstrap/app.js ─────────────────────────────────────────
@@ -90,16 +75,30 @@ module.exports = {
 
 require('dotenv').config();
 
+const path = require('path');
 const { Millas } = require('millas');
 const AppServiceProvider = require('../providers/AppServiceProvider');
 
-module.exports = Millas.config()
-  .providers([AppServiceProvider])
+/**
+ * Application configuration and bootstrap.
+ *
+ * Millas.configure(__dirname/..) sets the project root so the framework
+ * locates config files, models, and routes without guessing.
+ *
+ * Core providers (Database, Auth, Admin, Cache, Mail, Queue, Events)
+ * are wired automatically — only add your own app providers below.
+ *
+ * First-time setup:
+ *   millas migrate          # creates system tables (users, admin_log, sessions)
+ *   millas createsuperuser  # creates your first admin panel user
+ */
+module.exports = Millas.configure(path.join(__dirname, '..'))
+  .withAdmin()
   .routes(Route => {
     require('../routes/web')(Route);
     require('../routes/api')(Route);
   })
-  .withAdmin()
+  .providers([AppServiceProvider])
   .create();
 `,
 
@@ -153,7 +152,12 @@ module.exports = {
   key: process.env.APP_KEY || '',
   debug: process.env.APP_ENV !== 'production',
   timezone: 'UTC',
-  locale: 'en',
+  locale:   'en',
+  fallback: 'en',
+
+  // Set use_i18n: true to enable the translation system.
+  // Then run: millas lang:publish <locale>
+  use_i18n: false,
 };
 `,
 
@@ -215,6 +219,50 @@ module.exports = {
     expiresIn: '1h',
   },
 };
+`,
+
+    // ─── config/admin.js ──────────────────────────────────────────
+    'config/admin.js': `'use strict';
+
+/**
+ * Admin Panel Configuration
+ *
+ * Credentials are read from environment variables by default.
+ * Set ADMIN_EMAIL and ADMIN_PASSWORD in your .env file, or define
+ * static users / a model here.
+ */
+module.exports = {
+  // URL prefix for the admin panel
+  prefix: '/admin',
+
+  // Title shown in the browser tab and sidebar
+  title: process.env.APP_NAME ? \`\${process.env.APP_NAME} Admin\` : 'Millas Admin',
+
+  auth: {
+    // ── Option 1: static user list (simple setups / local dev) ────
+    users: [
+      {
+        email:    process.env.ADMIN_EMAIL    || 'admin@example.com',
+        // Use a bcrypt hash in production; plain text is fine for local dev.
+        password: process.env.ADMIN_PASSWORD || 'change-me',
+        name:     process.env.ADMIN_NAME     || 'Admin',
+      },
+    ],
+
+    // ── Option 2: model-based lookup ──────────────────────────────
+    // Uncomment and set to any Millas Model that has email + password fields.
+    // model: require('../app/models/User'),
+
+    // ── Session cookie settings ───────────────────────────────────
+    cookieName:   'millas_admin',
+    cookieMaxAge: 60 * 60 * 8,        // 8 hours
+    rememberAge:  60 * 60 * 24 * 30,  // 30 days ("remember me")
+
+    // ── Brute-force protection ────────────────────────────────────
+    maxAttempts:    5,
+    lockoutMinutes: 15,
+  },
+};
 `,
 
     // ─── config/mail.js ───────────────────────────────────────────
@@ -264,10 +312,18 @@ class AppServiceProvider extends ServiceProvider {
   }
 
   async boot(container, app) {
-    // Register Admin resources:
+    // Register Admin resources — Admin panel is auto-mounted via .withAdmin()
     // const { Admin } = require('millas');
+    // const { AdminResource, AdminField } = require('millas');
     // const Post = require('../app/models/Post');
-    // Admin.register(Post);
+    //
+    // class PostResource extends AdminResource {
+    //   static model      = Post;
+    //   static label      = 'Posts';
+    //   static searchable = ['title', 'body'];
+    // }
+    //
+    // Admin.register(PostResource);
   }
 }