From ca645404e5c8ae80d05c4395f2958f510a6dff3a Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Sun, 25 Apr 2021 16:45:56 +0200
Subject: [PATCH] Not logging request method, keeping pw gen values if they are
 greater than max

---
 src/modules/api/submodules/userManagement.ts | 4 ++++
 src/utils/logger.ts                          | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/modules/api/submodules/userManagement.ts b/src/modules/api/submodules/userManagement.ts
index b7d4dd5..10595ab 100644
--- a/src/modules/api/submodules/userManagement.ts
+++ b/src/modules/api/submodules/userManagement.ts
@@ -264,6 +264,10 @@ function setup(data: SubmoduleData): any {
           return
         }
 
+        if (user.avaiblePWRequests >= maxPWCount) {
+          return
+        }
+
         logger.Log(
           `Setting avaible PW-s for user #${user.id}: ${user.avaiblePWRequests} -> ${maxPWCount}`,
           logger.GetColor('cyan')
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
index 408cf7c..ab65976 100755
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -137,13 +137,8 @@ function LogReq(req: Request, toFile?: boolean, statusCode?: string): void {
     logEntry += dl + logHashed(hostname) + dl
     if (toFile) {
       logEntry += req.headers['user-agent'] + dl
+      logEntry += req.method + dl
     }
-    let method = req.method
-    if (!toFile) {
-      method = expandWithSpaces(method, 4)
-    }
-
-    logEntry += method + dl
 
     let uid = ''
     if (req.session && req.session.user) {