create-forgeon 0.3.16 → 0.3.18

package/src/modules/files-access.mjs

@@ -1,4 +1,4 @@
-import fs from 'node:fs';
+import fs from 'node:fs';
 import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
@@ -65,10 +65,10 @@ function patchAppModule(targetRoot) {
       content = ensureLineAfter(content, '    ForgeonFilesModule,', '    ForgeonFilesAccessModule,');
     } else if (content.includes('    ForgeonI18nModule.register({')) {
       content = ensureLineBefore(content, '    ForgeonI18nModule.register({', '    ForgeonFilesAccessModule,');
-    } else if (content.includes('    ForgeonAuthModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register({', '    ForgeonFilesAccessModule,');
-    } else if (content.includes('    ForgeonAuthModule.register(),')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register(),', '    ForgeonFilesAccessModule,');
+    } else if (content.includes('    ForgeonAccountsModule.register({')) {
+      content = ensureLineBefore(content, '    ForgeonAccountsModule.register({', '    ForgeonFilesAccessModule,');
+    } else if (content.includes('    ForgeonAccountsModule.register(),')) {
+      content = ensureLineBefore(content, '    ForgeonAccountsModule.register(),', '    ForgeonFilesAccessModule,');
     } else if (content.includes('    DbPrismaModule,')) {
       content = ensureLineAfter(content, '    DbPrismaModule,', '    ForgeonFilesAccessModule,');
     } else if (content.includes('    ForgeonLoggerModule,')) {
@@ -274,7 +274,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files/package.json packages/files/package.json',
     'COPY packages/files-local/package.json packages/files-local/package.json',
     'COPY packages/files-s3/package.json packages/files-s3/package.json',
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/rbac/package.json packages/rbac/package.json',
     'COPY packages/rate-limit/package.json packages/rate-limit/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
@@ -294,7 +294,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files packages/files',
     'COPY packages/files-local packages/files-local',
     'COPY packages/files-s3 packages/files-s3',
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/rbac packages/rbac',
     'COPY packages/rate-limit packages/rate-limit',
     'COPY packages/logger packages/logger',
@@ -373,3 +373,5 @@ export function applyFilesAccessModule({ packageRoot, targetRoot }) {
   patchApiDockerfile(targetRoot);
   patchReadme(targetRoot);
 }
+
+

package/src/modules/files-image.mjs

@@ -1,4 +1,4 @@
-import fs from 'node:fs';
+import fs from 'node:fs';
 import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
@@ -95,10 +95,10 @@ function patchAppModule(targetRoot) {
   if (!content.includes('    ForgeonFilesImageModule,')) {
     if (content.includes('    ForgeonI18nModule.register({')) {
       content = ensureLineBefore(content, '    ForgeonI18nModule.register({', '    ForgeonFilesImageModule,');
-    } else if (content.includes('    ForgeonAuthModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register({', '    ForgeonFilesImageModule,');
-    } else if (content.includes('    ForgeonAuthModule.register(),')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register(),', '    ForgeonFilesImageModule,');
+    } else if (content.includes('    ForgeonAccountsModule.register({')) {
+      content = ensureLineBefore(content, '    ForgeonAccountsModule.register({', '    ForgeonFilesImageModule,');
+    } else if (content.includes('    ForgeonAccountsModule.register(),')) {
+      content = ensureLineBefore(content, '    ForgeonAccountsModule.register(),', '    ForgeonFilesImageModule,');
     } else if (content.includes('    ForgeonFilesModule,')) {
       content = ensureLineAfter(content, '    ForgeonFilesModule,', '    ForgeonFilesImageModule,');
     } else if (content.includes('    DbPrismaModule,')) {
@@ -342,7 +342,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files/package.json packages/files/package.json',
     'COPY packages/files-local/package.json packages/files-local/package.json',
     'COPY packages/files-s3/package.json packages/files-s3/package.json',
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/rbac/package.json packages/rbac/package.json',
     'COPY packages/rate-limit/package.json packages/rate-limit/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
@@ -364,7 +364,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files packages/files',
     'COPY packages/files-local packages/files-local',
     'COPY packages/files-s3 packages/files-s3',
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/rbac packages/rbac',
     'COPY packages/rate-limit packages/rate-limit',
     'COPY packages/logger packages/logger',
@@ -508,3 +508,5 @@ export function applyFilesImageModule({ packageRoot, targetRoot }) {
     'FILES_IMAGE_ALLOWED_MIME_TYPES=image/jpeg,image/png,image/webp',
   ]);
 }
+
+

package/src/modules/files-local.mjs

@@ -9,8 +9,10 @@ import {
   ensureLineBefore,
   ensureLoadItem,
   ensureValidatorSchema,
+    ensureNamedImportSpecifier,
   upsertEnvLines,
 } from './shared/patch-utils.mjs';
+import { resolveFilesStorageRuntimeModule, upsertFilesModuleRegistration } from './shared/files-runtime-wiring.mjs';
 
 function copyFromPreset(packageRoot, targetRoot, relativePath) {
   const source = path.join(packageRoot, 'templates', 'module-presets', 'files-local', relativePath);
@@ -40,16 +42,18 @@ function patchAppModule(targetRoot) {
   }
 
   let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
-  content = ensureImportLine(
-    content,
-    "import { filesLocalConfig, filesLocalEnvSchemaZod, FilesLocalConfigModule } from '@forgeon/files-local';",
-  );
+  content = ensureNamedImportSpecifier(content, '@forgeon/files-local', 'filesLocalConfig');
+  content = ensureNamedImportSpecifier(content, '@forgeon/files-local', 'filesLocalEnvSchemaZod');
+  content = ensureNamedImportSpecifier(content, '@forgeon/files-local', 'FilesLocalConfigModule');
+  content = ensureNamedImportSpecifier(content, '@forgeon/files-local', 'ForgeonFilesLocalStorageModule');
   content = ensureLoadItem(content, 'filesLocalConfig');
   content = ensureValidatorSchema(content, 'filesLocalEnvSchemaZod');
 
   if (!content.includes('    FilesLocalConfigModule,')) {
     if (content.includes('    ForgeonFilesModule,')) {
       content = ensureLineAfter(content, '    ForgeonFilesModule,', '    FilesLocalConfigModule,');
+    } else if (content.includes('    ForgeonFilesModule.register({')) {
+      content = ensureLineBefore(content, '    ForgeonFilesModule.register({', '    FilesLocalConfigModule,');
     } else if (content.includes('    ForgeonI18nModule.register({')) {
       content = ensureLineBefore(content, '    ForgeonI18nModule.register({', '    FilesLocalConfigModule,');
     } else if (content.includes('    DbPrismaModule,')) {
@@ -61,6 +65,10 @@ function patchAppModule(targetRoot) {
     }
   }
 
+  if (content.includes('ForgeonFilesModule')) {
+    content = upsertFilesModuleRegistration(content, resolveFilesStorageRuntimeModule(targetRoot));
+  }
+
   fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
 }
 
@@ -74,7 +82,7 @@ function patchApiDockerfile(targetRoot) {
 
   const packageAnchors = [
     'COPY packages/files/package.json packages/files/package.json',
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/rbac/package.json packages/rbac/package.json',
     'COPY packages/rate-limit/package.json packages/rate-limit/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
@@ -92,7 +100,7 @@ function patchApiDockerfile(targetRoot) {
 
   const sourceAnchors = [
     'COPY packages/files packages/files',
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/rbac packages/rbac',
     'COPY packages/rate-limit packages/rate-limit',
     'COPY packages/logger packages/logger',
@@ -219,3 +227,4 @@ export function applyFilesLocalModule({ packageRoot, targetRoot }) {
     'FILES_LOCAL_ROOT=storage/uploads',
   ]);
 }
+

package/src/modules/files-quotas.mjs

@@ -75,10 +75,10 @@ function patchAppModule(targetRoot) {
       content = ensureLineAfter(content, '    ForgeonFilesModule,', '    ForgeonFilesQuotasModule,');
     } else if (content.includes('    ForgeonI18nModule.register({')) {
       content = ensureLineBefore(content, '    ForgeonI18nModule.register({', '    ForgeonFilesQuotasModule,');
-    } else if (content.includes('    ForgeonAuthModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register({', '    ForgeonFilesQuotasModule,');
-    } else if (content.includes('    ForgeonAuthModule.register(),')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register(),', '    ForgeonFilesQuotasModule,');
+    } else if (content.includes('    ForgeonAccountsModule.register({')) {
+      content = ensureLineBefore(content, '    ForgeonAccountsModule.register({', '    ForgeonFilesQuotasModule,');
+    } else if (content.includes('    ForgeonAccountsModule.register(),')) {
+      content = ensureLineBefore(content, '    ForgeonAccountsModule.register(),', '    ForgeonFilesQuotasModule,');
     } else if (content.includes('    DbPrismaModule,')) {
       content = ensureLineAfter(content, '    DbPrismaModule,', '    ForgeonFilesQuotasModule,');
     } else if (content.includes('    ForgeonLoggerModule,')) {
@@ -241,7 +241,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files/package.json packages/files/package.json',
     'COPY packages/files-local/package.json packages/files-local/package.json',
     'COPY packages/files-s3/package.json packages/files-s3/package.json',
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/rbac/package.json packages/rbac/package.json',
     'COPY packages/rate-limit/package.json packages/rate-limit/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
@@ -262,7 +262,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files packages/files',
     'COPY packages/files-local packages/files-local',
     'COPY packages/files-s3 packages/files-s3',
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/rbac packages/rbac',
     'COPY packages/rate-limit packages/rate-limit',
     'COPY packages/logger packages/logger',
@@ -380,3 +380,5 @@ export function applyFilesQuotasModule({ packageRoot, targetRoot }) {
   ]);
 }
 
+
+

package/src/modules/files-s3.mjs

@@ -9,8 +9,10 @@ import {
   ensureLineBefore,
   ensureLoadItem,
   ensureValidatorSchema,
+    ensureNamedImportSpecifier,
   upsertEnvLines,
 } from './shared/patch-utils.mjs';
+import { resolveFilesStorageRuntimeModule, upsertFilesModuleRegistration } from './shared/files-runtime-wiring.mjs';
 
 function copyFromPreset(packageRoot, targetRoot, relativePath) {
   const source = path.join(packageRoot, 'templates', 'module-presets', 'files-s3', relativePath);
@@ -40,16 +42,18 @@ function patchAppModule(targetRoot) {
   }
 
   let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
-  content = ensureImportLine(
-    content,
-    "import { filesS3Config, filesS3EnvSchemaZod, FilesS3ConfigModule } from '@forgeon/files-s3';",
-  );
+  content = ensureNamedImportSpecifier(content, '@forgeon/files-s3', 'filesS3Config');
+  content = ensureNamedImportSpecifier(content, '@forgeon/files-s3', 'filesS3EnvSchemaZod');
+  content = ensureNamedImportSpecifier(content, '@forgeon/files-s3', 'FilesS3ConfigModule');
+  content = ensureNamedImportSpecifier(content, '@forgeon/files-s3', 'ForgeonFilesS3StorageModule');
   content = ensureLoadItem(content, 'filesS3Config');
   content = ensureValidatorSchema(content, 'filesS3EnvSchemaZod');
 
   if (!content.includes('    FilesS3ConfigModule,')) {
     if (content.includes('    ForgeonFilesModule,')) {
       content = ensureLineAfter(content, '    ForgeonFilesModule,', '    FilesS3ConfigModule,');
+    } else if (content.includes('    ForgeonFilesModule.register({')) {
+      content = ensureLineBefore(content, '    ForgeonFilesModule.register({', '    FilesS3ConfigModule,');
     } else if (content.includes('    ForgeonI18nModule.register({')) {
       content = ensureLineBefore(content, '    ForgeonI18nModule.register({', '    FilesS3ConfigModule,');
     } else if (content.includes('    DbPrismaModule,')) {
@@ -61,6 +65,10 @@ function patchAppModule(targetRoot) {
     }
   }
 
+  if (content.includes('ForgeonFilesModule')) {
+    content = upsertFilesModuleRegistration(content, resolveFilesStorageRuntimeModule(targetRoot));
+  }
+
   fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
 }
 
@@ -75,7 +83,7 @@ function patchApiDockerfile(targetRoot) {
   const packageAnchors = [
     'COPY packages/files/package.json packages/files/package.json',
     'COPY packages/files-local/package.json packages/files-local/package.json',
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/rbac/package.json packages/rbac/package.json',
     'COPY packages/rate-limit/package.json packages/rate-limit/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
@@ -94,7 +102,7 @@ function patchApiDockerfile(targetRoot) {
   const sourceAnchors = [
     'COPY packages/files packages/files',
     'COPY packages/files-local packages/files-local',
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/rbac packages/rbac',
     'COPY packages/rate-limit packages/rate-limit',
     'COPY packages/logger packages/logger',
@@ -263,4 +271,7 @@ export function applyFilesS3Module({ packageRoot, targetRoot }) {
 
   setEnvValue(path.join(targetRoot, 'apps', 'api', '.env.example'), 'FILES_STORAGE_DRIVER', 's3');
   setEnvValue(path.join(targetRoot, 'infra', 'docker', '.env.example'), 'FILES_STORAGE_DRIVER', 's3');
+
+  patchAppModule(targetRoot);
 }
+

package/src/modules/files.mjs

@@ -11,9 +11,11 @@ import {
   ensureLoadItem,
   ensureNestCommonImport,
   ensureValidatorSchema,
+    ensureNamedImportSpecifier,
   upsertEnvLines,
 } from './shared/patch-utils.mjs';
 import { ensureWebProbeDefinition, resolveProbeTargets } from './shared/probes.mjs';
+import { resolveFilesStorageRuntimeModule, upsertFilesModuleRegistration } from './shared/files-runtime-wiring.mjs';
 
 function copyFromPreset(packageRoot, targetRoot, relativePath) {
   const source = path.join(packageRoot, 'templates', 'module-presets', 'files', relativePath);
@@ -168,27 +170,22 @@ function patchAppModule(targetRoot) {
     content,
     "import { filesConfig, filesEnvSchema, ForgeonFilesModule } from '@forgeon/files';",
   );
-  content = ensureLoadItem(content, 'filesConfig');
-  content = ensureValidatorSchema(content, 'filesEnvSchema');
+  content = ensureImportLine(
+    content,
+    "import { ForgeonFilesDbPrismaModule } from './files/forgeon-files-db-prisma.module';",
+  );
 
-  if (!content.includes('    ForgeonFilesModule,')) {
-    if (content.includes('    ForgeonI18nModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonI18nModule.register({', '    ForgeonFilesModule,');
-    } else if (content.includes('    ForgeonAuthModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register({', '    ForgeonFilesModule,');
-    } else if (content.includes('    ForgeonAuthModule.register(),')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register(),', '    ForgeonFilesModule,');
-    } else if (content.includes('    DbPrismaModule,')) {
-      content = ensureLineAfter(content, '    DbPrismaModule,', '    ForgeonFilesModule,');
-    } else if (content.includes('    ForgeonLoggerModule,')) {
-      content = ensureLineAfter(content, '    ForgeonLoggerModule,', '    ForgeonFilesModule,');
-    } else if (content.includes('    ForgeonSwaggerModule,')) {
-      content = ensureLineAfter(content, '    ForgeonSwaggerModule,', '    ForgeonFilesModule,');
-    } else {
-      content = ensureLineAfter(content, '    CoreErrorsModule,', '    ForgeonFilesModule,');
-    }
+  if (fs.existsSync(path.join(targetRoot, 'packages', 'files-local', 'package.json'))) {
+    content = ensureNamedImportSpecifier(content, '@forgeon/files-local', 'ForgeonFilesLocalStorageModule');
+  }
+  if (fs.existsSync(path.join(targetRoot, 'packages', 'files-s3', 'package.json'))) {
+    content = ensureNamedImportSpecifier(content, '@forgeon/files-s3', 'ForgeonFilesS3StorageModule');
   }
 
+  content = ensureLoadItem(content, 'filesConfig');
+  content = ensureValidatorSchema(content, 'filesEnvSchema');
+  content = upsertFilesModuleRegistration(content, resolveFilesStorageRuntimeModule(targetRoot));
+
   fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
 }
 
@@ -201,7 +198,7 @@ function patchApiDockerfile(targetRoot) {
   let content = fs.readFileSync(dockerfilePath, 'utf8').replace(/\r\n/g, '\n');
 
   const packageAnchors = [
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/rbac/package.json packages/rbac/package.json',
     'COPY packages/rate-limit/package.json packages/rate-limit/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
@@ -214,7 +211,7 @@ function patchApiDockerfile(targetRoot) {
   content = ensureLineAfter(content, packageAnchor, 'COPY packages/files/package.json packages/files/package.json');
 
   const sourceAnchors = [
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/rbac packages/rbac',
     'COPY packages/rate-limit packages/rate-limit',
     'COPY packages/logger packages/logger',
@@ -344,7 +341,7 @@ function patchCompose(targetRoot) {
   let content = fs.readFileSync(composePath, 'utf8').replace(/\r\n/g, '\n');
   if (!content.includes('FILES_ENABLED: ${FILES_ENABLED}')) {
     const anchors = [
-      /^(\s+AUTH_DEMO_PASSWORD:.*)$/m,
+      /^(\s+AUTH_ARGON2_PARALLELISM:.*)$/m,
       /^(\s+THROTTLE_TRUST_PROXY:.*)$/m,
       /^(\s+LOGGER_LEVEL:.*)$/m,
       /^(\s+SWAGGER_ENABLED:.*)$/m,
@@ -428,6 +425,7 @@ Key env:
 
 export function applyFilesModule({ packageRoot, targetRoot }) {
   copyFromPreset(packageRoot, targetRoot, path.join('packages', 'files'));
+  copyFromPreset(packageRoot, targetRoot, path.join('apps', 'api', 'src', 'files'));
   const probeTargets = resolveProbeTargets({ targetRoot, moduleId: 'files' });
 
 
@@ -456,3 +454,5 @@ export function applyFilesModule({ packageRoot, targetRoot }) {
     'FILES_ALLOWED_MIME_PREFIXES=image/,application/pdf,text/',
   ]);
 }
+
+

package/src/modules/idempotency.test.mjs

@@ -1,4 +1,4 @@
-import { describe, it } from 'node:test';
+import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -81,19 +81,25 @@ describe('addModule idempotency', () => {
       },
     },
     {
-      name: 'jwt-auth',
-      moduleId: 'jwt-auth',
-      dbPrismaEnabled: false,
+      name: 'accounts',
+      moduleId: 'accounts',
+      dbPrismaEnabled: true,
       setup: [],
       verify(projectRoot) {
-        assert.equal(fs.existsSync(path.join(projectRoot, 'packages', 'auth-api', 'package.json')), true);
+        assert.equal(fs.existsSync(path.join(projectRoot, 'packages', 'accounts-api', 'package.json')), true);
+        assert.equal(
+          fs.existsSync(
+            path.join(projectRoot, 'apps', 'api', 'src', 'accounts', 'prisma-accounts-persistence.store.ts'),
+          ),
+          true,
+        );
         assert.match(
           readFile(path.join(projectRoot, 'apps', 'api', 'src', 'health', 'health.controller.ts')),
           /@Get\('auth'\)/,
         );
-        assert.doesNotMatch(
+        assert.match(
           readFile(path.join(projectRoot, 'apps', 'api', 'src', 'app.module.ts')),
-          /PrismaAuthRefreshTokenStore/,
+          /ForgeonAccountsModule\.register\(/,
         );
       },
     },

package/src/modules/probes.test.mjs

@@ -1,4 +1,4 @@
-import { describe, it } from 'node:test';
+import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -188,7 +188,7 @@ describe('probe wiring', () => {
       addModule({ moduleId: 'queue', targetRoot: projectRoot, packageRoot });
       addModule({ moduleId: 'scheduler', targetRoot: projectRoot, packageRoot });
       addModule({ moduleId: 'db-prisma', targetRoot: projectRoot, packageRoot });
-      addModule({ moduleId: 'jwt-auth', targetRoot: projectRoot, packageRoot });
+      addModule({ moduleId: 'accounts', targetRoot: projectRoot, packageRoot });
       addModule({ moduleId: 'rate-limit', targetRoot: projectRoot, packageRoot });
 
       assert.deepEqual(readManagedProbeIds(projectRoot), ['db', 'auth', 'rate-limit', 'queue', 'scheduler']);
@@ -200,3 +200,5 @@ describe('probe wiring', () => {
 
 
 
+
+

package/src/modules/queue.mjs

@@ -1,4 +1,4 @@
-import fs from 'node:fs';
+import fs from 'node:fs';
 import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
@@ -40,8 +40,8 @@ function patchAppModule(targetRoot) {
     moduleLine: '    ForgeonQueueModule,',
     beforeAnchors: [
       '    ForgeonI18nModule.register({',
-      '    ForgeonAuthModule.register({',
-      '    ForgeonAuthModule.register(),',
+      '    ForgeonAccountsModule.register({',
+      '    ForgeonAccountsModule.register(),',
     ],
     afterAnchors: [
       '    DbPrismaModule,',
@@ -89,7 +89,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files-s3/package.json packages/files-s3/package.json',
     'COPY packages/files-local/package.json packages/files-local/package.json',
     'COPY packages/files/package.json packages/files/package.json',
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/rbac/package.json packages/rbac/package.json',
     'COPY packages/rate-limit/package.json packages/rate-limit/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
@@ -108,7 +108,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files-s3 packages/files-s3',
     'COPY packages/files-local packages/files-local',
     'COPY packages/files packages/files',
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/rbac packages/rbac',
     'COPY packages/rate-limit packages/rate-limit',
     'COPY packages/logger packages/logger',
@@ -224,7 +224,7 @@ function patchCompose(targetRoot) {
       /^(\s+FILES_S3_MAX_ATTEMPTS:.*)$/m,
       /^(\s+FILES_LOCAL_ROOT:.*)$/m,
       /^(\s+FILES_PUBLIC_BASE_PATH:.*)$/m,
-      /^(\s+AUTH_DEMO_PASSWORD:.*)$/m,
+      /^(\s+AUTH_ARGON2_PARALLELISM:.*)$/m,
       /^(\s+THROTTLE_TRUST_PROXY:.*)$/m,
       /^(\s+LOGGER_REQUEST_ID_HEADER:.*)$/m,
       /^(\s+SWAGGER_DOCS_PATH:.*)$/m,
@@ -323,3 +323,6 @@ export function applyQueueModule({ packageRoot, targetRoot }) {
     'QUEUE_DEFAULT_BACKOFF_MS=1000',
   ]);
 }
+
+
+

package/src/modules/rate-limit.mjs

@@ -1,4 +1,4 @@
-import fs from 'node:fs';
+import fs from 'node:fs';
 import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
@@ -50,11 +50,11 @@ function patchAppModule(targetRoot) {
         "import { ForgeonRateLimitModule, rateLimitConfig, rateLimitEnvSchema } from '@forgeon/rate-limit';",
       );
     } else if (
-      content.includes("import { authConfig, authEnvSchema, ForgeonAuthModule } from '@forgeon/auth-api';")
+      content.includes("import { authConfig, authEnvSchema, ForgeonAccountsModule, UsersModule } from '@forgeon/accounts-api';")
     ) {
       content = ensureLineAfter(
         content,
-        "import { authConfig, authEnvSchema, ForgeonAuthModule } from '@forgeon/auth-api';",
+        "import { authConfig, authEnvSchema, ForgeonAccountsModule, UsersModule } from '@forgeon/accounts-api';",
         "import { ForgeonRateLimitModule, rateLimitConfig, rateLimitEnvSchema } from '@forgeon/rate-limit';",
       );
     } else if (
@@ -96,10 +96,10 @@ function patchAppModule(targetRoot) {
   if (!content.includes('    ForgeonRateLimitModule,')) {
     if (content.includes('    ForgeonI18nModule.register({')) {
       content = ensureLineBefore(content, '    ForgeonI18nModule.register({', '    ForgeonRateLimitModule,');
-    } else if (content.includes('    ForgeonAuthModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register({', '    ForgeonRateLimitModule,');
-    } else if (content.includes('    ForgeonAuthModule.register(),')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register(),', '    ForgeonRateLimitModule,');
+    } else if (content.includes('    ForgeonAccountsModule.register({')) {
+      content = ensureLineBefore(content, '    ForgeonAccountsModule.register({', '    ForgeonRateLimitModule,');
+    } else if (content.includes('    ForgeonAccountsModule.register(),')) {
+      content = ensureLineBefore(content, '    ForgeonAccountsModule.register(),', '    ForgeonRateLimitModule,');
     } else if (content.includes('    DbPrismaModule,')) {
       content = ensureLineAfter(content, '    DbPrismaModule,', '    ForgeonRateLimitModule,');
     } else if (content.includes('    ForgeonLoggerModule,')) {
@@ -166,7 +166,7 @@ function patchApiDockerfile(targetRoot) {
 
   let content = fs.readFileSync(dockerfilePath, 'utf8').replace(/\r\n/g, '\n');
   const packageAnchors = [
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
     'COPY packages/swagger/package.json packages/swagger/package.json',
     'COPY packages/i18n/package.json packages/i18n/package.json',
@@ -181,7 +181,7 @@ function patchApiDockerfile(targetRoot) {
   );
 
   const sourceAnchors = [
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/logger packages/logger',
     'COPY packages/swagger packages/swagger',
     'COPY packages/i18n packages/i18n',
@@ -209,7 +209,7 @@ function patchCompose(targetRoot) {
   let content = fs.readFileSync(composePath, 'utf8').replace(/\r\n/g, '\n');
   if (!content.includes('THROTTLE_ENABLED: ${THROTTLE_ENABLED}')) {
     const anchors = [
-      /^(\s+AUTH_DEMO_PASSWORD:.*)$/m,
+      /^(\s+AUTH_ARGON2_PARALLELISM:.*)$/m,
       /^(\s+JWT_ACCESS_SECRET:.*)$/m,
       /^(\s+LOGGER_LEVEL:.*)$/m,
       /^(\s+SWAGGER_ENABLED:.*)$/m,
@@ -303,3 +303,7 @@ export function applyRateLimitModule({ packageRoot, targetRoot }) {
     'THROTTLE_TRUST_PROXY=false',
   ]);
 }
+
+
+
+

package/src/modules/rbac.mjs

@@ -48,11 +48,11 @@ function patchAppModule(targetRoot) {
         "import { ForgeonRbacModule } from '@forgeon/rbac';",
       );
     } else if (
-      content.includes("import { authConfig, authEnvSchema, ForgeonAuthModule } from '@forgeon/auth-api';")
+      content.includes("import { authConfig, authEnvSchema, ForgeonAccountsModule, UsersModule } from '@forgeon/accounts-api';")
     ) {
       content = ensureLineAfter(
         content,
-        "import { authConfig, authEnvSchema, ForgeonAuthModule } from '@forgeon/auth-api';",
+        "import { authConfig, authEnvSchema, ForgeonAccountsModule, UsersModule } from '@forgeon/accounts-api';",
         "import { ForgeonRbacModule } from '@forgeon/rbac';",
       );
     } else if (
@@ -99,10 +99,8 @@ function patchAppModule(targetRoot) {
   if (!content.includes('    ForgeonRbacModule,')) {
     if (content.includes('    ForgeonI18nModule.register({')) {
       content = ensureLineBefore(content, '    ForgeonI18nModule.register({', '    ForgeonRbacModule,');
-    } else if (content.includes('    ForgeonAuthModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register({', '    ForgeonRbacModule,');
-    } else if (content.includes('    ForgeonAuthModule.register(),')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register(),', '    ForgeonRbacModule,');
+    } else if (content.includes('    ForgeonAccountsModule.register({')) {
+      content = ensureLineBefore(content, '    ForgeonAccountsModule.register({', '    ForgeonRbacModule,');
     } else if (content.includes('    ForgeonRateLimitModule,')) {
       content = ensureLineAfter(content, '    ForgeonRateLimitModule,', '    ForgeonRbacModule,');
     } else if (content.includes('    DbPrismaModule,')) {
@@ -192,7 +190,7 @@ function patchApiDockerfile(targetRoot) {
 
   let content = fs.readFileSync(dockerfilePath, 'utf8').replace(/\r\n/g, '\n');
   const packageAnchors = [
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/rate-limit/package.json packages/rate-limit/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
     'COPY packages/swagger/package.json packages/swagger/package.json',
@@ -204,7 +202,7 @@ function patchApiDockerfile(targetRoot) {
   content = ensureLineAfter(content, packageAnchor, 'COPY packages/rbac/package.json packages/rbac/package.json');
 
   const sourceAnchors = [
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/rate-limit packages/rate-limit',
     'COPY packages/logger packages/logger',
     'COPY packages/swagger packages/swagger',
@@ -240,7 +238,7 @@ function patchReadme(targetRoot) {
 
 The rbac add-module provides a minimal authorization layer for role and permission checks.
 
-It installs independently. \`jwt-auth\` is optional and only extends demo JWT claims through integration sync.
+It installs independently. \`accounts\` is optional and only prepares auth claims compatibility through integration sync.
 
 What it adds:
 - \`@Roles(...)\` and \`@Permissions(...)\` decorators
@@ -260,8 +258,8 @@ How to verify:
 - the same route without that header should return \`403\`
 
 Optional integration:
-- if \`jwt-auth\` is installed too, run \`pnpm forgeon:sync-integrations\`
-- that enables demo JWT permissions for the same RBAC probe flow
+- if \`accounts\` is installed too, run \`pnpm forgeon:sync-integrations\`
+- that prepares accounts auth claims types for optional RBAC compatibility without changing the base accounts schema
 
 Current scope:
 - no policy engine
@@ -288,3 +286,6 @@ export function applyRbacModule({ packageRoot, targetRoot }) {
   patchApiDockerfile(targetRoot);
   patchReadme(targetRoot);
 }
+
+
+