NIAEFEUP · Naapperas · Mar 1, 2023 · Mar 28, 2023 · Apr 1, 2023 · Apr 2, 2023
diff --git a/.dockerignore b/.dockerignore
diff --git a/.env b/.env
diff --git a/.env.test b/.env.test
diff --git a/.eslintrc b/.eslintrc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.gitignore b/.gitignore
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile-prod b/Dockerfile-prod
diff --git a/Dockerfile-test b/Dockerfile-test
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/__mocks__/nodemailer.js b/__mocks__/nodemailer.js
diff --git a/babel.config.json b/babel.config.json
diff --git a/certs/.gitignore b/certs/.gitignore
diff --git a/codecov.yaml b/codecov.yaml
@@ -0,0 +1,6 @@
+coverage:
+  status:
+    project:
+      default:
+        target: 80%
+        threshold: 5%
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/documentation/.gitignore b/documentation/.gitignore
diff --git a/documentation/README.md b/documentation/README.md
diff --git a/documentation/babel.config.js b/documentation/babel.config.js
diff --git a/documentation/docs-index.js b/documentation/docs-index.js
diff --git a/documentation/docs/applications/approve.md b/documentation/docs/applications/approve.md
diff --git a/documentation/docs/applications/create.md b/documentation/docs/applications/create.md
diff --git a/documentation/docs/applications/reject.md b/documentation/docs/applications/reject.md
diff --git a/documentation/docs/applications/search.md b/documentation/docs/applications/search.md
diff --git a/documentation/docs/auth/confirm.md b/documentation/docs/auth/confirm.md
diff --git a/documentation/docs/auth/finish-recovery.md b/documentation/docs/auth/finish-recovery.md
diff --git a/documentation/docs/auth/login.md b/documentation/docs/auth/login.md
diff --git a/documentation/docs/auth/logout.md b/documentation/docs/auth/logout.md
diff --git a/documentation/docs/auth/me.md b/documentation/docs/auth/me.md
diff --git a/documentation/docs/auth/recover.md b/documentation/docs/auth/recover.md
diff --git a/documentation/docs/auth/register.md b/documentation/docs/auth/register.md
diff --git a/documentation/docs/companies/block.md b/documentation/docs/companies/block.md
diff --git a/documentation/docs/companies/concurrent-offers.md b/documentation/docs/companies/concurrent-offers.md
diff --git a/documentation/docs/companies/delete.md b/documentation/docs/companies/delete.md
diff --git a/documentation/docs/companies/disable.md b/documentation/docs/companies/disable.md
diff --git a/documentation/docs/companies/enable.md b/documentation/docs/companies/enable.md
diff --git a/documentation/docs/companies/finish-registration.md b/documentation/docs/companies/finish-registration.md
diff --git a/documentation/docs/companies/list.md b/documentation/docs/companies/list.md
diff --git a/documentation/docs/companies/unblock.md b/documentation/docs/companies/unblock.md
diff --git a/documentation/docs/intro.md b/documentation/docs/intro.md
diff --git a/documentation/docs/intro/getting-started.md b/documentation/docs/intro/getting-started.md
diff --git a/documentation/docs/intro/how-to-docs.md b/documentation/docs/intro/how-to-docs.md
diff --git a/documentation/docs/offers/archive.md b/documentation/docs/offers/archive.md
diff --git a/documentation/docs/offers/create.md b/documentation/docs/offers/create.md
diff --git a/documentation/docs/offers/disable.md b/documentation/docs/offers/disable.md
diff --git a/documentation/docs/offers/edit.md b/documentation/docs/offers/edit.md
diff --git a/documentation/docs/offers/enable.md b/documentation/docs/offers/enable.md
diff --git a/documentation/docs/offers/get-company.md b/documentation/docs/offers/get-company.md
diff --git a/documentation/docs/offers/get.md b/documentation/docs/offers/get.md
diff --git a/documentation/docs/offers/hide.md b/documentation/docs/offers/hide.md
diff --git a/documentation/docs/offers/search.md b/documentation/docs/offers/search.md
diff --git a/documentation/docusaurus.config.js b/documentation/docusaurus.config.js
diff --git a/documentation/package-lock.json b/documentation/package-lock.json
diff --git a/documentation/package.json b/documentation/package.json
diff --git a/documentation/src/css/custom.css b/documentation/src/css/custom.css
diff --git a/documentation/src/highlight.js b/documentation/src/highlight.js
diff --git a/documentation/static/.nojekyll b/documentation/static/.nojekyll
diff --git a/documentation/static/img/favicon.ico b/documentation/static/img/favicon.ico
diff --git a/documentation/static/img/logo_2018.svg b/documentation/static/img/logo_2018.svg
diff --git a/jest.config.js b/jest.config.js
diff --git a/netlify.toml b/netlify.toml
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/src/api/APIErrorTypes.js b/src/api/APIErrorTypes.js
diff --git a/src/api/index.js b/src/api/index.js
diff --git a/src/api/middleware/auth.js b/src/api/middleware/auth.js
diff --git a/src/api/middleware/company.js b/src/api/middleware/company.js
diff --git a/src/api/middleware/errorHandler.js b/src/api/middleware/errorHandler.js
diff --git a/src/api/middleware/files.js b/src/api/middleware/files.js
diff --git a/src/api/middleware/offer.js b/src/api/middleware/offer.js
diff --git a/src/api/middleware/utils.js b/src/api/middleware/utils.js
diff --git a/src/api/middleware/validators/application.js b/src/api/middleware/validators/application.js
@@ -60,6 +60,13 @@ export const reject = useExpressValidators([
         .withMessage(ValidationReasons.TOO_SHORT(CompanyApplicationConstants.rejectReason.min_length)),
 ]);
 
