fixup! support replacing account info in PutMetadata

Author: Kerkesni

lib/routes/routeBackbeat.js

@@ -482,9 +482,6 @@ function putData(request, response, bucketInfo, objMd, log, callback) {
  * @returns {undefined}
  */
 function getCanonicalIdsByAccountId(accountId, log, cb) {
-    if (!accountId) {
-        return cb();
-    }
     return vault.getCanonicalIdsByAccountIds([accountId], log, (err, res) => {
         if (err) {
             log.error('error getting canonical ID by account ID', {
@@ -638,19 +635,28 @@ function putMetadata(request, response, bucketInfo, objMd, log, callback) {
         }
 
         return async.series([
-            // Zenko's Backbeat delegates replacing the account
+            // Zenko's CRR delegates replacing the account
             // information to the destination's Cloudserver, as
             // Vault admin APIs are not exposed externally.
-            next => getCanonicalIdsByAccountId(request.query?.accountId, log, (err, res) => {
-                if (err) {
-                    return next(err);
-                }
-                if (res) {
-                    omVal['owner-display-name'] = res.name;
-                    omVal['owner-id'] = res.canonicalId;
+            next => {
+                // Internal users of this API (other features in Zenko) will
+                // not provide the accountId in the request, as they only update
+                // the metadata of existing objects, so there is no need to
+                // replace the account information.
+                if (!request.query?.accountId) {
+                    return next();
                 }
-                return next();
-            }),
+                return getCanonicalIdsByAccountId(request.query.accountId, log, (err, res) => {
+                    if (err) {
+                        return next(err);
+                    }
+                    if (res) {
+                        omVal['owner-display-name'] = res.name;
+                        omVal['owner-id'] = res.canonicalId;
+                    }
+                    return next();
+                });
+            },
             next => {
                 log.trace('putting object version', {
                     objectKey: request.objectKey, omVal, options });