Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added New PUT Route for User Intro #2293

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions controllers/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,10 @@ const rejectProfileDiff = async (req, res) => {
};

const addUserIntro = async (req, res) => {
if (req.path !== "/self/intro" && req.params.userId !== req.userData.id) {
return res.status(403).json({ message: "Unauthorized access" });
}

try {
const rawData = req.body;
const joinData = await userQuery.getJoinData(req.userData.id);
Expand Down
4 changes: 3 additions & 1 deletion routes/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
const ROLES = require("../constants/roles");
const { Services } = require("../constants/bot");
const authenticateProfile = require("../middlewares/authenticateProfile");
const { devFlagMiddleware } = require("../middlewares/devFlag");

router.post("/", authorizeAndAuthenticate([ROLES.SUPERUSER], [Services.CRON_JOB_HANDLER]), users.markUnverified);
router.post("/update-in-discord", authenticate, authorizeRoles([SUPERUSER]), users.setInDiscordScript);
Expand All @@ -35,7 +36,8 @@
);
router.get("/:username", users.getUser);
router.get("/:userId/intro", authenticate, authorizeRoles([SUPERUSER]), users.getUserIntro);
router.put("/self/intro", authenticate, userValidator.validateJoinData, users.addUserIntro);
router.put("/self/intro", authenticate, userValidator.validateJoinData, users.addUserIntro); // This route is being deprecated soon, please use alternate available route `/users/:userId/intro`.
Dismissed Show dismissed Hide dismissed
router.put("/:userId/intro", devFlagMiddleware, authenticate, userValidator.validateJoinData, users.addUserIntro);
Fixed Show fixed Hide fixed
router.get("/:id/skills", users.getUserSkills);
router.get("/:id/badges", getUserBadges);
router.patch(
Expand Down
99 changes: 99 additions & 0 deletions test/integration/users.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1579,6 +1579,105 @@ describe("Users", function () {
});
});

describe("PUT /users/:userId/intro", function () {
let userStatusData;

beforeEach(async function () {
await userStatusModel.updateUserStatus(userId, userStatusDataAfterSignup);
const updateStatus = await userStatusModel.updateUserStatus(userId, userStatusDataAfterFillingJoinSection);
userStatusData = (await firestore.collection("usersStatus").doc(updateStatus.id).get()).data();
});

it("should return 409 if the data already present", function (done) {
addJoinData(joinData(userId)[3]);
chai
.request(app)
.put(`/users/${userId}/intro?dev=true`)
.set("Cookie", `${cookieName}=${jwt}`)
.send(joinData(userId)[3])
.end((err, res) => {
if (err) {
return done(err);
}
expect(res).to.have.status(409);
expect(res.body).to.be.a("object");
expect(res.body.message).to.equal("User data is already present!");
return done();
});
});

it("Should store the info in db", function (done) {
chai
.request(app)
.put(`/users/${userId}/intro?dev=true`)
.set("Cookie", `${cookieName}=${jwt}`)
.send(joinData()[2])
.end((err, res) => {
if (err) {
return done(err);
}
expect(res).to.have.status(201);
expect(res.body).to.be.a("object");
expect(res.body.message).to.equal("User join data and newstatus data added and updated successfully");
expect(userStatusData).to.have.own.property("currentStatus");
expect(userStatusData).to.have.own.property("monthlyHours");
expect(userStatusData.currentStatus.state).to.equal("ONBOARDING");
expect(userStatusData.monthlyHours.committed).to.equal(40);
return done();
});
});

it("Should return 401 for unauthorized request", function (done) {
chai
.request(app)
.put(`/users/${userId}/intro?dev=true`)
.set("Cookie", `${cookieName}=""`)
.send(joinData()[2])
.end((err, res) => {
if (err) {
return done(err);
}
expect(res).to.have.status(401);
expect(res.body).to.be.a("object");
return done();
});
});

it("Should return 400 for invalid Data", function (done) {
chai
.request(app)
.put(`/users/${userId}/intro?dev=true`)
.set("Cookie", `${cookieName}=${jwt}`)
.send(joinData()[1])
.end((err, res) => {
if (err) {
return done(err);
}
expect(res).to.have.status(400);
expect(res.body).to.be.a("object");
expect(res.body.message).to.be.equal('"firstName" is required');
return done();
});
});

it("Should return 403 for Unauthorized access", function (done) {
chai
.request(app)
.put(`/users/${userId}/intro?dev=true`)
.set("Cookie", `${cookieName}=${jwt}`)
.send(joinData()[1])
.end((err, res) => {
if (err) {
return done(err);
}
expect(res).to.have.status(400);
expect(res.body).to.be.a("object");
expect(res.body.message).to.be.equal('"firstName" is required');
return done();
});
});
});

describe("PATCH /users/rejectDiff", function () {
let profileDiffsId;

Expand Down
Loading