add attributes apikey and secretkey even if values are null

Author: Nicole Schmidt

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -3127,10 +3127,9 @@ public Pair<Boolean, Map<String, String>> getKeys(GetUserKeysCmd cmd) {
         }
 
         Map<String, String> keys = new HashMap<>();
-        if (keyPair != null && isAccessingKeypairSuperset(keyPair, cmd)) {
-            keys.put("apikey", keyPair.getApiKey());
-            keys.put("secretkey", keyPair.getSecretKey());
-        }
+        boolean isAllowed = keyPair != null && isAccessingKeypairSuperset(keyPair, cmd);
+        keys.put("apikey", isAllowed ? keyPair.getApiKey() : null);
+        keys.put("secretkey", isAllowed ? keyPair.getSecretKey() : null);
 
         Boolean apiKeyAccess = user.getApiKeyAccess();
         if (apiKeyAccess == null) {