From 32cdd553a8668e6d03a9cf5b11b360d35a63c87f Mon Sep 17 00:00:00 2001 From: Instrumental Date: Thu, 19 Jul 2018 13:29:32 -0500 Subject: Configuration and Auto-Certificates Issue-ID: AAF-378 Change-Id: Ic820a4e43684a6130f00b28b415a974876099fc3 Signed-off-by: Instrumental --- .../java/org/onap/aaf/auth/oauth/service/JSONPermLoaderFactory.java | 4 ++-- .../src/main/java/org/onap/aaf/auth/oauth/service/OAuthService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'auth/auth-oauth/src/main/java/org') 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 rd = loadToken(trans, odd); if(rd.notOK()) { -- cgit 1.2.3-korg