UI protocol: cleanup version handling code

[e-mobility-charging-stations-simulator.git] / src / charging-station / ui-server / ui-services / UIServiceUtils.ts

diff --git a/src/charging-station/ui-server/ui-services/UIServiceUtils.ts b/src/charging-station/ui-server/ui-services/UIServiceUtils.ts
index c019982854c22d73bcc446ca3a2ecc56caa1aca1..b6137886d76c105fda10f5cd667f7c37e7e94dc5 100644 (file)
--- a/src/charging-station/ui-server/ui-services/UIServiceUtils.ts
+++ b/src/charging-station/ui-server/ui-services/UIServiceUtils.ts
@@ -11,6 +11,7 @@ export class UIServiceUtils {
 
   public static handleProtocols = (
     protocols: Set<string>,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     request: IncomingMessage
   ): string | false => {
     let protocol: Protocol;
@@ -19,8 +20,7 @@ export class UIServiceUtils {
       return false;
     }
     for (const fullProtocol of protocols) {
-      [protocol, version] = UIServiceUtils.getProtocolAndVersion(fullProtocol);
-      if (UIServiceUtils.isProtocolAndVersionSupported(protocol, version) === true) {
+      if (UIServiceUtils.isProtocolAndVersionSupported(fullProtocol) === true) {
         return fullProtocol;
       }
     }
@@ -32,11 +32,13 @@ export class UIServiceUtils {
     return false;
   };
 
-  public static isProtocolAndVersionSupported = (
-    protocol: Protocol,
-    version: ProtocolVersion
-  ): boolean =>
-    Object.values(Protocol).includes(protocol) && Object.values(ProtocolVersion).includes(version);
+  public static isProtocolAndVersionSupported = (protocolStr: string): boolean => {
+    const [protocol, version] = UIServiceUtils.getProtocolAndVersion(protocolStr);
+    return (
+      Object.values(Protocol).includes(protocol) === true &&
+      Object.values(ProtocolVersion).includes(version) === true
+    );
+  };
 
   public static getProtocolAndVersion = (protocolStr: string): [Protocol, ProtocolVersion] => {
     const protocolIndex = protocolStr.indexOf(Protocol.UI);