fix(authentication): user id matching on oauth2

refactor(database): check for empty queries in sql after $push/$increment ops
ConduitPlatform · Apr 28, 2023 · 55ad75e · 55ad75e
1 parent de5851d
commit 55ad75e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/modules/authentication/src/handlers/oauth2/OAuth2.ts b/modules/authentication/src/handlers/oauth2/OAuth2.ts
@@ -197,7 +197,7 @@ export abstract class OAuth2<T, S extends OAuth2Settings>
       (!payload.hasOwnProperty('email') || isNil(payload.email))
     ) {
       user = await User.getInstance().findOne({
-        [this.providerName]: { id: payload.id },
+        [this.providerName + '.id']: payload.id,
       });
     } else {
       throw new GrpcError(

diff --git a/modules/database/src/adapters/sequelize-adapter/SequelizeSchema.ts b/modules/database/src/adapters/sequelize-adapter/SequelizeSchema.ts
@@ -125,6 +125,16 @@ export class SequelizeSchema implements SchemaAdapter<ModelStatic<any>> {
         }
         delete parsedQuery['$inc'];
       }
+      if (Object.keys(parsedQuery).length === 0) {
+        return this.model
+          .findByPk(id, {
+            nest: true,
+            include: this.constructAssociationInclusion({}).concat(
+              this.constructRelationInclusion(populate),
+            ),
+          })
+          .then(doc => (doc ? doc.toJSON() : doc));
+      }
 
       if (parsedQuery.hasOwnProperty('$push')) {
         const push = parsedQuery['$push'];
@@ -192,6 +202,17 @@ export class SequelizeSchema implements SchemaAdapter<ModelStatic<any>> {
         delete parsedQuery['$push'];
       }
 
+      if (Object.keys(parsedQuery).length === 0) {
+        return this.model
+          .findByPk(id, {
+            nest: true,
+            include: this.constructAssociationInclusion({}).concat(
+              this.constructRelationInclusion(populate),
+            ),
+          })
+          .then(doc => (doc ? doc.toJSON() : doc));
+      }
+
       parsedQuery.updatedAt = new Date();
       incrementDbQueries();
       const associationObjects: Indexable = {};
@@ -411,6 +432,7 @@ export class SequelizeSchema implements SchemaAdapter<ModelStatic<any>> {
     const t = await this.sequelize.transaction({ type: Transaction.TYPES.IMMEDIATE });
     return this.model
       .bulkCreate(parsedQuery, {
+        validate: true,
         include: this.constructAssociationInclusion(assocs, true),
         transaction: t,
       })