Add isEmptyString() helper and use it

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index ef1c7db2e8d96b8c8dfb57edad7976e82a455a21..37457ceea91c3549dd69b593602a8d67ece7d7a4 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -732,9 +732,9 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
         ftpClient = new Client();
         const accessResponse = await ftpClient.access({
           host: uri.host,
-          ...(uri.port !== '' && { port: Utils.convertToInt(uri.port) }),
-          ...(uri.username !== '' && { user: uri.username }),
-          ...(uri.password !== '' && { password: uri.password }),
+          ...(!Utils.isEmptyString(uri.port) && { port: Utils.convertToInt(uri.port) }),
+          ...(!Utils.isEmptyString(uri.username) && { user: uri.username }),
+          ...(!Utils.isEmptyString(uri.password) && { password: uri.password }),
         });
         let uploadResponse: FTPResponse;
         if (accessResponse.code === 220) {

diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts
index 0e8efc61e38cf593143a085631adb5f2b8db2efe..38df26a9eb23419de11c4040a39170f7104978a2 100644 (file)
--- a/src/utils/FileUtils.ts
+++ b/src/utils/FileUtils.ts
@@ -1,5 +1,6 @@
 import { EmptyObject } from '../types/EmptyObject';
 import { HandleErrorParams } from '../types/Error';
+import Utils from './Utils';
 import chalk from 'chalk';
 import logger from './Logger';
 
@@ -11,7 +12,7 @@ export default class FileUtils {
     error: NodeJS.ErrnoException,
     params: HandleErrorParams<EmptyObject> = { throwError: true, consoleOut: false }
   ): void {
-    const prefix = logPrefix.length !== 0 ? logPrefix + ' ' : '';
+    const prefix = !Utils.isEmptyString(logPrefix) ? logPrefix + ' ' : '';
     if (error.code === 'ENOENT') {
       if (params?.consoleOut) {
         console.warn(

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
index 4fb2ce7bd2e5482a431b608f777e6b05475035f9..8eebc2abe64a2526984ee2f0eb2bf56ddcaa505f 100644 (file)
--- a/src/utils/Utils.ts
+++ b/src/utils/Utils.ts
@@ -171,6 +171,10 @@ export default class Utils {
     return typeof value === 'string';
   }
 
+  public static isEmptyString(value: unknown): boolean {
+    return Utils.isString(value) && (value as string).length === 0;
+  }
+
   public static isUndefined(value: unknown): boolean {
     return typeof value === 'undefined';
   }