Skip to content

EWC-347 fixed user activate/suspend handling #358

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 14, 2018
Merged

EWC-347 fixed user activate/suspend handling #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
526eed4
EWC-347 fixed user activate/suspend handling
Railag Nov 14, 2018
db2e0fb
cleanup
Railag Nov 14, 2018
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
2 changes: 1 addition & 1 deletion src/controllers/user-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const resendActivationEndPoint = async function (req) {
const activateUserAccountEndPoint = async function (req) {
const codeData = req.body;

return await UserService.activateUser(codeData, false);
await UserService.activateUser(codeData, false);
};

const userLogoutEndPoint = async function (req, user) {
Expand Down
2 changes: 2 additions & 0 deletions src/helpers/error-messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ module.exports = {
INVALID_CONTENT_TYPE: 'Invalid content type',
UPLOADED_FILE_NOT_FOUND: 'Uploaded image snapshot file not found',
REGISTRY_NOT_FOUND: 'Registry not found',
USER_ALREADY_ACTIVATED: 'User is already activated.',
USER_NOT_ACTIVATED_YET: 'User is not activated yet.',
CLI: {
INVALID_PORT_MAPPING: 'Port mapping parsing error. Please provide valid port mapping.',
INVALID_VOLUME_MAPPING: 'Volume mapping parsing error. Please provide valid volume mapping.',
Expand Down
12 changes: 12 additions & 0 deletions src/services/user-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ const activateUser = async function (codeData, isCLI, transaction) {
};

if (isCLI) {
const user = await UserManager.findOne({
id: codeData.userId
}, transaction);

if (user.emailActivated === true) {
throw new Error(ErrorMessages.USER_ALREADY_ACTIVATED)
}

await _updateUser(codeData.userId, updatedObj, transaction);
} else {
await Validator.validate(codeData, Validator.schemas.activateUser);
Expand Down Expand Up @@ -201,6 +209,10 @@ const list = async function (isCLI, transaction) {
};

const suspendUser = async function (user, isCLI, transaction) {
if (user.emailActivated === false) {
throw new Error(ErrorMessages.USER_NOT_ACTIVATED_YET)
}

const updatedObj = {
emailActivated: false
};
Expand Down