Resolve conflicts, update tests

This commit is contained in:
Alex Holliday committed 2024-10-17 10:54:31 +08:00
1 parent 81f1fe4694
commit 63e39ed50d
3 files changed
+13 -12

No files matched your search

-1
View File
@@ -114,7 +114,6 @@ const registerUser = async (req, res, next) => {
data: { user: newUser, token: token, refreshToken: refreshToken },
});
} catch (error) {
console.log("ERROR", error);
next(handleError(error, SERVICE_NAME, "registerController"));
}
};
-7
View File
@@ -27,7 +27,6 @@
"nodemailer": "^6.9.14",
"ping": "0.4.4",
"sharp": "0.33.4",
"ssl-checker": "2.0.10",
"swagger-ui-express": "5.0.1",
"winston": "^3.13.0"
},
@@ -6003,12 +6002,6 @@
"memory-pager": "^1.0.2"
}
},
"node_modules/ssl-checker": {
"version": "2.0.10",
"resolved": "https://registry.npmjs.org/ssl-checker/-/ssl-checker-2.0.10.tgz",
"integrity": "sha512-SS6rrZocToJWHM1p6iVNb583ybB3UqT1fymCHSWuEdXDUqKA6O1D5Fb8KJVmhj3XKXE82IEWcr+idJrc4jUzFQ==",
"license": "MIT"
},
"node_modules/stack-trace": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
@@ -173,7 +173,10 @@ describe("Auth Controller - registerUser", () => {
req.db.checkSuperadmin.resolves(false);
req.db.updateAppSettings.resolves();
req.db.insertUser.returns({ _id: "123" });
req.settingsService.getSettings.returns({ jwtSecret: "my_secret" });
req.settingsService.getSettings.returns({
jwtSecret: "my_secret",
refreshTokenSecret: "my_secret",
});
req.emailService.buildAndSendEmail.rejects(new Error("emailService error"));
await registerUser(req, res, next);
expect(logger.error.calledOnce).to.be.true;
@@ -184,7 +187,10 @@ describe("Auth Controller - registerUser", () => {
req.db.checkSuperadmin.resolves(false);
req.db.updateAppSettings.resolves();
req.db.insertUser.returns(user);
req.settingsService.getSettings.returns({ jwtSecret: "my_secret" });
req.settingsService.getSettings.returns({
jwtSecret: "my_secret",
refreshTokenSecret: "my_secret",
});
req.emailService.buildAndSendEmail.resolves("message-id");
await registerUser(req, res, next);
expect(res.status.calledWith(200)).to.be.true;
@@ -192,7 +198,7 @@ describe("Auth Controller - registerUser", () => {
res.json.calledWith({
success: true,
msg: successMessages.AUTH_CREATE_USER,
data: { user, token: sinon.match.string },
data: { user, token: sinon.match.string, refreshToken: sinon.match.string },
})
).to.be.true;
expect(next.notCalled).to.be.true;
@@ -202,7 +208,10 @@ describe("Auth Controller - registerUser", () => {
req.db.checkSuperadmin.resolves(true);
req.db.updateAppSettings.resolves();
req.db.insertUser.returns(user);
req.settingsService.getSettings.returns({ jwtSecret: "my_secret" });
req.settingsService.getSettings.returns({
jwtSecret: "my_secret",
refreshTokenSecret: "my_secret",
});
req.emailService.buildAndSendEmail.resolves("message-id");
await registerUser(req, res, next);
expect(res.status.calledWith(200)).to.be.true;