fixup! CLDSRV-750: add Server Access Logs

Author: leif-scality

lib/metadata/metadataUtils.js

@@ -11,20 +11,27 @@ const { actionNeedQuotaCheck, actionWithDataDeletion } = require('arsenal/build/
 const { processBytesToWrite, validateQuotas } = require('../api/apiUtils/quotas/quotaUtils');
 
 function storeServerAccessLogInfo(request, authInfo, bucket) {
-    if (request &&
-        request.serverAccessLog &&
-        authInfo &&
-        bucket &&
-        bucket.getBucketLoggingStatus() &&
-        bucket.getBucketLoggingStatus().getLoggingEnabled()) {
-        /* eslint-disable no-param-reassign */
-        request.serverAccessLog.enabled = true;
+    /* eslint-disable no-param-reassign */
+
+    if (!request || !request.serverAccessLog) {
+        return;
+    }
+
+    if (authInfo) {
+        request.serverAccessLog.authInfo = authInfo;
+    }
+
+    if (bucket) {
         request.serverAccessLog.bucketOwner = bucket.getOwner();
         request.serverAccessLog.bucketName = bucket.getName();
-        request.serverAccessLog.authInfo = authInfo;
+    }
+
+    if (bucket && bucket.getBucketLoggingStatus() && bucket.getBucketLoggingStatus().getLoggingEnabled()) {
+        request.serverAccessLog.enabled = true;
         request.serverAccessLog.loggingEnabled = bucket.getBucketLoggingStatus().getLoggingEnabled();
-        /* eslint-enable no-param-reassign */
     }
+
+    /* eslint-enable no-param-reassign */
 }
 
 /** getNullVersionFromMaster - retrieves the null version