@mostajs/auth 1.0.4 → 2.0.2

package/dist/helpers/permissions.d.ts

@@ -0,0 +1,3 @@
+export declare function hasPermission(userPermissions: string[], requiredPermission: string): boolean;
+export declare function hasAllPermissions(userPermissions: string[], requiredPermissions: string[]): boolean;
+export declare function hasAnyPermission(userPermissions: string[], requiredPermissions: string[]): boolean;

package/dist/helpers/permissions.js

@@ -0,0 +1,16 @@
+// Permission helpers — pure utility functions (zero dependencies)
+// Originates from @mostajs/socle — inlined here to avoid the dependency
+// Author: Dr Hamid MADANI drmdh@msn.com
+export function hasPermission(userPermissions, requiredPermission) {
+    if (!userPermissions || userPermissions.length === 0)
+        return false;
+    if (userPermissions.includes('*'))
+        return true;
+    return userPermissions.includes(requiredPermission);
+}
+export function hasAllPermissions(userPermissions, requiredPermissions) {
+    return requiredPermissions.every(p => hasPermission(userPermissions, p));
+}
+export function hasAnyPermission(userPermissions, requiredPermissions) {
+    return requiredPermissions.some(p => hasPermission(userPermissions, p));
+}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { hasPermission, hasAllPermissions, hasAnyPermission } from '@mostajs/socle';
+export { hasPermission, hasAllPermissions, hasAnyPermission } from './helpers/permissions';
 export { UserSchema, RoleSchema, PermissionSchema, PermissionCategorySchema } from '@mostajs/rbac';
 export { usePermissions } from './hooks/usePermissions';
 export { default as PermissionGuard } from './components/PermissionGuard';

package/dist/index.js

@@ -1,8 +1,8 @@
 // @mostajs/auth — Client-safe barrel (NO ORM imports)
 // Author: Dr Hamid MADANI drmdh@msn.com
 // 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';
+// Permission helpers (pure utilities — no external dependency)
+export { hasPermission, hasAllPermissions, hasAnyPermission } from './helpers/permissions';
 // Schemas (re-export from rbac — pure data, no ORM)
 export { UserSchema, RoleSchema, PermissionSchema, PermissionCategorySchema } from '@mostajs/rbac';
 // Hooks

package/dist/lib/auth-check.js

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

package/dist/lib/auth.js

@@ -3,13 +3,8 @@
 // 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, RoleRepository } from '@mostajs/rbac/server';
-import { UserSchema, RoleSchema, PermissionSchema, PermissionCategorySchema } from '@mostajs/rbac';
+import { getRbacRepos } from '@mostajs/rbac/lib/repos-factory';
 import { comparePassword } from './password';
-// Auto-register RBAC schemas into ORM registry (idempotent)
-// Must run before getDialect() to ensure relations are resolvable
-registerSchemas([UserSchema, RoleSchema, PermissionSchema, PermissionCategorySchema]);
 /**
  * Create NextAuth handlers configured for MostaAuth RBAC.
  *
@@ -38,8 +33,8 @@ export function createAuthHandlers(rolePermissions, config) {
                 async authorize(credentials) {
                     if (!credentials?.email || !credentials?.password)
                         return null;
-                    const uRepo = new UserRepository(await getDialect());
-                    const user = await uRepo.findByEmail(credentials.email);
+                    const { users } = await getRbacRepos();
+                    const user = await users.findByEmail(credentials.email);
                     if (!user)
                         return null;
                     if (user.status !== 'active')
@@ -47,7 +42,7 @@ export function createAuthHandlers(rolePermissions, config) {
                     const valid = await comparePassword(credentials.password, user.password);
                     if (!valid)
                         return null;
-                    await uRepo.updateLastLogin(user.id);
+                    await users.updateLastLogin(user.id);
                     const { roleNames, permissions } = await resolveUserPermissions(user.id, rolePermissions);
                     return {
                         id: user.id,
@@ -100,9 +95,8 @@ export function createAuthHandlers(rolePermissions, config) {
 // ─── Internal: resolve user→roles→permissions ─────────────────
 async function resolveUserPermissions(userId, fallbackMap) {
     try {
-        const uRepo = new UserRepository(await getDialect());
-        const rRepo = new RoleRepository(await getDialect());
-        const userWithRoles = await uRepo.findByIdWithRoles(userId);
+        const { users, roles: rolesRepo } = await getRbacRepos();
+        const userWithRoles = await users.findByIdWithRoles(userId);
         if (userWithRoles?.roles?.length) {
             const roleNames = [];
             const permissions = [];
@@ -112,7 +106,7 @@ async function resolveUserPermissions(userId, fallbackMap) {
                 if (roleName)
                     roleNames.push(roleName);
                 if (roleId) {
-                    const roleWithPerms = await rRepo.findByIdWithPermissions(roleId);
+                    const roleWithPerms = await rolesRepo.findByIdWithPermissions(roleId);
                     if (roleWithPerms?.permissions) {
                         for (const perm of roleWithPerms.permissions) {
                             const permName = typeof perm === 'string' ? perm : perm?.name;

package/dist/register.d.ts

@@ -1,4 +1,9 @@
-import type { ModuleRegistration } from '@mostajs/socle';
+/** Minimal registration shape — avoids hard dependency on @mostajs/socle */
+interface ModuleRegistrationLike {
+    manifest: Record<string, unknown>;
+    [key: string]: unknown;
+}
 export declare function register(registry: {
-    register(r: ModuleRegistration): void;
+    register(r: ModuleRegistrationLike): void;
 }): void;
+export {};

package/dist/server.d.ts

@@ -6,4 +6,7 @@ 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 { createAdmin } from '@mostajs/rbac/lib/create-admin';
+export type { CreateAdminOptions, CreateAdminResult } from '@mostajs/rbac/lib/create-admin';
+export { getSchemas, moduleInfo } from '@mostajs/rbac/lib/module-info';
 export { UserRepository, RoleRepository, PermissionRepository, PermissionCategoryRepository } from '@mostajs/rbac/server';

package/dist/server.js

@@ -11,5 +11,9 @@ export { hashPassword, comparePassword } from './lib/password';
 export { getPermissionsForRoleFromDB } from '@mostajs/rbac/lib/permissions-server';
 // RBAC seed (re-export from rbac/server)
 export { seedRBAC } from '@mostajs/rbac/lib/rbac-seed';
+// Create admin (re-export from rbac — auth delegates to rbac for user creation)
+export { createAdmin } from '@mostajs/rbac/lib/create-admin';
+// Module schemas (re-export from rbac — auth has no own schemas)
+export { getSchemas, moduleInfo } from '@mostajs/rbac/lib/module-info';
 // Repositories (re-export from rbac/server)
 export { UserRepository, RoleRepository, PermissionRepository, PermissionCategoryRepository } from '@mostajs/rbac/server';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/auth",
-  "version": "1.0.4",
+  "version": "2.0.2",
   "description": "Authentication — NextAuth, password hashing, session management",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "MIT",
@@ -93,19 +93,18 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@mostajs/orm": "^1.0.0",
+    "@mostajs/net": "^2.0.0",
+    "@mostajs/orm": "^1.7.0",
     "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",
+    "@mostajs/rbac": "^2.0.3",
     "@types/bcryptjs": "^2.4.0",
     "@types/node": "^25.3.3",
     "@types/react": "^19.0.0",