diff options
| author |   Bharath Balasubramanian <bharathb@research.att.com> | 2018-03-22 12:03:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-22 12:03:55 +0000 |
| commit | 7a39f41a061b47b030961546782322a1139af7f5 (patch) | |
| tree | 18f6f2860c27303caa9bf1f624e2f4e383b55f16 /src/main/java/org/onap/music/main/MusicCore.java | |
| parent | a414c36cb48cd395c6c9db37ad3a50e2abb67874 (diff) | |
| parent | de47cea9e656dabfbf3608287238041ab263f05e (diff) | |
Merge "Fix for HAS to run its CSIT"
Diffstat (limited to 'src/main/java/org/onap/music/main/MusicCore.java')
| -rw-r--r-- | src/main/java/org/onap/music/main/MusicCore.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/main/java/org/onap/music/main/MusicCore.java b/src/main/java/org/onap/music/main/MusicCore.java index 4929edd8..abeedf6f 100644 --- a/src/main/java/org/onap/music/main/MusicCore.java +++ b/src/main/java/org/onap/music/main/MusicCore.java @@ -897,17 +897,7 @@ public class MusicCore { return resultMap; } boolean isAAF = Boolean.valueOf(isAAFApp); - if (!isAAF && !(operation.equals("createKeySpace"))) { - if(aid == null) { - resultMap.put("Exception", "Aid is mandatory for nonAAF applications "); - return resultMap; - } - resultMap = CachingUtil.authenticateAIDUser(aid, keyspace); - - if (!resultMap.isEmpty()) - return resultMap; - } - if (aid == null && (userId == null || password == null)) { + if (userId == null || password == null) { logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.MISSINGINFO ,ErrorSeverity.WARN, ErrorTypes.AUTHENTICATIONERROR); logger.error(EELFLoggerDelegate.errorLogger,"One or more required headers is missing. userId: " + userId + " :: password: " + password); @@ -915,7 +905,12 @@ public class MusicCore { "UserId and Password are mandatory for the operation " + operation); return resultMap; } - + if(!isAAF && !(operation.equals("createKeySpace"))) { + resultMap = CachingUtil.authenticateAIDUser(nameSpace, userId, password, keyspace); + if (!resultMap.isEmpty()) + return resultMap; + + } if (isAAF && nameSpace != null && userId != null && password != null) { boolean isValid = true; try { |