fix: append custom user agent string to smapi client

lib/clients/http-client.js

@@ -1,12 +1,11 @@
-const os = require('os');
 const R = require('ramda');
 const requestLib = require('request');
 
+const DynamicConfig = require('@src/utils/dynamic-config');
 const logger = require('@src/utils/logger-utility');
 const urlUtils = require('@src/utils/url-utils');
 const stringUtils = require('@src/utils/string-utils');
 const CONSTANTS = require('@src/utils/constants');
-const pkg = require('@root/package.json');
 
 module.exports = {
     request,
@@ -46,7 +45,7 @@ function request(options, operation, doDebug, callback) {
     if (!requestOptions.headers) {
         requestOptions.headers = {};
     }
-    requestOptions.headers['User-Agent'] = resolveUserAgent();
+    requestOptions.headers['User-Agent'] = DynamicConfig.userAgent;
 
     // Make request
     requestLib(requestOptions, (error, response) => {
@@ -83,19 +82,6 @@ function putByUrl(url, payload, operation, doDebug, callback) {
     });
 }
 
-/**
- * Resolve User-Agent for CLI by the following the chain:
- * (CLI Client)? - CLI Version - Node Verson - OS Type/Release
- * CLI downstream's status is decided by the ENV_VAR "ASK_DOWNSTREAM_CLIENT"
- */
-function resolveUserAgent() {
-    const cliUserAgentStr = `ask-cli/${pkg.version} Node/${process.version} ${os.type()}/${os.release()}`;
-    if (stringUtils.isNonBlankString(process.env.ASK_DOWNSTREAM_CLIENT)) {
-        return `${process.env.ASK_DOWNSTREAM_CLIENT} (ask-cli downstream client) ${cliUserAgentStr}`;
-    }
-    return cliUserAgentStr;
-}
-
 /**
  * Form the debug info object according to the error and response from each http request
  * @param {string} operation

lib/commands/smapi/smapi-command-handler.js

@@ -184,6 +184,7 @@ const smapiCommandHandler = (swaggerApiOperationName, flatParamsMap, commanderTo
         .withAuthEndpoint(authEndpoint)
         .withApiEndpoint(smapiEndpoint)
         .withRefreshTokenConfig(refreshTokenConfig)
+        .withCustomUserAgent(DynamicConfig.userAgent)
         .client();
 
     const paramsObject = _mapToParams(inputOpts, flatParamsMap, commanderToApiCustomizationMap);

lib/utils/dynamic-config.js

@@ -1,4 +1,7 @@
+const os = require('os');
+
 const CONSTANTS = require('@src/utils/constants');
+const pkg = require('@root/package.json');
 const stringUtils = require('@src/utils/string-utils');
 
 function resolve(chain) {
@@ -40,6 +43,14 @@ class DynamicConfig {
             gitCredentialHelper: `${baseUrl}/helpers/prod/git-credential-helper`,
         }
     }
+
+    static get userAgent() {
+        const cliUserAgentStr = `ask-cli/${pkg.version} Node/${process.version} ${os.type()}/${os.release()}`;
+        if (stringUtils.isNonBlankString(process.env.ASK_DOWNSTREAM_CLIENT)) {
+            return `${process.env.ASK_DOWNSTREAM_CLIENT} (ask-cli downstream client) ${cliUserAgentStr}`;
+        }
+        return cliUserAgentStr;
+    }
 }
 
 module.exports = DynamicConfig;