PP-11594 Add ‘sandbox’ to ‘isDigitalWalletSupported’ test.

.github/dependabot.yml

@@ -35,7 +35,7 @@ updates:
   ignore:
   - dependency-name: node
     versions:
-    - ">= 18"
+    - ">= 19"
 - package-ecosystem: github-actions
   directory: "/"
   schedule:

.secrets.baseline

@@ -75,10 +75,6 @@
     {
       "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
     },
-    {
-      "path": "detect_secrets.filters.common.is_baseline_file",
-      "filename": ".secrets.baseline"
-    },
     {
       "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
       "min_level": 2
@@ -384,6 +380,15 @@
         "line_number": 5
       }
     ],
+    "test/cypress/integration/demo-payment/mock-cards.cy.js": [
+      {
+        "type": "Hex High Entropy String",
+        "filename": "test/cypress/integration/demo-payment/mock-cards.cy.js",
+        "hashed_secret": "7bb363901b8a686a4d3e1949032e469901cddaa8",
+        "is_verified": false,
+        "line_number": 5
+      }
+    ],
     "test/cypress/integration/index/index.cy.js": [
       {
         "type": "Hex High Entropy String",
@@ -894,5 +899,5 @@
       }
     ]
   },
-  "generated_at": "2023-08-17T11:37:31Z"
+  "generated_at": "2023-10-19T14:35:18Z"
 }

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.17.1-alpine3.18@sha256:982b5b6f07cd9241c9ebb163829067deac8eaefc57cfa8f31927f4b18943d971 as builder
+FROM node:18.18.2-alpine3.18@sha256:0fe7402d11d8c85474c6ec6f9c9c8048cd0549c95535832b7f0735a4b47690a5 as builder
 
 ### Needed to run pact-mock-service
 COPY sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
@@ -14,7 +14,7 @@ RUN npm ci --quiet
 COPY . .
 RUN npm run compile
 
-FROM node:18.17.1-alpine3.18@sha256:982b5b6f07cd9241c9ebb163829067deac8eaefc57cfa8f31927f4b18943d971 AS final
+FROM node:18.18.2-alpine3.18@sha256:0fe7402d11d8c85474c6ec6f9c9c8048cd0549c95535832b7f0735a4b47690a5 AS final
 
 RUN ["apk", "--no-cache", "upgrade"]
 

app/controllers/invite-user.controller.js

@@ -60,7 +60,9 @@ async function invite (req, res, next) {
     lodash.set(req, 'session.pageData', { invitee })
     res.redirect(303, formatServicePathsFor(paths.service.teamMembers.invite, externalServiceId))
   } else if (!role) {
-    next(new Error(`Cannot identify role from user input ${roleId}`))
+    req.flash('genericError', 'Select the team member’s permission level')
+    lodash.set(req, 'session.pageData', { invitee })
+    res.redirect(303, formatServicePathsFor(paths.service.teamMembers.invite, externalServiceId))
   } else {
     try {
       await userService.createInviteToJoinService(invitee, senderId, externalServiceId, role.name)

app/controllers/invite-user.controller.test.js

@@ -23,4 +23,27 @@ describe('invite user controller', () => {
     sinon.assert.calledWith(req.flash, 'genericError', 'Enter a valid email address')
     sinon.assert.calledWith(res.redirect, 303, `/service/${externalServiceId}/team-members/invite`)
   })
+
+  it('should error if a role is not recognised', async () => {
+    const externalServiceId = 'some-external-service-id'
+    const unknownRoleId = '999'
+    const req = {
+      user: { externalId: 'some-ext-id', serviceIds: ['1'] },
+      body: {
+        'invitee-email': '[email protected]',
+        'role-input': unknownRoleId
+      },
+      service: {
+        externalId: externalServiceId
+      },
+      flash: sinon.stub()
+    }
+    const res = {
+      redirect: sinon.stub()
+    }
+
+    await inviteUserController.invite(req, res)
+    sinon.assert.calledWith(req.flash, 'genericError', 'Select the team member’s permission level')
+    sinon.assert.calledWith(res.redirect, 303, `/service/${externalServiceId}/team-members/invite`)
+  })
 })

app/utils/display-converter.js

