@flowerforce/flowerbase 1.4.2-beta.3 → 1.4.2-beta.4

package/dist/auth/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/auth/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAQzC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,iBA+IxD"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/auth/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAQzC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,iBA0JxD"}

package/dist/auth/controller.js

@@ -31,6 +31,14 @@ function authController(app) {
         catch (error) {
             console.error('Failed to ensure refresh token TTL index', error);
         }
+        try {
+            yield db.collection(authCollection).createIndex({ email: 1 }, {
+                unique: true
+            });
+        }
+        catch (error) {
+            console.error('Failed to ensure auth email unique index', error);
+        }
         app.addHook(HANDLER_TYPE, app.jwtAuthentication);
         /**
          * Endpoint to retrieve the authenticated user's profile.

package/dist/auth/providers/anon-user/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/anon-user/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAOzC;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,eAAe,iBA8E5D"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/anon-user/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAOzC;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,eAAe,iBAmE5D"}

package/dist/auth/providers/anon-user/controller.js

@@ -10,9 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.anonUserController = anonUserController;
+const bson_1 = require("bson");
 const constants_1 = require("../../../constants");
-const crypto_1 = require("../../../utils/crypto");
 const handleUserRegistration_model_1 = require("../../../shared/models/handleUserRegistration.model");
+const crypto_1 = require("../../../utils/crypto");
 const utils_1 = require("../../utils");
 /**
  * Controller for handling anonymous user login.
@@ -41,30 +42,23 @@ function anonUserController(app) {
                     throw new Error('Anonymous authentication disabled');
                 }
                 const now = new Date();
-                const insertResult = yield db.collection(authCollection).insertOne({
+                const userId = new bson_1.ObjectId();
+                const anonEmail = `anon-${userId.toString()}@users.invalid`;
+                yield db.collection(authCollection).insertOne({
+                    _id: userId,
+                    email: anonEmail,
                     status: 'confirmed',
                     createdAt: now,
                     custom_data: {},
                     identities: [
                         {
+                            id: userId.toString(),
+                            provider_id: userId.toString(),
                             provider_type: handleUserRegistration_model_1.PROVIDER.ANON_USER,
                             provider_data: {}
                         }
                     ]
                 });
-                const userId = insertResult.insertedId;
-                yield db.collection(authCollection).updateOne({ _id: userId }, {
-                    $set: {
-                        identities: [
-                            {
-                                id: userId.toString(),
-                                provider_id: userId.toString(),
-                                provider_type: handleUserRegistration_model_1.PROVIDER.ANON_USER,
-                                provider_data: {}
-                            }
-                        ]
-                    }
-                });
                 const currentUserData = {
                     _id: userId,
                     user_data: {}

package/dist/auth/utils.js

@@ -15,10 +15,10 @@ exports.LOGIN_SCHEMA = {
             username: {
                 type: 'string',
                 pattern: '^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$',
-                minLength: 3,
+                minLength: 5,
                 maxLength: 254
             },
-            password: { type: 'string', minLength: 8, maxLength: 128 }
+            password: { type: 'string', minLength: 6, maxLength: 128 }
         },
         required: ['username', 'password']
     }
@@ -30,7 +30,7 @@ exports.RESET_SEND_SCHEMA = {
             email: {
                 type: 'string',
                 pattern: '^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$',
-                minLength: 3,
+                minLength: 5,
                 maxLength: 254
             }
         },
@@ -44,10 +44,10 @@ exports.RESET_CALL_SCHEMA = {
             email: {
                 type: 'string',
                 pattern: '^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$',
-                minLength: 3,
+                minLength: 5,
                 maxLength: 254
             },
-            password: { type: 'string', minLength: 8, maxLength: 128 },
+            password: { type: 'string', minLength: 6, maxLength: 128 },
             arguments: { type: 'array' }
         },
         required: ['email', 'password']
@@ -57,7 +57,7 @@ exports.CONFIRM_RESET_SCHEMA = {
     body: {
         type: 'object',
         properties: {
-            password: { type: 'string', minLength: 8, maxLength: 128 },
+            password: { type: 'string', minLength: 6, maxLength: 128 },
             token: { type: 'string' },
             tokenId: { type: 'string' }
         },
@@ -82,10 +82,10 @@ exports.REGISTRATION_SCHEMA = {
             email: {
                 type: 'string',
                 pattern: '^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$',
-                minLength: 3,
+                minLength: 5,
                 maxLength: 254
             },
-            password: { type: 'string', minLength: 8, maxLength: 128 }
+            password: { type: 'string', minLength: 6, maxLength: 128 }
         },
         required: ['email', 'password']
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.4.2-beta.3",
+  "version": "1.4.2-beta.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/auth/__tests__/controller.test.ts

@@ -0,0 +1,51 @@
+import { authController } from '../controller'
+
+jest.mock('../../constants', () => ({
+  AUTH_CONFIG: {
+    authCollection: 'auth_users',
+    refreshTokensCollection: 'refresh_tokens',
+    userCollection: 'users',
+    user_id_field: 'id'
+  },
+  DB_NAME: 'test-db',
+  DEFAULT_CONFIG: {
+    REFRESH_TOKEN_TTL_DAYS: 1
+  }
+}))
+
+describe('authController', () => {
+  it('creates a unique email index on the auth collection', async () => {
+    const authCollection = {
+      createIndex: jest.fn().mockResolvedValue('ok')
+    }
+    const refreshCollection = {
+      createIndex: jest.fn().mockResolvedValue('ok')
+    }
+    const db = {
+      collection: jest.fn((name: string) => {
+        if (name === 'auth_users') {
+          return authCollection
+        }
+        if (name === 'refresh_tokens') {
+          return refreshCollection
+        }
+        return { createIndex: jest.fn().mockResolvedValue('ok') }
+      })
+    }
+    const app = {
+      mongo: { client: { db: jest.fn().mockReturnValue(db) } },
+      addHook: jest.fn(),
+      get: jest.fn(),
+      post: jest.fn(),
+      delete: jest.fn(),
+      jwtAuthentication: jest.fn()
+    }
+
+    await authController(app as unknown as never)
+
+    expect(authCollection.createIndex).toHaveBeenCalledWith(
+      { email: 1 },
+      { unique: true }
+    )
+  })
+})

package/src/auth/controller.ts

@@ -27,6 +27,17 @@ export async function authController(app: FastifyInstance) {
     console.error('Failed to ensure refresh token TTL index', error)
   }
 
+  try {
+    await db.collection(authCollection).createIndex(
+      { email: 1 },
+      {
+        unique: true
+      }
+    )
+  } catch (error) {
+    console.error('Failed to ensure auth email unique index', error)
+  }
+
   app.addHook(HANDLER_TYPE, app.jwtAuthentication)
 
   /**

package/src/auth/providers/anon-user/__tests__/controller.test.ts

@@ -0,0 +1,82 @@
+import { anonUserController } from '../controller'
+import { PROVIDER } from '../../../../shared/models/handleUserRegistration.model'
+
+jest.mock('../../../../constants', () => ({
+  AUTH_CONFIG: {
+    authCollection: 'auth_users',
+    refreshTokensCollection: 'refresh_tokens',
+    providers: {
+      'anon-user': { disabled: false }
+    }
+  },
+  DB_NAME: 'test-db',
+  DEFAULT_CONFIG: {
+    REFRESH_TOKEN_TTL_DAYS: 1,
+    ANON_USER_TTL_SECONDS: 3600
+  }
+}))
+
+describe('anonUserController', () => {
+  it('inserts anon users with a generated email', async () => {
+    let insertedDoc: Record<string, unknown> | undefined
+    const authCollection = {
+      createIndex: jest.fn().mockResolvedValue('ok'),
+      insertOne: jest.fn(async (doc: Record<string, unknown>) => {
+        insertedDoc = doc
+        return { insertedId: doc._id }
+      })
+    }
+    const refreshCollection = {
+      insertOne: jest.fn().mockResolvedValue({})
+    }
+    const db = {
+      collection: jest.fn((name: string) => {
+        if (name === 'auth_users') {
+          return authCollection
+        }
+        if (name === 'refresh_tokens') {
+          return refreshCollection
+        }
+        return authCollection
+      })
+    }
+
+    let loginHandler: ((...args: unknown[]) => unknown) | undefined
+    const app = {
+      mongo: { client: { db: jest.fn().mockReturnValue(db) } },
+      post: jest.fn((path: string, handler: (...args: unknown[]) => unknown) => {
+        loginHandler = handler
+      })
+    }
+
+    await anonUserController(app as unknown as never)
+
+    const context = {
+      createRefreshToken: jest.fn(() => 'refresh'),
+      createAccessToken: jest.fn(() => 'access')
+    }
+
+    await (loginHandler as (...args: unknown[]) => Promise<unknown>).call(context, {})
+
+    const doc = insertedDoc as {
+      _id: { toString: () => string }
+      email: string
+      identities: Array<{
+        id?: string
+        provider_id?: string
+        provider_type?: string
+        provider_data?: Record<string, unknown>
+      }>
+    }
+
+    expect(doc.email).toBe(`anon-${doc._id.toString()}@users.invalid`)
+    expect(doc.identities[0]).toEqual(
+      expect.objectContaining({
+        id: doc._id.toString(),
+        provider_id: doc._id.toString(),
+        provider_type: PROVIDER.ANON_USER,
+        provider_data: {}
+      })
+    )
+  })
+})

package/src/auth/providers/anon-user/controller.ts

@@ -1,7 +1,8 @@
+import { ObjectId } from 'bson'
 import { FastifyInstance } from 'fastify'
 import { AUTH_CONFIG, DB_NAME, DEFAULT_CONFIG } from '../../../constants'
-import { hashToken } from '../../../utils/crypto'
 import { PROVIDER } from '../../../shared/models/handleUserRegistration.model'
+import { hashToken } from '../../../utils/crypto'
 import { AUTH_ENDPOINTS } from '../../utils'
 import { LoginDto } from './dtos'
 
@@ -37,35 +38,24 @@ export async function anonUserController(app: FastifyInstance) {
       }
 
       const now = new Date()
-      const insertResult = await db.collection(authCollection!).insertOne({
+      const userId = new ObjectId()
+      const anonEmail = `anon-${userId.toString()}@users.invalid`
+      await db.collection(authCollection!).insertOne({
+        _id: userId,
+        email: anonEmail,
         status: 'confirmed',
         createdAt: now,
         custom_data: {},
         identities: [
           {
+            id: userId.toString(),
+            provider_id: userId.toString(),
             provider_type: PROVIDER.ANON_USER,
             provider_data: {}
           }
         ]
       })
 
-      const userId = insertResult.insertedId
-      await db.collection(authCollection!).updateOne(
-        { _id: userId },
-        {
-          $set: {
-            identities: [
-              {
-                id: userId.toString(),
-                provider_id: userId.toString(),
-                provider_type: PROVIDER.ANON_USER,
-                provider_data: {}
-              }
-            ]
-          }
-        }
-      )
-
       const currentUserData = {
         _id: userId,
         user_data: {}

package/src/auth/utils.ts

@@ -11,10 +11,10 @@ export const LOGIN_SCHEMA = {
       username: {
         type: 'string',
         pattern: '^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$',
-        minLength: 3,
+        minLength: 5,
         maxLength: 254
       },
-      password: { type: 'string', minLength: 8, maxLength: 128 }
+      password: { type: 'string', minLength: 6, maxLength: 128 }
     },
     required: ['username', 'password']
   }
@@ -27,7 +27,7 @@ export const RESET_SEND_SCHEMA = {
       email: {
         type: 'string',
         pattern: '^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$',
-        minLength: 3,
+        minLength: 5,
         maxLength: 254
       }
     },
@@ -42,10 +42,10 @@ export const RESET_CALL_SCHEMA = {
       email: {
         type: 'string',
         pattern: '^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$',
-        minLength: 3,
+        minLength: 5,
         maxLength: 254
       },
-      password: { type: 'string', minLength: 8, maxLength: 128 },
+      password: { type: 'string', minLength: 6, maxLength: 128 },
       arguments: { type: 'array' }
     },
     required: ['email', 'password']
@@ -56,7 +56,7 @@ export const CONFIRM_RESET_SCHEMA = {
   body: {
     type: 'object',
     properties: {
-      password: { type: 'string', minLength: 8, maxLength: 128 },
+      password: { type: 'string', minLength: 6, maxLength: 128 },
       token: { type: 'string' },
       tokenId: { type: 'string' }
     },
@@ -84,10 +84,10 @@ export const REGISTRATION_SCHEMA = {
       email: {
         type: 'string',
         pattern: '^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$',
-        minLength: 3,
+        minLength: 5,
         maxLength: 254
       },
-      password: { type: 'string', minLength: 8, maxLength: 128 }
+      password: { type: 'string', minLength: 6, maxLength: 128 }
     },
     required: ['email', 'password']
   }