Skip to content

Add same regex as client to address validation #61

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
Jan 7, 2018
Merged

Add same regex as client to address validation #61

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
7afbc8d
Add same regex as client to address validation
chq-matteo Jan 6, 2018
e727fd3
Move address regex to constants.js
chq-matteo Jan 6, 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
4 changes: 4 additions & 0 deletions src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,7 @@ export const BUS_API_EVENT = {
PROJECT_FILE_UPLOADED: 'connect.project.fileUploaded',
PROJECT_SPECIFICATION_MODIFIED: 'connect.project.specificationModified',
};

export const REGEX = {
URL: /^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+(\:[0-9]{2,5})?(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=]*)?$/,
};
4 changes: 2 additions & 2 deletions src/routes/projects/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import _ from 'lodash';
import Joi from 'joi';

import models from '../../models';
import { PROJECT_TYPE, PROJECT_MEMBER_ROLE, PROJECT_STATUS, USER_ROLE, EVENT } from '../../constants';
import { PROJECT_TYPE, PROJECT_MEMBER_ROLE, PROJECT_STATUS, USER_ROLE, EVENT, REGEX } from '../../constants';
import util from '../../util';
import directProject from '../../services/directProject';

Expand Down Expand Up @@ -34,7 +34,7 @@ const createProjectValdiations = {
}).allow(null),
bookmarks: Joi.array().items(Joi.object().keys({
title: Joi.string(),
address: Joi.string(),
address: Joi.string().regex(REGEX.URL),
})).optional().allow(null),
estimatedPrice: Joi.number().precision(2).positive().optional()
.allow(null),
Expand Down
3 changes: 2 additions & 1 deletion src/routes/projects/update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
PROJECT_MEMBER_ROLE,
EVENT,
USER_ROLE,
REGEX,
} from '../../constants';
import util from '../../util';
import directProject from '../../services/directProject';
Expand Down Expand Up @@ -57,7 +58,7 @@ const updateProjectValdiations = {
}).allow(null),
bookmarks: Joi.array().items(Joi.object().keys({
title: Joi.string(),
address: Joi.string(),
address: Joi.string().regex(REGEX.URL),
})).optional().allow(null),
type: Joi.any().valid(_.values(PROJECT_TYPE)),
details: Joi.any(),
Expand Down