@mostajs/auth 1.0.2 → 1.0.4

package/dist/index.d.ts

@@ -1,21 +1,7 @@
-export { createAuthHandlers } from './lib/auth';
-export { createAuthChecks } from './lib/auth-check';
-export { createAuthMiddleware } from './middleware/auth-middleware';
-export type { AuthMiddlewareOptions } from './middleware/auth-middleware';
-export { hashPassword, comparePassword } from './lib/password';
-export { hasPermission, getPermissionsForRole } from './lib/permissions';
-export { getPermissionsForRoleFromDB } from './lib/permissions-server';
-export { seedRBAC } from './lib/rbac-seed';
-export type { SeedRBACOptions } from './lib/rbac-seed';
-export { UserSchema } from './schemas/user.schema';
-export { RoleSchema } from './schemas/role.schema';
-export { PermissionSchema } from './schemas/permission.schema';
-export { PermissionCategorySchema } from './schemas/permission-category.schema';
-export { UserRepository } from './repositories/user.repository';
-export { RoleRepository } from './repositories/role.repository';
-export { PermissionRepository } from './repositories/permission.repository';
-export { PermissionCategoryRepository } from './repositories/permission-category.repository';
+export { hasPermission, hasAllPermissions, hasAnyPermission } from '@mostajs/socle';
+export { UserSchema, RoleSchema, PermissionSchema, PermissionCategorySchema } from '@mostajs/rbac';
 export { usePermissions } from './hooks/usePermissions';
 export { default as PermissionGuard } from './components/PermissionGuard';
 export { default as SessionProvider } from './components/SessionProvider';
-export type { MostaAuthConfig, PermissionDefinition, RoleDefinition, CategoryDefinition, UserDTO, RoleDTO, PermissionDTO, PermissionCategoryDTO, } from './types/index';
+export type { UserDTO, RoleDTO, PermissionDTO, PermissionCategoryDTO, PermissionDefinition, RoleDefinition, CategoryDefinition, } from '@mostajs/rbac';
+export type { MostaAuthConfig } from './types/index';

package/dist/index.js

@@ -1,27 +1,10 @@
-// @mosta/auth — Barrel exports
+// @mostajs/auth — Client-safe barrel (NO ORM imports)
 // Author: Dr Hamid MADANI drmdh@msn.com
-// Auth factory
-export { createAuthHandlers } from './lib/auth';
-export { createAuthChecks } from './lib/auth-check';
-export { createAuthMiddleware } from './middleware/auth-middleware';
-// Password utils
-export { hashPassword, comparePassword } from './lib/password';
-// Permission helpers (client-safe)
-export { hasPermission, getPermissionsForRole } from './lib/permissions';
-// Server-side permission DB lookup
-export { getPermissionsForRoleFromDB } from './lib/permissions-server';
-// RBAC seed
-export { seedRBAC } from './lib/rbac-seed';
-// Schemas
-export { UserSchema } from './schemas/user.schema';
-export { RoleSchema } from './schemas/role.schema';
-export { PermissionSchema } from './schemas/permission.schema';
-export { PermissionCategorySchema } from './schemas/permission-category.schema';
-// Repositories
-export { UserRepository } from './repositories/user.repository';
-export { RoleRepository } from './repositories/role.repository';
-export { PermissionRepository } from './repositories/permission.repository';
-export { PermissionCategoryRepository } from './repositories/permission-category.repository';
+// For server-side code (repos, seed, auth handlers), use '@mostajs/auth/server'
+// Permission helpers (from @mostajs/socle — no ORM)
+export { hasPermission, hasAllPermissions, hasAnyPermission } from '@mostajs/socle';
+// Schemas (re-export from rbac — pure data, no ORM)
+export { UserSchema, RoleSchema, PermissionSchema, PermissionCategorySchema } from '@mostajs/rbac';
 // Hooks
 export { usePermissions } from './hooks/usePermissions';
 // Components

package/dist/lib/auth-check.js

@@ -1,8 +1,8 @@
 // @mosta/auth — Server-side auth guards
 // Author: Dr Hamid MADANI drmdh@msn.com
 import { NextResponse } from 'next/server';
