@govuk-pay/cli 0.0.72 → 0.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@govuk-pay/cli",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "description": "GOV.UK Pay Command Line Interface",
   "bin": {
     "pay": "bin/cli.js",

package/src/commands/local/app_client/app_client.js

@@ -99,6 +99,16 @@ const appClient = {
         const typedBody = body;
         return typedBody;
     },
+    async getAccount(gatewayAccountId) {
+        const url = urlFor('connector', `/v1/api/accounts/${gatewayAccountId}`);
+        const result = await (0, fetch_wrapper_1.getRequest)(url);
+        if (!result.success) {
+            console.error((0, fetch_wrapper_1.formatErrorMessageForFailedRequest)(result.unsuccessfulResult));
+            return;
+        }
+        const body = result.successfulResult?.body;
+        return body;
+    },
     async setEmailCollectionModeOnAccount(accountID, emailCollectionMode) {
         const patchEmailCollectionModeData = {
             op: 'replace',
@@ -127,12 +137,14 @@ const appClient = {
         }
         return true;
     },
-    async createToken(gatewayAccountID) {
+    async createToken(gatewayAccountID, serviceExternalId, serviceMode) {
         const createTokenData = {
             account_id: gatewayAccountID,
             description: 'my token',
             created_by: 'system generated',
-            token_type: 'CARD'
+            token_type: 'CARD',
+            service_external_id: serviceExternalId,
+            service_mode: serviceMode
         };
         const url = urlFor('publicauth', '/v1/frontend/auth');
         const result = await (0, fetch_wrapper_1.postRequest)(url, createTokenData);

package/src/commands/local/subcommands/payment.js

@@ -52,7 +52,7 @@ async function paymentHandler(argv) {
             console.error('Failed to create a fully set up account');
             return;
         }
-        const createTokenResult = await app_client_js_1.default.createToken(account.gateway_account_id);
+        const createTokenResult = await app_client_js_1.default.createToken(account.gateway_account_id, serviceExternalID, account.type);
         if (createTokenResult === undefined) {
             console.error('Failed to create an api token');
             return;

package/src/commands/local/subcommands/token.js

@@ -26,6 +26,8 @@ async function tokenHandler(argv) {
         console.error('The publicauth service is unhealthy, so an API token cannot be created');
         return;
     }
+    let serviceExternalID;
+    let serviceMode;
     if (gatewayAccountID === undefined) {
         console.log('No gateway_account_id provided, creating service and gateway account');
         if (await app_client_js_1.default.isUnhealthy('adminusers')) {
@@ -36,7 +38,7 @@ async function tokenHandler(argv) {
             console.error('The connector service is unhealthy, so an API token cannot be created');
             return;
         }
-        const serviceExternalID = await app_client_js_1.default.createService();
+        serviceExternalID = await app_client_js_1.default.createService();
         if (serviceExternalID === undefined) {
             console.error('Service creation failed');
             return;
@@ -46,9 +48,19 @@ async function tokenHandler(argv) {
             console.error('Failed to create a fully set up account');
             return;
         }
+        serviceMode = account.type;
         gatewayAccountID = account.gateway_account_id;
     }
-    const token = await app_client_js_1.default.createToken(gatewayAccountID);
+    else {
+        const account = await app_client_js_1.default.getAccount(gatewayAccountID);
+        if (account === undefined) {
+            console.error(`No gateway account exists with ID: ${gatewayAccountID}`);
+            return;
+        }
+        serviceExternalID = account.service_id;
+        serviceMode = account.type;
+    }
+    const token = await app_client_js_1.default.createToken(gatewayAccountID, serviceExternalID, serviceMode);
     if (token === undefined) {
         console.error('Failed to create an API token');
         return;

package/src/commands/local/subcommands/user.js

@@ -43,7 +43,7 @@ async function userHandler(argv) {
         console.error('Failed to create a fully set up account');
         return;
     }
-    const apiToken = await app_client_js_1.default.createToken(account.gateway_account_id);
+    const apiToken = await app_client_js_1.default.createToken(account.gateway_account_id, serviceExternalID, account.type);
     if (apiToken === undefined) {
         console.error('Failed to create an API token');
         return;