PP-13313: Validations for Worldpay credentials for a MOTO gateway account #4371
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit deals with a moto-enabled gateway account that hasn't configured the one_off_customer_initiated credentials yet.
oswaldquek
force-pushed
the
PP-13313-link-worldpay-account
branch
4 times, most recently
from
606bbf1 to
35b1c2e
Compare
oswaldquek
force-pushed
the
PP-13313-link-worldpay-account
branch
from
35b1c2e to
9841a0d
Compare
DomBelcher
reviewed
Dec 4, 2024
| @@ -0,0 +1,52 @@ | |||
| const { response } = require('@utils/response') | |||
| const formatSimplifiedAccountPathsFor = require('../../../../../utils/simplified-account/format/format-simplified-account-paths-for') | |||
There was a problem hiding this comment.
may as well use the alias for this
| body('merchantCode').not().isEmpty().withMessage('Enter your merchant code').bail() | ||
| .custom((value, { req }) => { | ||
| const merchantCode = req.body.merchantCode | ||
| if (req.account.allowMoto && !merchantCode.endsWith('MOTO') && !merchantCode.endsWith('MOTOGBP')) { |
There was a problem hiding this comment.
the value here should be the merchant code, so you should just be able to use that rather than re-referencing it from req.body
| @@ -3,6 +3,8 @@ const sinon = require('sinon') | |||
| const { expect } = require('chai') | |||
| const Service = require('@models/Service.class') | |||
| const GatewayAccount = require('@models/GatewayAccount.class') | |||
| const formatSimplifiedAccountPathsFor = require('../../../../utils/simplified-account/format/format-simplified-account-paths-for') | |||
| const GatewayAccount = require('@models/GatewayAccount.class') | ||
| const sinon = require('sinon') | ||
| const { expect } = require('chai') | ||
| const formatSimplifiedAccountPathsFor = require('../../../../../utils/simplified-account/format/format-simplified-account-paths-for') |
| classes: 'govuk-input--width-20', | ||
| type: 'text', | ||
| value: merchantCode, | ||
| errorMessage: form.errors.merchantId and { |
There was a problem hiding this comment.
this should be errors.formErrors.merchantCode
| classes: 'govuk-input--width-20', | ||
| type: 'text', | ||
| value: username, | ||
| errorMessage: form.errors.username and { |
There was a problem hiding this comment.
this should be errors.formErrors.username
| classes: "govuk-input--width-20", | ||
| type: 'password', | ||
| value: password, | ||
| errorMessage: form.errors.password and { |
There was a problem hiding this comment.
this should be errors.formErrors.password
DomBelcher
reviewed
Dec 4, 2024
.../simplified-account/settings/worldpay-details/credentials/worldpay-credentials.controller.js
Show resolved
Hide resolved
DomBelcher
approved these changes
Dec 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Deal with validations. This PR does not deal with checking the creds against the Worldpay API and storing them in connector.
These should match the existing validations in the current worldpay controller.