fix(authentication): provider email/id matching not working properly

modules/authentication/src/handlers/oauth2/OAuth2.ts

@@ -188,14 +188,22 @@ export abstract class OAuth2<T, S extends OAuth2Settings>
 
   async createOrUpdateUser(payload: Payload<T>, invitationToken?: string): Promise<User> {
     let user: User | null = null;
-    if (payload.hasOwnProperty('email')) {
+    if (payload.hasOwnProperty('email') && !isNil(payload.email)) {
       user = await User.getInstance().findOne({
         email: payload.email,
       });
-    } else if (payload.hasOwnProperty('id') && !payload.hasOwnProperty('email')) {
+    } else if (
+      payload.hasOwnProperty('id') &&
+      (!payload.hasOwnProperty('email') || isNil(payload.email))
+    ) {
       user = await User.getInstance().findOne({
         [this.providerName]: { id: payload.id },
       });
+    } else {
+      throw new GrpcError(
+        status.INVALID_ARGUMENT,
+        'No email or id received from provider',
+      );
     }
     if (!isNil(user)) {
       if (!user!.active) throw new GrpcError(status.PERMISSION_DENIED, 'Inactive user');