From 4f12444a9dad5d96a6aea5980f96df3904444168 Mon Sep 17 00:00:00 2001
From: "Navy.gif" <navydotgif@gmail.com>
Date: Tue, 7 Feb 2023 21:14:31 +0200
Subject: [PATCH] new keyworkd for objectid

---
 src/server/components/UserDatabase.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server/components/UserDatabase.js b/src/server/components/UserDatabase.js
index d11ae38..8c6093a 100644
--- a/src/server/components/UserDatabase.js
+++ b/src/server/components/UserDatabase.js
@@ -64,7 +64,7 @@ class UserDatabase extends AbstractUserDatabase {
         if (id.includes('temp')) 
             return null;
 
-        const data = await this.db.findOne(this._userColllection, { _id: ObjectId(id) });
+        const data = await this.db.findOne(this._userColllection, { _id: new ObjectId(id) });
         if (!data) 
             return null;
 
@@ -85,7 +85,7 @@ class UserDatabase extends AbstractUserDatabase {
         if (!force && this.cache.has(id)) 
             return this.cache.get(id);
 
-        const data = await this.db.findOne(this._appCollection, { _id: ObjectId(id) });
+        const data = await this.db.findOne(this._appCollection, { _id: new ObjectId(id) });
         if (!data) 
             return null;
 
@@ -238,11 +238,11 @@ class UserDatabase extends AbstractUserDatabase {
             return false;
         if (result.created + result.validFor < Date.now()) {
             // Code existed but is no longer valid
-            await this.db.deleteOne('registrationCodes', { _id: ObjectId(result._id) });
+            await this.db.deleteOne('registrationCodes', { _id: new ObjectId(result._id) });
             return false;
         }
         // Valid code
-        await this.db.deleteOne('registrationCodes', { _id: ObjectId(result._id) });
+        await this.db.deleteOne('registrationCodes', { _id: new ObjectId(result._id) });
         return true;
     }
 
@@ -256,7 +256,7 @@ class UserDatabase extends AbstractUserDatabase {
         const { json } = user;
         this.logger.debug(`Updating user ${inspect(json)}`);
         if (user._id) 
-            await this.db.updateOne(this._userColllection, { _id: ObjectId(user._id) }, json);
+            await this.db.updateOne(this._userColllection, { _id: new ObjectId(user._id) }, json);
         else {
             const result = await this.db.insertOne(this._userColllection, json);
             user._id = result.insertedId;
@@ -267,7 +267,7 @@ class UserDatabase extends AbstractUserDatabase {
     async updateApplication (app) {
         const { json } = app;
         this.logger.debug(`Updating application ${inspect(json)}`);
-        await this.db.updateOne(this._appCollection, { _id: ObjectId(json._id) }, json, true);
+        await this.db.updateOne(this._appCollection, { _id: new ObjectId(json._id) }, json, true);
     }