cyberia 3.2.5 → 3.2.12

package/src/api/user/user.model.js

@@ -3,7 +3,6 @@ import validator from 'validator';
 import { userRoleEnum } from '../../client/components/core/CommonJs.js';
 import crypto from 'crypto';
 // https://mongoosejs.com/docs/2.7.x/docs/schematypes.html
-
 const UserSchema = new Schema(
   {
     email: {
@@ -88,13 +87,10 @@ const UserSchema = new Schema(
     timestamps: true,
   },
 );
-
 const UserModel = model('User', UserSchema);
-
 const ProviderSchema = UserSchema;
-
-const UserDto = {
-  select: {
+class UserDto {
+  static select = {
     get: () => {
       return {
         _id: 1,
@@ -112,8 +108,8 @@ const UserDto = {
     getAll: () => {
       return { _id: 1 };
     },
-  },
-  public: {
+  };
+  static public = {
     get: () => {
       return {
         _id: 1,
@@ -125,8 +121,8 @@ const UserDto = {
         updatedAt: 1,
       };
     },
-  },
-  auth: {
+  };
+  static auth = {
     payload: (user, jwtid, ip, userAgent, host, path) => {
       const tokenPayload = {
         _id: user._id.toString(),
@@ -141,7 +137,6 @@ const UserDto = {
       };
       return tokenPayload;
     },
-  },
-};
-
+  };
+}
 export { UserSchema, UserModel, userRoleEnum, ProviderSchema, UserDto };

package/src/api/user/user.router.js

@@ -3,26 +3,28 @@ import fs from 'fs-extra';
 import { loggerFactory } from '../../server/logger.js';
 import { UserController } from './user.controller.js';
 import express from 'express';
-import { DataBaseProvider } from '../../db/DataBaseProvider.js';
+import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
 
 const logger = loggerFactory(import.meta);
 
-const UserRouter = (options) => {
-  const router = express.Router();
-  const authMiddleware = options.authMiddleware;
-
-  (async () => {
-    // admin user seed
-    try {
-      const models = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models;
-      let adminUser;
-      if (models.User) {
-        adminUser = await models.User.findOne({ role: 'admin' });
+class UserRouter {
+  /**
+   * @param {import('../types.js').RouterOptions} options
+   * @returns {import('express').Router}
+   */
+  static router(options) {
+    const router = express.Router();
+
+    // Admin user seed — fire-and-forget async on first router mount.
+    (async () => {
+      try {
+        const User = DataBaseProviderService.getModel('user', options);
+        const adminUser = await User.findOne({ role: 'admin' });
         if (!adminUser) {
           const defaultPassword = process.env.DEFAULT_ADMIN_PASSWORD || 'changethis';
           const hashedPassword = await hashPassword(defaultPassword);
 
-          const result = await models.User.create({
+          const result = await User.create({
             username: 'admin',
             email: process.env.DEFAULT_ADMIN_EMAIL || 'admin@' + options.host,
             password: hashedPassword,
@@ -36,106 +38,73 @@ const UserRouter = (options) => {
             role: result._doc.role,
           });
         }
+      } catch (error) {
+        logger.error('Error checking/creating admin user', { error: error.message });
       }
-    } catch (error) {
-      logger.error('Error checking/creating admin user', { error: error.message });
-    }
-
-    // Cache mailer images
-    options.png = {
-      buffer: {
-        'invalid-token': fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-invalid-token.png`),
-        recover: fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-recover.png`),
-        check: fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-check.png`),
-        avatar: fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-default-avatar.png`),
-      },
-      header: (res, req) => {
-        res.set('Cross-Origin-Resource-Policy', 'cross-origin');
-        res.set('Access-Control-Allow-Headers', '*');
-        if (req && req.headers && req.headers.origin) {
-          res.set('Access-Control-Allow-Origin', req.headers.origin);
-        } else res.setHeader('Access-Control-Allow-Origin', '*');
-        res.set('Content-Type', 'image/png');
-      },
-    };
-  })();
-
-  router.post(`/mailer/:id`, authMiddleware, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.post(req, res, options);
-  });
-
-  router.get(`/assets/:id`, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.get(req, res, options);
-  });
-
-  router.get(`/mailer/:id`, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.get(req, res, options);
-  });
-
-  router.get(`/email/:email`, authMiddleware, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.get(req, res, options);
-  });
-
-  router.post(`/:id`, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.post(req, res, options);
-  });
-
-  // #swagger.start
-
-  /*
-    #swagger.auto = false
-    #swagger.tags = ['user']
-    #swagger.summary = 'Log in'
-    #swagger.description = 'This endpoint get a JWT for authenticated user'
-    #swagger.path = '/user/auth'
-    #swagger.method = 'post'
-    #swagger.responses[200] = {
-      description: 'User created successfully',
-      content: {
-          'application/json': {
-              schema: {
-                $ref: '#/components/schemas/userResponse'
-              }
-          }
-      }
-    }
-
-    #swagger.responses[400] = {
-      description: 'Bad request. Please check the input data',
-      content: {
-          'application/json': {
-              schema: {
-                $ref: '#/components/schemas/userBadRequestResponse'
-              }
-          }
-      }
-    }
-  */
 
-  // #swagger.end
+      // Cache mailer images into options.png so route handlers can serve them
+      // without re-reading the filesystem on every request.
+      options.png = {
+        buffer: {
+          'invalid-token': fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-invalid-token.png`),
+          recover: fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-recover.png`),
+          check: fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-check.png`),
+          avatar: fs.readFileSync(`./src/client/public/default/assets/mailer/api-user-default-avatar.png`),
+        },
+        header: (res, req) => {
+          res.set('Cross-Origin-Resource-Policy', 'cross-origin');
+          res.set('Access-Control-Allow-Headers', '*');
+          if (req && req.headers && req.headers.origin) {
+            res.set('Access-Control-Allow-Origin', req.headers.origin);
+          } else res.setHeader('Access-Control-Allow-Origin', '*');
+          res.set('Content-Type', 'image/png');
+        },
+      };
+    })();
+
+    router.post(`/mailer/:id`, options.authMiddleware, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.post(req, res, options);
+    });
+
+    router.get(`/assets/:id`, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.get(req, res, options);
+    });
+
+    router.get(`/mailer/:id`, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.get(req, res, options);
+    });
+
+    router.get(`/email/:email`, options.authMiddleware, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.get(req, res, options);
+    });
+
+    router.post(`/:id`, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.post(req, res, options);
+    });
+
+    // #swagger.start
 
-  router.post(`/`, async (req, res) => {
     /*
       #swagger.auto = false
       #swagger.tags = ['user']
-      #swagger.summary = 'Create user'
-      #swagger.description = 'This endpoint will create a new user account'
-      #swagger.path = '/user'
+      #swagger.summary = 'Log in'
+      #swagger.description = 'This endpoint get a JWT for authenticated user'
+      #swagger.path = '/user/auth'
       #swagger.method = 'post'
       #swagger.responses[200] = {
         description: 'User created successfully',
@@ -159,200 +128,240 @@ const UserRouter = (options) => {
         }
       }
     */
-    return await UserController.post(req, res, options);
-  });
-
-  router.get(`/recover/:id`, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.get(req, res, options);
-  });
-
-  router.get(`/u/:username`, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.get(req, res, options);
-  });
-
-  router.get(`/:id`, authMiddleware, async (req, res) => {
-    /*
-      #swagger.auto = false
-      #swagger.tags = ['user']
-      #swagger.summary = 'Get user data by ID'
-      #swagger.description = 'This endpoint get user data by ID'
-      #swagger.path = '/user/{id}'
-      #swagger.method = 'get'
-      #swagger.produces = ['application/json']
-      #swagger.consumes = ['application/json']
-      #swagger.security = [{
-        'bearerAuth': []
-      }]
-
-      #swagger.parameters['id'] = {
-          in: 'path',
-          description: 'User ID',
-          required: true,
-          type: 'string'
-      }
 
-      #swagger.responses[200] = {
-        description: 'get user successfully',
-        content: {
-            'application/json': {
-                schema: {
-                  $ref: '#/components/schemas/userGetResponse'
-                }
-            }
+    // #swagger.end
+
+    router.post(`/`, async (req, res) => {
+      /*
+        #swagger.auto = false
+        #swagger.tags = ['user']
+        #swagger.summary = 'Create user'
+        #swagger.description = 'This endpoint will create a new user account'
+        #swagger.path = '/user'
+        #swagger.method = 'post'
+        #swagger.responses[200] = {
+          description: 'User created successfully',
+          content: {
+              'application/json': {
+                  schema: {
+                    $ref: '#/components/schemas/userResponse'
+                  }
+              }
+          }
         }
-      }
 
-      #swagger.responses[400] = {
-        description: 'Bad request. Please check the input data',
-        content: {
-            'application/json': {
-                schema: {
-                  $ref: '#/components/schemas/userBadRequestResponse'
-                }
-            }
+        #swagger.responses[400] = {
+          description: 'Bad request. Please check the input data',
+          content: {
+              'application/json': {
+                  schema: {
+                    $ref: '#/components/schemas/userBadRequestResponse'
+                  }
+              }
+          }
         }
-      }
-    */
-    return await UserController.get(req, res, options);
-  });
-  router.get(`/`, authMiddleware, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.get(req, res, options);
-  });
-  router.put(`/recover/:id`, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.put(req, res, options);
-  });
-  router.put(`/profile-image/:id`, authMiddleware, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.put(req, res, options);
-  });
-  router.put(`/:id`, authMiddleware, async (req, res) => {
-    /*
-      #swagger.auto = false
-      #swagger.tags = ['user']
-      #swagger.summary = 'Update user data by ID'
-      #swagger.description = 'This endpoint will update user data by ID'
-      #swagger.path = '/user/{id}'
-      #swagger.method = 'put'
-      #swagger.security = [{
-        'bearerAuth': []
-      }]
-
-      #swagger.parameters['id'] = {
-          in: 'path',
-          description: 'User ID',
-          required: true,
-          type: 'string'
-      }
-
-      #swagger.responses[200] = {
-        description: 'User updated successfully',
-        content: {
-            'application/json': {
-                schema: {
-                  $ref: '#/components/schemas/userUpdateResponse'
-                }
-            }
+      */
+      return await UserController.post(req, res, options);
+    });
+
+    router.get(`/recover/:id`, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.get(req, res, options);
+    });
+
+    router.get(`/u/:username`, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.get(req, res, options);
+    });
+
+    router.get(`/:id`, options.authMiddleware, async (req, res) => {
+      /*
+        #swagger.auto = false
+        #swagger.tags = ['user']
+        #swagger.summary = 'Get user data by ID'
+        #swagger.description = 'This endpoint get user data by ID'
+        #swagger.path = '/user/{id}'
+        #swagger.method = 'get'
+        #swagger.produces = ['application/json']
+        #swagger.consumes = ['application/json']
+        #swagger.security = [{
+          'bearerAuth': []
+        }]
+
+        #swagger.parameters['id'] = {
+            in: 'path',
+            description: 'User ID',
+            required: true,
+            type: 'string'
         }
-      }
 
-      #swagger.responses[400] = {
-        description: 'Bad request. Please check the input data',
-        content: {
-            'application/json': {
-                schema: {
-                  $ref: '#/components/schemas/userBadRequestResponse'
-                }
-            }
+        #swagger.responses[200] = {
+          description: 'get user successfully',
+          content: {
+              'application/json': {
+                  schema: {
+                    $ref: '#/components/schemas/userGetResponse'
+                  }
+              }
+          }
         }
-      }
-    */
-    return await UserController.put(req, res, options);
-  });
-  router.put(`/`, authMiddleware, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.put(req, res, options);
-  });
-
-  router.delete(`/:id`, authMiddleware, async (req, res) => {
-    /*
-      #swagger.auto = false
-      #swagger.tags = ['user']
-      #swagger.summary = 'Delete user data by ID'
-      #swagger.description = 'This endpoint deletes user data by ID, the path ID must match with the ID of the authenticated user'
-      #swagger.path = '/user/{id}'
-      #swagger.method = 'delete'
-      #swagger.produces = ['application/json']
-      #swagger.consumes = ['application/json']
-      #swagger.security = [{
-        'bearerAuth': []
-      }]
-
-      #swagger.parameters['id'] = {
-          in: 'path',
-          description: 'User ID',
-          required: true,
-          type: 'string'
-      }
 
-      #swagger.responses[200] = {
-        description: 'get user successfully',
-        content: {
-            'application/json': {
-                schema: {
-                  $ref: '#/components/schemas/userGetResponse'
-                }
-            }
+        #swagger.responses[400] = {
+          description: 'Bad request. Please check the input data',
+          content: {
+              'application/json': {
+                  schema: {
+                    $ref: '#/components/schemas/userBadRequestResponse'
+                  }
+              }
+          }
         }
-      }
-
-      #swagger.responses[400] = {
-        description: 'Bad request. Please check the input data',
-        content: {
-            'application/json': {
-                schema: {
-                  $ref: '#/components/schemas/userBadRequestResponse'
-                }
-            }
+      */
+      return await UserController.get(req, res, options);
+    });
+
+    router.get(`/`, options.authMiddleware, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.get(req, res, options);
+    });
+
+    router.put(`/recover/:id`, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.put(req, res, options);
+    });
+
+    router.put(`/profile-image/:id`, options.authMiddleware, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.put(req, res, options);
+    });
+
+    router.put(`/:id`, options.authMiddleware, async (req, res) => {
+      /*
+        #swagger.auto = false
+        #swagger.tags = ['user']
+        #swagger.summary = 'Update user data by ID'
+        #swagger.description = 'This endpoint will update user data by ID'
+        #swagger.path = '/user/{id}'
+        #swagger.method = 'put'
+        #swagger.security = [{
+          'bearerAuth': []
+        }]
+
+        #swagger.parameters['id'] = {
+            in: 'path',
+            description: 'User ID',
+            required: true,
+            type: 'string'
         }
-      }
-    */
-    return await UserController.delete(req, res, options);
-  });
 
-  router.delete(`/`, authMiddleware, async (req, res) => {
-    /*
-      #swagger.ignore = true
-    */
-    return await UserController.delete(req, res, options);
-  });
+        #swagger.responses[200] = {
+          description: 'User updated successfully',
+          content: {
+              'application/json': {
+                  schema: {
+                    $ref: '#/components/schemas/userUpdateResponse'
+                  }
+              }
+          }
+        }
 
-  // Username public profile redirect
-  options.app.get(`${options.path === '/' ? '' : options.path}/u/:username`, async (req, res, next) => {
-    /*
-      #swagger.ignore = true
-    */
-    return res.redirect(`${options.path === '/' ? '' : options.path}/u?cid=${req.params.username}`);
-  });
+        #swagger.responses[400] = {
+          description: 'Bad request. Please check the input data',
+          content: {
+              'application/json': {
+                  schema: {
+                    $ref: '#/components/schemas/userBadRequestResponse'
+                  }
+              }
+          }
+        }
+      */
+      return await UserController.put(req, res, options);
+    });
+
+    router.put(`/`, options.authMiddleware, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.put(req, res, options);
+    });
+
+    router.delete(`/:id`, options.authMiddleware, async (req, res) => {
+      /*
+        #swagger.auto = false
+        #swagger.tags = ['user']
+        #swagger.summary = 'Delete user data by ID'
+        #swagger.description = 'This endpoint deletes user data by ID, the path ID must match with the ID of the authenticated user'
+        #swagger.path = '/user/{id}'
+        #swagger.method = 'delete'
+        #swagger.produces = ['application/json']
+        #swagger.consumes = ['application/json']
+        #swagger.security = [{
+          'bearerAuth': []
+        }]
+
+        #swagger.parameters['id'] = {
+            in: 'path',
+            description: 'User ID',
+            required: true,
+            type: 'string'
+        }
 
-  return router;
-};
+        #swagger.responses[200] = {
+          description: 'get user successfully',
+          content: {
+              'application/json': {
+                  schema: {
+                    $ref: '#/components/schemas/userGetResponse'
+                  }
+              }
+          }
+        }
 
-const ApiRouter = UserRouter;
+        #swagger.responses[400] = {
+          description: 'Bad request. Please check the input data',
+          content: {
+              'application/json': {
+                  schema: {
+                    $ref: '#/components/schemas/userBadRequestResponse'
+                  }
+              }
+          }
+        }
+      */
+      return await UserController.delete(req, res, options);
+    });
+
+    router.delete(`/`, options.authMiddleware, async (req, res) => {
+      /*
+        #swagger.ignore = true
+      */
+      return await UserController.delete(req, res, options);
+    });
+
+    // Username public profile redirect — registered directly on the app so the
+    // /u/:username shortlink works outside the API path prefix.
+    options.app.get(`${options.path === '/' ? '' : options.path}/u/:username`, async (req, res, next) => {
+      /*
+        #swagger.ignore = true
+      */
+      return res.redirect(`${options.path === '/' ? '' : options.path}/u?cid=${req.params.username}`);
+    });
+
+    return router;
+  }
+}
+
+const ApiRouter = (options) => UserRouter.router(options);
 
 export { ApiRouter, UserRouter };