diff options
author | 2018-07-19 13:29:32 -0500 | |
---|---|---|
committer | 2018-07-19 13:29:44 -0500 | |
commit | 32cdd553a8668e6d03a9cf5b11b360d35a63c87f (patch) | |
tree | 48c02e4be820d87efb777d7be20bad57d517b61c /auth/auth-oauth/src/main/java | |
parent | 9c8a8b0926b13b07fb1e5394903401e7a3f1ff79 (diff) |
Configuration and Auto-Certificates
Issue-ID: AAF-378
Change-Id: Ic820a4e43684a6130f00b28b415a974876099fc3
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-oauth/src/main/java')
-rw-r--r-- | auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/JSONPermLoaderFactory.java | 4 | ||||
-rw-r--r-- | auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/OAuthService.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/JSONPermLoaderFactory.java b/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/JSONPermLoaderFactory.java index ea5c595c..f4400869 100644 --- a/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/JSONPermLoaderFactory.java +++ b/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/JSONPermLoaderFactory.java @@ -99,9 +99,9 @@ public class JSONPermLoaderFactory { } else { sb.append(','); } - sb.append("{\"type\":\""); + sb.append("{\"ns\":\""); sb.append(d.ns); - sb.append('.'); + sb.append("\",\"type\":\""); sb.append(d.type); sb.append("\",\"instance\":\""); sb.append(d.instance); diff --git a/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/OAuthService.java b/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/OAuthService.java index 052b292e..0064e224 100644 --- a/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/OAuthService.java +++ b/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/service/OAuthService.java @@ -131,7 +131,7 @@ public class OAuthService { odd.expires = new Date(exp=(System.currentTimeMillis()+TOK_EXP)); odd.exp_sec = exp/1000; odd.req_ip = trans.ip(); - + try { Result<Data> rd = loadToken(trans, odd); if(rd.notOK()) { |