feat: Add installationId to arguments for verifyUserEmails, preventLoginWithUnverifiedEmail (#8836)

This commit is contained in:
Manuel
2023-12-17 01:50:19 +01:00
committed by GitHub
parent 2c2563ebd2
commit a22dbe16d5
2 changed files with 4 additions and 2 deletions

View File

@@ -299,7 +299,7 @@ describe('Email Verification Token Expiration: ', () => {
};
const verifyUserEmails = {
method(req) {
expect(Object.keys(req)).toEqual(['original', 'object', 'master', 'ip']);
expect(Object.keys(req)).toEqual(['original', 'object', 'master', 'ip', 'installationId']);
return false;
},
};
@@ -358,7 +358,7 @@ describe('Email Verification Token Expiration: ', () => {
};
const verifyUserEmails = {
method(req) {
expect(Object.keys(req)).toEqual(['original', 'object', 'master', 'ip']);
expect(Object.keys(req)).toEqual(['original', 'object', 'master', 'ip', 'installationId']);
if (req.object.get('username') === 'no_email') {
return false;
}

View File

@@ -804,6 +804,7 @@ RestWrite.prototype._validateEmail = function () {
object: updatedObject,
master: this.auth.isMaster,
ip: this.config.ip,
installationId: this.auth.installationId,
};
return this.config.userController.setEmailVerifyToken(this.data, request, this.storage);
}
@@ -947,6 +948,7 @@ RestWrite.prototype.createSessionTokenIfNeeded = async function () {
object: updatedObject,
master: this.auth.isMaster,
ip: this.config.ip,
installationId: this.auth.installationId,
};
shouldPreventUnverifedLogin = await Promise.resolve(
this.config.preventLoginWithUnverifiedEmail(request)