-import { hasPermission } from './permissions';
-import { getPermissionsForRoleFromDB } from './permissions-server';
+import { hasPermission } from '@mostajs/socle';
+import { getPermissionsForRoleFromDB } from '@mostajs/rbac/lib/permissions-server';
 /**
  * Create server-side guard functions bound to your auth() instance.
  *

package/dist/lib/auth.js

@@ -1,16 +1,13 @@
-// @mosta/auth — NextAuth configuration factory
+// @mostajs/auth — NextAuth configuration factory
 // Author: Dr Hamid MADANI drmdh@msn.com
+// Phase 3: schemas/repos imported from @mostajs/rbac
 import NextAuth from 'next-auth';
 import CredentialsProvider from 'next-auth/providers/credentials';
 import { getDialect, registerSchemas } from '@mostajs/orm';
-import { UserRepository } from '../repositories/user.repository';
-import { RoleRepository } from '../repositories/role.repository';
+import { UserRepository, RoleRepository } from '@mostajs/rbac/server';
+import { UserSchema, RoleSchema, PermissionSchema, PermissionCategorySchema } from '@mostajs/rbac';
 import { comparePassword } from './password';
-import { UserSchema } from '../schemas/user.schema';
-import { RoleSchema } from '../schemas/role.schema';
-import { PermissionSchema } from '../schemas/permission.schema';
-import { PermissionCategorySchema } from '../schemas/permission-category.schema';
-// Auto-register auth schemas into ORM registry (idempotent)
+// Auto-register RBAC schemas into ORM registry (idempotent)
 // Must run before getDialect() to ensure relations are resolvable
 registerSchemas([UserSchema, RoleSchema, PermissionSchema, PermissionCategorySchema]);
 /**

package/dist/lib/permissions-server.d.ts

@@ -1,5 +1 @@
-/**
- * Resolve permissions for a role by querying the database.
- * Falls back to the provided static map if DB lookup fails.
- */
-export declare function getPermissionsForRoleFromDB(role: string, fallbackMap?: Record<string, string[]>): Promise<string[]>;
+export { getPermissionsForRoleFromDB } from '@mostajs/rbac/lib/permissions-server';

package/dist/lib/permissions-server.js

@@ -1,24 +1,4 @@
-// @mosta/auth — Server-side permission lookup (DO NOT import client-side)
+// @mostajs/auth — Server-side permission lookup (DO NOT import client-side)
 // Author: Dr Hamid MADANI drmdh@msn.com
-import { getDialect } from '@mostajs/orm';
-import { RoleRepository } from '../repositories/role.repository';
-/**
- * Resolve permissions for a role by querying the database.
- * Falls back to the provided static map if DB lookup fails.
- */
-export async function getPermissionsForRoleFromDB(role, fallbackMap) {
-    try {
-        const repo = new RoleRepository(await getDialect());
-        const dbRole = await repo.findByName(role);
-        if (dbRole) {
-            const roleWithPerms = await repo.findByIdWithPermissions(dbRole.id);
-            if (roleWithPerms?.permissions && roleWithPerms.permissions.length > 0) {
-                return roleWithPerms.permissions.map((p) => typeof p === 'string' ? p : p.name || p);
-            }
-        }
-    }
-    catch (err) {
-        console.error('[MostaAuth] DB permission lookup failed, using fallback:', err);
-    }
-    return fallbackMap?.[role] || [];
-}
+// Phase 3: re-exports from @mostajs/rbac (repos moved there)
+export { getPermissionsForRoleFromDB } from '@mostajs/rbac/lib/permissions-server';

package/dist/register.d.ts

@@ -0,0 +1,4 @@
+import type { ModuleRegistration } from '@mostajs/socle';
+export declare function register(registry: {
+    register(r: ModuleRegistration): void;
+}): void;

package/dist/register.js

@@ -0,0 +1,19 @@
+// @mostajs/auth — Runtime module registration
+// Author: Dr Hamid MADANI drmdh@msn.com
+// Phase 3: schemas/repos moved to @mostajs/rbac. Auth is pure authentication.
+export function register(registry) {
+    registry.register({
+        manifest: {
+            name: 'auth',
+            package: '@mostajs/auth',
+            version: '2.0.0',
+            type: 'core',
+            priority: 3,
+            dependencies: ['orm', 'rbac'],
+            displayName: 'Auth',
+            description: 'Authentication — NextAuth, password hashing, session management',
+            icon: 'Lock',
+            register: './dist/register.js',
+        },
+    });
+}

package/dist/server.d.ts

@@ -0,0 +1,9 @@
+export { createAuthHandlers } from './lib/auth';
+export { createAuthChecks } from './lib/auth-check';
+export { createAuthMiddleware } from './middleware/auth-middleware';
+export type { AuthMiddlewareOptions } from './middleware/auth-middleware';
+export { hashPassword, comparePassword } from './lib/password';
+export { getPermissionsForRoleFromDB } from '@mostajs/rbac/lib/permissions-server';
+export { seedRBAC } from '@mostajs/rbac/lib/rbac-seed';
+export type { SeedRBACOptions } from '@mostajs/rbac/lib/rbac-seed';
+export { UserRepository, RoleRepository, PermissionRepository, PermissionCategoryRepository } from '@mostajs/rbac/server';

package/dist/server.js

