UI Server: factor out authentication logic

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

diff --git a/src/charging-station/ui-server/UIHttpServer.ts b/src/charging-station/ui-server/UIHttpServer.ts
index 280f1d38040d71ab7151d1c33fa69b93f0977189..289eda84781ad0d7686e88846a95e028cf45921f 100644 (file)
--- a/src/charging-station/ui-server/UIHttpServer.ts
+++ b/src/charging-station/ui-server/UIHttpServer.ts
@@ -71,7 +71,7 @@ export default class UIHttpServer extends AbstractUIServer {
   }
 
   private requestListener(req: IncomingMessage, res: ServerResponse): void {
-    if (this.isBasicAuthEnabled() === true && this.isValidBasicAuth(req) === false) {
+    if (this.authenticate(req) === false) {
       res.setHeader('Content-Type', 'text/plain');
       res.setHeader('WWW-Authenticate', 'Basic realm=users');
       res.writeHead(StatusCodes.UNAUTHORIZED);
@@ -128,6 +128,16 @@ export default class UIHttpServer extends AbstractUIServer {
     }
   }
 
+  private authenticate(req: IncomingMessage): boolean {
+    if (this.isBasicAuthEnabled() === true) {
+      if (this.isValidBasicAuth(req) === true) {
+        return true;
+      }
+      return false;
+    }
+    return true;
+  }
+
   private responseStatusToStatusCode(status: ResponseStatus): StatusCodes {
     switch (status) {
       case ResponseStatus.SUCCESS:

diff --git a/src/charging-station/ui-server/UIWebSocketServer.ts b/src/charging-station/ui-server/UIWebSocketServer.ts
index c706cdd9a31613422bd5a519dcfba365833115ed..f7a0379dc4bcd12dffcc9249e67bda17f6f5941d 100644 (file)
--- a/src/charging-station/ui-server/UIWebSocketServer.ts
+++ b/src/charging-station/ui-server/UIWebSocketServer.ts
@@ -116,15 +116,15 @@ export default class UIWebSocketServer extends AbstractUIServer {
     }
   }
 
-  private authenticate(req: IncomingMessage, next: (err: Error) => void): void {
+  private authenticate(req: IncomingMessage, next: (err?: Error) => void): void {
     if (this.isBasicAuthEnabled() === true) {
       if (this.isValidBasicAuth(req) === false) {
         next(new Error('Unauthorized'));
       } else {
-        next(undefined);
+        next();
       }
     } else {
-      next(undefined);
+      next();
     }
   }