@loomcore/api 0.0.16 → 0.0.18

package/dist/services/auth.service.d.ts

@@ -16,8 +16,8 @@ export declare class AuthService extends GenericApiService<IUser> {
         };
         userContext: IUserContext;
     } | null>;
-    getUserById(id: string): Promise<import("mongodb").WithId<import("bson").Document> | null>;
-    getUserByEmail(email: string): Promise<IUser>;
+    getUserById(id: string): Promise<IUser | null>;
+    getUserByEmail(email: string): Promise<IUser | null>;
     createUser(userContext: IUserContext, user: IUser): Promise<IUser | null>;
     requestTokenUsingRefreshToken(req: Request): Promise<ITokenResponse | null>;
     changeLoggedInUsersPassword(userContext: IUserContext, body: any): Promise<UpdateResult<import("bson").Document>>;

package/dist/services/auth.service.js

@@ -56,20 +56,16 @@ export class AuthService extends GenericApiService {
         }
         return loginResponse;
     }
-    getUserById(id) {
+    async getUserById(id) {
         if (!entityUtils.isValidObjectId(id)) {
             throw new BadRequestError('id is not a valid ObjectId');
         }
-        return this.collection.findOne({ _id: new ObjectId(id) })
-            .then((doc) => {
-            return doc;
-        });
+        const user = await this.findOne(EmptyUserContext, { _id: new ObjectId(id) });
+        return user;
     }
-    getUserByEmail(email) {
-        return this.collection.findOne({ email: email.toLowerCase() })
-            .then((user) => {
-            return user;
-        });
+    async getUserByEmail(email) {
+        const user = await this.findOne(EmptyUserContext, { email: email.toLowerCase() });
+        return user;
     }
     async createUser(userContext, user) {
         const createdUser = await this.create(userContext, user);
@@ -99,14 +95,16 @@ export class AuthService extends GenericApiService {
         return result;
     }
     async changePassword(userContext, queryObject, password) {
-        const hashedPassword = await passwordUtils.hashPassword(password);
-        let updates = { password: hashedPassword, lastPasswordChange: moment().utc().toDate() };
-        updates = (await this.onBeforeUpdate(userContext, updates));
-        const mongoUpdateResult = await this.collection.updateOne(queryObject, { $set: updates });
-        if (mongoUpdateResult?.modifiedCount > 0) {
-            await this.onAfterUpdate(userContext, updates);
-        }
-        return mongoUpdateResult;
+        const updates = { password: password, _lastPasswordChange: moment().utc().toDate() };
+        const updatedUsers = await super.update(userContext, queryObject, updates);
+        const result = {
+            acknowledged: true,
+            modifiedCount: updatedUsers.length,
+            upsertedId: null,
+            upsertedCount: 0,
+            matchedCount: updatedUsers.length
+        };
+        return result;
     }
     async createNewTokens(userId, deviceId, refreshTokenExpiresOn) {
         let createdRefreshTokenObject = null;
@@ -268,9 +266,8 @@ export class AuthService extends GenericApiService {
             if (!entityUtils.isValidObjectId(userId)) {
                 throw new BadRequestError('userId is not a valid ObjectId');
             }
-            const queryObject = { _id: new ObjectId(userId) };
-            const updates = { lastLoggedIn: moment().utc().toDate() };
-            await this.collection.updateOne(queryObject, { $set: updates });
+            const updates = { _lastLoggedIn: moment().utc().toDate() };
+            await this.partialUpdateById(EmptyUserContext, userId, updates);
         }
         catch (error) {
             console.log(`Failed to update lastLoggedIn for user ${userId}: ${error}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb",
   "scripts": {
@@ -44,7 +44,7 @@
     "jsonwebtoken": "^9.0.2"
   },
   "peerDependencies": {
-    "@loomcore/common": "^0.0.8",
+    "@loomcore/common": "^0.0.9",
     "@sinclair/typebox": "^0.34.31",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",