@@ -122,6 +122,7 @@ module.exports = function (req, data, template) {
   convertedData.isTestGateway = _.get(convertedData, 'currentGatewayAccount.type') === 'test'
   convertedData.isSandbox = paymentProvider === 'sandbox'
   convertedData.isDigitalWalletSupported = paymentProvider === 'worldpay' ||
+    (paymentProvider === 'sandbox' && process.env.ALLOW_ENABLING_DIGITAL_WALLETS_FOR_SANDBOX_ACCOUNT === 'true') ||
     (paymentProvider === 'stripe' && process.env.ALLOW_ENABLING_DIGITAL_WALLETS_FOR_STRIPE_ACCOUNT === 'true') ||
     (paymentProvider === 'stripe' && convertedData.isTestGateway === true)
   convertedData.currentService = service

app/utils/display-converter.test.js

@@ -6,6 +6,7 @@ const expect = chai.expect
 describe('Display converter', function () {
   afterEach(() => {
     process.env.ALLOW_ENABLING_DIGITAL_WALLETS_FOR_STRIPE_ACCOUNT = undefined
+    process.env.ALLOW_ENABLING_DIGITAL_WALLETS_FOR_SANDBOX_ACCOUNT = undefined
   })
 
   it('should add full_type to account if type is test', function () {
@@ -80,4 +81,35 @@ describe('Display converter', function () {
     }, {}, {})
     expect(data.isDigitalWalletSupported).to.equal(true)
   })
+  it('should return isDigitalWalletSupported=false for sandbox account when ALLOW_ENABLING_DIGITAL_WALLETS_FOR_SANDBOX_ACCOUNT is not set', () => {
+    const data = displayConverter({
+      account: {
+        type: 'test',
+        payment_provider: 'sandbox'
+      }
+    }, {}, {})
+    expect(data.isDigitalWalletSupported).to.equal(false)
+  })
+
+  it('should return isDigitalWalletSupported=false for sandbox account when ALLOW_ENABLING_DIGITAL_WALLETS_FOR_SANDBOX_ACCOUNT is false', () => {
+    process.env.ALLOW_ENABLING_DIGITAL_WALLETS_FOR_SANDBOX_ACCOUNT = 'false'
+    const data = displayConverter({
+      account: {
+        type: 'test',
+        payment_provider: 'sandbox'
+      }
+    }, {}, {})
+    expect(data.isDigitalWalletSupported).to.equal(false)
+  })
+
+  it('should return isDigitalWalletSupported=true for sandbox account when ALLOW_ENABLING_DIGITAL_WALLETS_FOR_SANDBOX_ACCOUNT is true', () => {
+    process.env.ALLOW_ENABLING_DIGITAL_WALLETS_FOR_SANDBOX_ACCOUNT = 'true'
+    const data = displayConverter({
+      account: {
+        type: 'test',
+        payment_provider: 'sandbox'
+      }
+    }, {}, {})
+    expect(data.isDigitalWalletSupported).to.equal(true)
+  })
 })

app/views/dashboard/demo-payment/mock-card-details.njk

@@ -1,5 +1,13 @@
 {% extends "../../layout.njk" %}
 
+{% set card %}
+{% if currentGatewayAccount.payment_provider === 'stripe' %}
+   <p class="govuk-!-font-size-24 govuk-!-font-weight-bold">4000<span class="govuk-!-padding-left-3 govuk-!-padding-right-3">0582</span><span class="govuk-!-padding-right-3">6000</span>0005</p>
+{% else %}
+   <p class="govuk-!-font-size-24 govuk-!-font-weight-bold">4000<span class="govuk-!-padding-left-3 govuk-!-padding-right-3">0566</span><span class="govuk-!-padding-right-3">5566</span>5556</p>
+{% endif %}
+{% endset %}
+
 {% block pageTitle %}
   Mock card numbers for demo payment - {{currentService.name}} {{currentGatewayAccount.full_type}} - GOV.UK Pay
 {% endblock %}
@@ -21,7 +29,7 @@
 
   {{
     govukInsetText({
-      html: '<p class="govuk-!-font-size-24 govuk-!-font-weight-bold">4000<span class="govuk-!-padding-left-3 govuk-!-padding-right-3">0566</span><span class="govuk-!-padding-right-3">5566</span>5556</p>'
+      html: card
     })
   }}
 

app/views/team-members/team-member-invite.njk

@@ -78,7 +78,7 @@ Invite a new team member - GOV.UK Pay
             label: {
               classes: "govuk-label--s"
             },
-            checked: true,
+            checked: false,
             hint: {
               html: "View transactions<br>
               Cannot refund payments<br>
@@ -155,7 +155,7 @@ Invite a new team member - GOV.UK Pay
             label: {
               classes: "govuk-label--s"
             },
-            checked: true,
+            checked: false,
             hint: {
               html: "View transactions<br>
               Cannot refund payments<br>