+const isAfterSubmissionDateFrom = (submissionDateTo, { req }) => {
+
+    const { submissionDateFrom } = req.query;
+
+    return submissionDateFrom <= submissionDateTo;
+};
+
 const sortByParamValidator = (val) => {
 
     const regex = /^(\w+(:(desc|asc))?)(,\w+(:(desc|asc))?)*$/;
@@ -84,31 +91,43 @@ const parseSortByField = (val) => val.split(",");
 export const search = useExpressValidators([
     query("limit", ValidationReasons.DEFAULT)
         .optional()
-        .isInt({ min: 1, max: MAX_LIMIT_RESULTS })
-        .withMessage(ValidationReasons.MAX(MAX_LIMIT_RESULTS)),
+        .isInt().withMessage(ValidationReasons.INT).bail()
+        .toInt()
+        /*
+        Split validation checks in order to provide better error messages.
+        Another solution would be to return a "compound" error message, aka, one that contains both pieces of information.
+        The latter could help keep validation chains smaller.
+        */
+        .isInt({ min: 1 }).withMessage(ValidationReasons.MIN(1)).bail()
+        .isInt({ max: MAX_LIMIT_RESULTS }).withMessage(ValidationReasons.MAX(MAX_LIMIT_RESULTS)).bail()
+        .toInt(),
     query("offset", ValidationReasons.DEFAULT)
         .optional()
-        .isInt({ min: 0 })
-        .withMessage(ValidationReasons.MIN(0)),
+        .isInt().withMessage(ValidationReasons.INT).bail()
+        .toInt()
+        .isInt({ min: 0 }).withMessage(ValidationReasons.MIN(0)).bail()
+        .toInt(),
     query("companyName", ValidationReasons.DEFAULT)
         .optional()
-        .isString().withMessage(ValidationReasons.STRING),
+        .isString().withMessage(ValidationReasons.STRING).bail(),
     query("state", ValidationReasons.DEFAULT)
         .optional()
-        .customSanitizer(ensureArray)
         .isArray().withMessage(ValidationReasons.ARRAY).bail()
+        .customSanitizer(ensureArray)
         .custom(valuesInSet(Object.keys(ApplicationStatus))),
     query("submissionDateFrom", ValidationReasons.DEFAULT)
         .optional()
-        .toDate()
-        .isISO8601().withMessage(ValidationReasons.DATE),
+        .isISO8601().withMessage(ValidationReasons.DATE).bail()
+        .toDate(),
     query("submissionDateTo", ValidationReasons.DEFAULT)
         .optional()
+        .isISO8601().withMessage(ValidationReasons.DATE).bail()
         .toDate()
-        .isISO8601().withMessage(ValidationReasons.DATE),
+        .if((_, { req }) => req.query.submissionDateFrom !== undefined)
+        .custom(isAfterSubmissionDateFrom).withMessage(ValidationReasons.MUST_BE_AFTER("submissionDateFrom")),
     query("sortBy", ValidationReasons.DEFAULT)
         .optional()
-        .isString().withMessage(ValidationReasons.STRING)
+        .isString().withMessage(ValidationReasons.STRING).bail()
         .custom(sortByParamValidator)
         .customSanitizer(parseSortByField),
 ]);
diff --git a/src/api/middleware/validators/auth.js b/src/api/middleware/validators/auth.js
diff --git a/src/api/middleware/validators/company.js b/src/api/middleware/validators/company.js
@@ -10,6 +10,8 @@ export const MAX_LIMIT_RESULTS = 100;
 const DEFAULT_PUBLISH_DATE = new Date(Date.now()).toISOString();
 
 export const finish = useExpressValidators([
+    /* body("logo", ValidationReasons.DEFAULT)
+        .exists().withMessage(ValidationReasons.REQUIRED).bail(), */
     body("bio", ValidationReasons.DEFAULT)
         .exists().withMessage(ValidationReasons.REQUIRED).bail()
         .isString().withMessage(ValidationReasons.STRING)
@@ -25,7 +27,9 @@ export const finish = useExpressValidators([
 export const list = useExpressValidators([
     query("limit", ValidationReasons.DEFAULT)
         .optional()
-        .isInt({ min: 1, max: MAX_LIMIT_RESULTS })
+        .isInt({ min: 1 })
+        .withMessage(ValidationReasons.MIN(1)).bail()
+        .isInt({ max: MAX_LIMIT_RESULTS })
         .withMessage(ValidationReasons.MAX(MAX_LIMIT_RESULTS)),
     query("offset", ValidationReasons.DEFAULT)
         .optional()
@@ -126,9 +130,10 @@ export const edit = useExpressValidators([
         .withMessage(ValidationReasons.TOO_LONG(CompanyConstants.bio.max_length)),
     body("contacts", ValidationReasons.DEFAULT)
         .optional()
-        .customSanitizer(ensureArray)
+        .isArray().withMessage(ValidationReasons.ARRAY).bail()
         .isArray({ min: CompanyConstants.contacts.min_length, max: CompanyConstants.contacts.max_length })
-        .withMessage(ValidationReasons.ARRAY_SIZE(CompanyConstants.contacts.min_length, CompanyConstants.contacts.max_length)),
+        .withMessage(ValidationReasons.ARRAY_SIZE(CompanyConstants.contacts.min_length, CompanyConstants.contacts.max_length))
+        .customSanitizer(ensureArray),
     body("logo", ValidationReasons.DEFAULT)
         .optional()
         .isString().withMessage(ValidationReasons.STRING).bail()

diff --git a/src/api/middleware/validators/offer.js b/src/api/middleware/validators/offer.js
@@ -80,7 +80,6 @@ export const create = useExpressValidators([
         .custom(publishEndDateAfterPublishDate)
         .custom(publishEndDateLimit),
 
-
     body("jobMinDuration", ValidationReasons.DEFAULT)
         .exists().withMessage(ValidationReasons.REQUIRED).bail()
         .isInt().withMessage(ValidationReasons.INT),
@@ -119,7 +118,7 @@ export const create = useExpressValidators([
     body("jobType", ValidationReasons.DEFAULT)
         .exists().withMessage(ValidationReasons.REQUIRED).bail()
         .isString().withMessage(ValidationReasons.STRING).bail()
-        .isIn(JobTypes).withMessage(ValidationReasons.IN_ARRAY(JobTypes)),
+        .isIn(JobTypes).withMessage((value) => ValidationReasons.IN_ARRAY(JobTypes, value)),
 
     body("fields", ValidationReasons.DEFAULT)
         .exists().withMessage(ValidationReasons.REQUIRED).bail()
@@ -388,7 +387,7 @@ export const edit = useExpressValidators([
     body("jobType", ValidationReasons.DEFAULT)
         .optional()
         .isString().withMessage(ValidationReasons.STRING).bail()
-        .isIn(JobTypes).withMessage(ValidationReasons.IN_ARRAY(JobTypes)),
+        .isIn(JobTypes).withMessage((value) => ValidationReasons.IN_ARRAY(JobTypes, value)),
 
     body("fields", ValidationReasons.DEFAULT)
         .optional()
@@ -495,7 +494,7 @@ export const get = useExpressValidators([
     query("jobType")
         .optional()
         .isString().withMessage(ValidationReasons.STRING).bail()
-        .isIn(JobTypes).withMessage(ValidationReasons.IN_ARRAY(JobTypes)),
+        .isIn(JobTypes).withMessage((value) => ValidationReasons.IN_ARRAY(JobTypes, value)),
 
     query("jobMinDuration", ValidationReasons.DEFAULT)
         .optional()
@@ -522,7 +521,7 @@ export const get = useExpressValidators([
     query("sortBy", ValidationReasons.DEFAULT)
         .optional()
         .isString().withMessage(ValidationReasons.STRING).bail()
-        .isIn(OfferConstants.SortableFields).withMessage(ValidationReasons.IN_ARRAY(OfferConstants.SortableFields)),
+        .isIn(OfferConstants.SortableFields).withMessage((value) => ValidationReasons.IN_ARRAY(OfferConstants.SortableFields, value)),
 
     query("descending", ValidationReasons.DEFAULT)
         .optional()

diff --git a/src/api/middleware/validators/validationReasons.js b/src/api/middleware/validators/validationReasons.js
diff --git a/src/api/middleware/validators/validatorUtils.js b/src/api/middleware/validators/validatorUtils.js
diff --git a/src/api/routes/application.js b/src/api/routes/application.js
diff --git a/src/api/routes/auth.js b/src/api/routes/auth.js
diff --git a/src/api/routes/company.js b/src/api/routes/company.js
@@ -13,7 +13,7 @@ import { concurrentOffersNotExceeded } from "../middleware/validators/validatorU
 
 import { or } from "../middleware/utils.js";
 
-import * as fileMiddleware  from "../middleware/files.js";
+import * as fileMiddleware from "../middleware/files.js";
 import OfferService from "../../services/offer.js";
 import AccountService from "../../services/account.js";
 import Offer from "../../models/Offer.js";

diff --git a/src/api/routes/offer.js b/src/api/routes/offer.js
diff --git a/src/api/routes/review.js b/src/api/routes/review.js
diff --git a/src/config/env.js b/src/config/env.js
diff --git a/src/config/multer.js b/src/config/multer.js
diff --git a/src/config/passport.js b/src/config/passport.js
diff --git a/src/email-templates/accountManagement.js b/src/email-templates/accountManagement.js
diff --git a/src/email-templates/approval_notification.handlebars b/src/email-templates/approval_notification.handlebars
diff --git a/src/email-templates/companyApplicationApproval.js b/src/email-templates/companyApplicationApproval.js
diff --git a/src/email-templates/companyManagement.js b/src/email-templates/companyManagement.js
diff --git a/src/email-templates/companyOfferDisabled.js b/src/email-templates/companyOfferDisabled.js
diff --git a/src/email-templates/company_blocked_notification.handlebars b/src/email-templates/company_blocked_notification.handlebars
diff --git a/src/email-templates/company_deleted_notification.handlebars b/src/email-templates/company_deleted_notification.handlebars
diff --git a/src/email-templates/company_disabled_notification.handlebars b/src/email-templates/company_disabled_notification.handlebars
diff --git a/src/email-templates/company_enabled_notification.handlebars b/src/email-templates/company_enabled_notification.handlebars
diff --git a/src/email-templates/company_unblocked_notification.handlebars b/src/email-templates/company_unblocked_notification.handlebars
diff --git a/src/email-templates/layouts/main.handlebars b/src/email-templates/layouts/main.handlebars
diff --git a/src/email-templates/new_company_application_admins.handlebars b/src/email-templates/new_company_application_admins.handlebars
diff --git a/src/email-templates/new_company_application_company.handlebars b/src/email-templates/new_company_application_company.handlebars
diff --git a/src/email-templates/offer_disabled_notification.handlebars b/src/email-templates/offer_disabled_notification.handlebars
diff --git a/src/email-templates/rejection_notification.handlebars b/src/email-templates/rejection_notification.handlebars
diff --git a/src/email-templates/request_password_recovery.handlebars b/src/email-templates/request_password_recovery.handlebars
diff --git a/src/index.js b/src/index.js
diff --git a/src/lib/emailService.js b/src/lib/emailService.js
diff --git a/src/lib/passwordHashing.js b/src/lib/passwordHashing.js
diff --git a/src/lib/token.js b/src/lib/token.js
diff --git a/src/loaders/emailService.js b/src/loaders/emailService.js
diff --git a/src/loaders/express.js b/src/loaders/express.js
diff --git a/src/loaders/index.js b/src/loaders/index.js
diff --git a/src/loaders/mongoose.js b/src/loaders/mongoose.js
diff --git a/src/loaders/requestEnhancers.js b/src/loaders/requestEnhancers.js
diff --git a/src/loaders/static.js b/src/loaders/static.js
diff --git a/src/models/Account.js b/src/models/Account.js
diff --git a/src/models/Company.js b/src/models/Company.js
diff --git a/src/models/CompanyApplication.js b/src/models/CompanyApplication.js
diff --git a/src/models/ExampleUser.js b/src/models/ExampleUser.js
diff --git a/src/models/Offer.js b/src/models/Offer.js
diff --git a/src/models/Point.js b/src/models/Point.js
diff --git a/src/models/constants/Account.js b/src/models/constants/Account.js
diff --git a/src/models/constants/ApplicationStatus.js b/src/models/constants/ApplicationStatus.js
diff --git a/src/models/constants/Company.js b/src/models/constants/Company.js
diff --git a/src/models/constants/CompanyApplication.js b/src/models/constants/CompanyApplication.js
diff --git a/src/models/constants/FieldTypes.js b/src/models/constants/FieldTypes.js
diff --git a/src/models/constants/JobTypes.js b/src/models/constants/JobTypes.js
diff --git a/src/models/constants/Offer.js b/src/models/constants/Offer.js
diff --git a/src/models/constants/TechnologyTypes.js b/src/models/constants/TechnologyTypes.js
diff --git a/src/models/constants/TimeConstants.js b/src/models/constants/TimeConstants.js
diff --git a/src/models/modelUtils.js b/src/models/modelUtils.js
diff --git a/src/services/account.js b/src/services/account.js
diff --git a/src/services/application.js b/src/services/application.js
diff --git a/src/services/company.js b/src/services/company.js
diff --git a/src/services/offer.js b/src/services/offer.js
diff --git a/src/setupTests.js b/src/setupTests.js
diff --git a/test/data/logo-niaefeup-10mb.png b/test/data/logo-niaefeup-10mb.png
diff --git a/test/data/logo-niaefeup.png b/test/data/logo-niaefeup.png
diff --git a/test/data/not-a-logo.txt b/test/data/not-a-logo.txt
diff --git a/test/end-to-end/application.js b/test/end-to-end/application.js