@loomcore/api 0.0.12 → 0.0.14

package/dist/middleware/error-handler.js

@@ -3,15 +3,8 @@ import { apiUtils } from '../utils/index.js';
 import { config } from '../config/base-api-config.js';
 const SENSITIVE_FIELDS = [
     'password',
-    'token',
-    'apiKey',
     'secret',
-    'credit_card',
-    'creditCard',
-    'ssn',
-    'email',
-    'phone',
-    'address'
+    'ssn'
 ];
 const sanitizeData = (data) => {
     if (!data || typeof data !== 'object') {

package/dist/services/auth.service.js

@@ -66,7 +66,7 @@ export class AuthService extends GenericApiService {
         });
     }
     getUserByEmail(email) {
-        return this.collection.findOne({ email: email })
+        return this.collection.findOne({ email: email.toLowerCase() })
             .then((user) => {
             return user;
         });
@@ -176,17 +176,18 @@ export class AuthService extends GenericApiService {
         await this.emailService.sendHtmlEmail(emailAddress, `Reset Password for ${config.appName}`, htmlEmailBody);
     }
     async resetPassword(email, passwordResetToken, password) {
-        const retrievedPasswordResetToken = await this.passwordResetTokenService.getByEmail(email);
+        const lowerCaseEmail = email.toLowerCase();
+        const retrievedPasswordResetToken = await this.passwordResetTokenService.getByEmail(lowerCaseEmail);
         if (!retrievedPasswordResetToken) {
-            throw new ServerError(`Unable to retrieve password reset token for email: ${email}`);
+            throw new ServerError(`Unable to retrieve password reset token for email: ${lowerCaseEmail}`);
         }
         if (retrievedPasswordResetToken.token !== passwordResetToken || retrievedPasswordResetToken.expiresOn < Date.now()) {
             throw new BadRequestError('Invalid password reset token');
         }
-        const result = await this.changePassword(EmptyUserContext, { email }, password);
-        console.log(`password changed using forgot-password for email: ${email}`);
+        const result = await this.changePassword(EmptyUserContext, { email: lowerCaseEmail }, password);
+        console.log(`password changed using forgot-password for email: ${lowerCaseEmail}`);
         await this.passwordResetTokenService.deleteById(EmptyUserContext, retrievedPasswordResetToken._id.toString());
-        console.log(`passwordResetToken deleted for email: ${email}`);
+        console.log(`passwordResetToken deleted for email: ${lowerCaseEmail}`);
         return result;
     }
     deleteRefreshTokensForDevice(deviceId) {

package/dist/services/password-reset-token.service.js

@@ -6,15 +6,16 @@ export class PasswordResetTokenService extends GenericApiService {
         super(db, 'passwordResetTokens', 'passwordResetToken', PasswordResetTokenSpec);
     }
     async createPasswordResetToken(email, expiresOn) {
-        await this.collection.deleteMany({ email });
+        const lowerCaseEmail = email.toLowerCase();
+        await this.collection.deleteMany({ email: lowerCaseEmail });
         const passwordResetToken = {
-            email,
+            email: lowerCaseEmail,
             token: crypto.randomBytes(40).toString('hex'),
             expiresOn: expiresOn,
         };
         return super.create(EmptyUserContext, passwordResetToken);
     }
     async getByEmail(email) {
-        return await super.findOne(EmptyUserContext, { email });
+        return await super.findOne(EmptyUserContext, { email: email.toLowerCase() });
     }
 }

package/dist/services/user.service.js

@@ -11,6 +11,9 @@ export class UserService extends MultiTenantApiService {
     }
     async prepareEntity(userContext, entity, isCreate) {
         const preparedEntity = await super.prepareEntity(userContext, entity, isCreate);
+        if (preparedEntity.email) {
+            preparedEntity.email = preparedEntity.email.toLowerCase();
+        }
         if (!isCreate) {
             return Value.Clean(PublicUserSchema, preparedEntity);
         }

package/dist/utils/db.utils.js

@@ -152,10 +152,15 @@ function buildMongoMatchFromQueryOptions(queryOptions) {
     for (const [key, value] of Object.entries(filters)) {
         if (value) {
             if (value.eq !== undefined) {
-                if (typeof value.eq === 'string' && !PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key)
-                    && key.endsWith('Id') && entityUtils.isValidObjectId(value.eq)) {
+                if (typeof value.eq === 'string'
+                    && key.endsWith('Id')
+                    && !PROPERTIES_THAT_ARE_NOT_OBJECT_IDS.includes(key)
+                    && entityUtils.isValidObjectId(value.eq)) {
                     match[key] = new ObjectId(value.eq);
                 }
+                else if (typeof value.eq === 'string' && !isNaN(Number(value.eq))) {
+                    match[key] = Number(value.eq);
+                }
                 else {
                     match[key] = value.eq;
                 }
@@ -170,7 +175,8 @@ function buildMongoMatchFromQueryOptions(queryOptions) {
                     }
                 }
                 else {
-                    match[key] = { $in: value.in };
+                    const convertedValues = value.in.map(val => typeof val === 'string' && !isNaN(Number(val)) ? Number(val) : val);
+                    match[key] = { $in: convertedValues };
                 }
             }
             else if (value.gte !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb",
   "scripts": {