@@ -0,0 +1,15 @@
+// @mostajs/auth/server — Server-side exports (ORM-dependent)
+// Author: Dr Hamid MADANI drmdh@msn.com
+// Import from '@mostajs/auth/server' in API routes and server code
+// Auth handler factories (depend on ORM via rbac repos)
+export { createAuthHandlers } from './lib/auth';
+export { createAuthChecks } from './lib/auth-check';
+export { createAuthMiddleware } from './middleware/auth-middleware';
+// Password utils
+export { hashPassword, comparePassword } from './lib/password';
+// Server-side permission DB lookup (re-export from rbac/server)
+export { getPermissionsForRoleFromDB } from '@mostajs/rbac/lib/permissions-server';
+// RBAC seed (re-export from rbac/server)
+export { seedRBAC } from '@mostajs/rbac/lib/rbac-seed';
+// Repositories (re-export from rbac/server)
+export { UserRepository, RoleRepository, PermissionRepository, PermissionCategoryRepository } from '@mostajs/rbac/server';

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
+import type { PermissionDefinition, RoleDefinition, CategoryDefinition } from '@mostajs/rbac';
 export interface MostaAuthConfig {
     /** Extra fields to add to the User schema */
     extraUserFields?: Record<string, any>;
@@ -17,63 +18,3 @@ export interface MostaAuthConfig {
     /** Protected path prefixes (redirect to login if no session) */
     protectedPrefixes?: string[];
 }
-export interface PermissionDefinition {
-    code: string;
-    name: string;
-    description: string;
-    category: string;
-}
-export interface RoleDefinition {
-    name: string;
-    description: string;
-    system: boolean;
-    permissions: string[];
-}
-export interface CategoryDefinition {
-    name: string;
-    label: string;
-    description: string;
-    icon: string;
-    order: number;
-    system: boolean;
-}
-export interface UserDTO {
-    id: string;
-    email: string;
-    password?: string;
-    firstName: string;
-    lastName: string;
-    phone?: string;
-    roles: any[];
-    status: 'active' | 'locked' | 'disabled';
-    lastLoginAt?: string;
-    createdAt: string;
-    updatedAt: string;
-}
-export interface RoleDTO {
-    id: string;
-    name: string;
-    description?: string;
-    permissions: any[];
-    createdAt: string;
-    updatedAt: string;
-}
-export interface PermissionDTO {
-    id: string;
-    name: string;
-    description?: string;
-    category?: string;
-    createdAt: string;
-    updatedAt: string;
-}
-export interface PermissionCategoryDTO {
-    id: string;
-    name: string;
-    label: string;
-    description?: string;
-    icon?: string;
-    order: number;
-    system: boolean;
-    createdAt: string;
-    updatedAt: string;
-}

package/dist/types/index.js

@@ -1,3 +1,5 @@
-// @mosta/auth — Types
+// @mostajs/auth — Types
 // Author: Dr Hamid MADANI drmdh@msn.com
+// Phase 3: DTOs and RBAC definitions moved to @mostajs/rbac.
+// Only auth-specific config remains here.
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mostajs/auth",
-  "version": "1.0.2",
-  "description": "Reusable authentication and RBAC module — NextAuth + Users + Roles + Permissions",
+  "version": "1.0.4",
+  "description": "Authentication — NextAuth, password hashing, session management",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "MIT",
   "type": "module",
@@ -38,11 +38,6 @@
       "import": "./dist/lib/auth-check.js",
       "default": "./dist/lib/auth-check.js"
     },
-    "./lib/permissions": {
-      "types": "./dist/lib/permissions.d.ts",
-      "import": "./dist/lib/permissions.js",
-      "default": "./dist/lib/permissions.js"
-    },
     "./lib/permissions-server": {
       "types": "./dist/lib/permissions-server.d.ts",
       "import": "./dist/lib/permissions-server.js",
@@ -53,19 +48,25 @@
       "import": "./dist/lib/password.js",
       "default": "./dist/lib/password.js"
     },
-    "./lib/rbac-seed": {
-      "types": "./dist/lib/rbac-seed.d.ts",
-      "import": "./dist/lib/rbac-seed.js",
-      "default": "./dist/lib/rbac-seed.js"
-    },
     "./middleware/auth-middleware": {
       "types": "./dist/middleware/auth-middleware.d.ts",
       "import": "./dist/middleware/auth-middleware.js",
       "default": "./dist/middleware/auth-middleware.js"
+    },
+    "./server": {
+      "types": "./dist/server.d.ts",
+      "import": "./dist/server.js",
+      "default": "./dist/server.js"
+    },
+    "./register": {
+      "types": "./dist/register.d.ts",
+      "import": "./dist/register.js",
+      "default": "./dist/register.js"
     }
   },
   "files": [
     "dist",
+    "wire.json",
     "LICENSE",
     "README.md"
   ],
@@ -96,11 +97,15 @@
     "bcryptjs": "^2.4.3"
   },
   "peerDependencies": {
+    "@mostajs/rbac": ">=1.0.0",
+    "@mostajs/socle": ">=2.0.0",
     "next": ">=14",
     "next-auth": ">=5.0.0-beta.25",
     "react": ">=18"
   },
   "devDependencies": {
+    "@mostajs/rbac": "^1.0.4",
+    "@mostajs/socle": "^2.0.0",
     "@types/bcryptjs": "^2.4.0",
     "@types/node": "^25.3.3",
     "@types/react": "^19.0.0",

package/wire.json

@@ -0,0 +1,12 @@
+{
+  "name": "auth",
+  "package": "@mostajs/auth",
+  "version": "2.0.0",
+  "type": "core",
+  "priority": 3,
+  "dependencies": ["orm", "rbac"],
+  "displayName": "Auth",
+  "description": "Authentication — NextAuth, password hashing, session management",
+  "icon": "Lock",
+  "register": "./dist/register.js"
+}