obfuscateKey should respect EnableKeyLogging

Fix #1826

api.go

@@ -198,13 +198,6 @@ func doAddOrUpdate(keyName string, newSession *user.SessionState, dontReset bool
 	return nil
 }
 
-func obfuscateKey(keyName string) string {
-	if len(keyName) > 4 {
-		return "****" + keyName[len(keyName)-4:]
-	}
-	return "--"
-}
-
 // ---- TODO: This changes the URL structure of the API completely ----
 // ISSUE: If Session stores are stored with API specs, then managing keys will need to be done per store, i.e. add to all stores,
 // remove from all stores, update to all stores, stores handle quotas separately though because they are localised! Keys will

log_helpers.go

@@ -13,6 +13,17 @@ import (
 // identifies that field value was hidden before output to the log
 const logHiddenValue = "<hidden>"
 
+func obfuscateKey(keyName string) string {
+	if config.Global().EnableKeyLogging {
+		return keyName
+	}
+
+	if len(keyName) > 4 {
+		return "****" + keyName[len(keyName)-4:]
+	}
+	return "--"
+}
+
 func getLogEntryForRequest(r *http.Request, key string, data map[string]interface{}) *logrus.Entry {
 	// populate http request fields
 	fields := logrus.Fields{