Bugfix on Mongo.createUser and Mongo.createSession on 4.X (#1251)

awatson1978 · web-flow · commit 3f1c4945526f · 2023-07-24T17:08:33.000+02:00
* insertedId bugfix

* Removed commented out line

* added changeset

* Delete yarn.lock

* Update package.json; removed dependency to changeset
diff --git a/.changeset/purple-dryers-peel.md b/.changeset/purple-dryers-peel.md
@@ -0,0 +1,6 @@
+---
+'@accounts/mongo-password': minor
+'@accounts/mongo-sessions': minor
+---
+
+MongoDB 4.X support for Meteor@2.5.1 - Mongo.createUser and Mongo.createSession bugfixes
diff --git a/packages/database-mongo-password/src/mongo-password.ts b/packages/database-mongo-password/src/mongo-password.ts
@@ -149,8 +149,9 @@ export class MongoServicePassword implements DatabaseInterfaceServicePassword {
       user._id = this.options.idProvider();
     }
     const ret = await this.userCollection.insertOne(user);
+    
     // keep ret.ops for compatibility with MongoDB 3.X, version 4.X uses insertedId
-    return ((ret.insertedId ?? ret.ops[0]._id) as ObjectID).toString();
+    return ((ret.insertedId ? ret.insertedId : ret.ops[0]._id) as ObjectID).toString();
   }
 
   /**
diff --git a/packages/database-mongo-sessions/src/mongo-sessions.ts b/packages/database-mongo-sessions/src/mongo-sessions.ts
@@ -124,7 +124,8 @@ export class MongoSessions implements DatabaseInterfaceSessions {
 
     const ret = await this.sessionCollection.insertOne(session);
     // keep ret.ops for compatibility with MongoDB 3.X, version 4.X uses insertedId
-    return ((ret.insertedId ?? ret.ops[0]._id) as ObjectID).toString();
+    return ((ret.insertedId ? ret.insertedId : ret.ops[0]._id) as ObjectID).toString();
+
   }
 
   /**

-Original file line number
+Diff line change
 +---
 +'@accounts/mongo-password': minor
 +'@accounts/mongo-sessions': minor
 +---
++
 +MongoDB 4.X support for [email protected] - Mongo.createUser and Mongo.createSession bugfixes
Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,9 @@ export class MongoServicePassword implements DatabaseInterfaceServicePassword {`
`149`	`149`	`user._id = this.options.idProvider();`
`150`	`150`	`}`
`151`	`151`	`const ret = await this.userCollection.insertOne(user);`
	`152`	`+`
`152`	`153`	`// keep ret.ops for compatibility with MongoDB 3.X, version 4.X uses insertedId`
`153`		`- return ((ret.insertedId ?? ret.ops[0]._id) as ObjectID).toString();`
	`154`	`+ return ((ret.insertedId ? ret.insertedId : ret.ops[0]._id) as ObjectID).toString();`
`154`	`155`	`}`
`155`	`156`
`156`	`157`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,8 @@ export class MongoSessions implements DatabaseInterfaceSessions {`
`124`	`124`
`125`	`125`	`const ret = await this.sessionCollection.insertOne(session);`
`126`	`126`	`// keep ret.ops for compatibility with MongoDB 3.X, version 4.X uses insertedId`
`127`		`- return ((ret.insertedId ?? ret.ops[0]._id) as ObjectID).toString();`
	`127`	`+ return ((ret.insertedId ? ret.insertedId : ret.ops[0]._id) as ObjectID).toString();`
	`128`	`+`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`/**`