diff options
Diffstat (limited to 'cadi')
| -rw-r--r-- | cadi/aaf/pom.xml | 2 | ||||
| -rw-r--r-- | cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java | 15 | ||||
| -rw-r--r-- | cadi/client/pom.xml | 2 | ||||
| -rw-r--r-- | cadi/core/pom.xml | 2 | ||||
| -rw-r--r-- | cadi/oauth-enduser/pom.xml | 2 | ||||
| -rw-r--r-- | cadi/pom.xml | 2 | ||||
| -rw-r--r-- | cadi/servlet-sample/pom.xml | 2 |
7 files changed, 11 insertions, 16 deletions
diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 7b475f52..5077ddb9 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> - <version>2.7.3-SNAPSHOT</version> + <version>2.7.4-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java index d1a3b19b..e16782fa 100644 --- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java +++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java @@ -161,17 +161,12 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> { try { Miss missed = missed(getName(), getCred()); if (missed == null || missed.mayContinue()) { - CredRequest cr = new CredRequest(); - cr.setId(getName()); - cr.setPassword(new String(getCred())); - Rcli<CLIENT> client = con.clientIgnoreAlreadyAttempted(attemptedUris); + Rcli<CLIENT> client = con.clientIgnoreAlreadyAttempted(attemptedUris).forUser(con.basicAuth(getName(), new String(getCred()))); thisUri = client.getURI(); - Future<String> fp = client.readPost("/authn/validate", con.credReqDF, cr); - //Rcli<CLIENT> client = con.client().forUser(con.basicAuth(getName(), new String(getCred()))); - //Future<String> fp = client.read( - // "/authn/basicAuth", - // "text/plain" - // ); + Future<String> fp = client.read( + "/authn/basicAuth", + "text/plain" + ); if (fp.get(con.timeout)) { expires = System.currentTimeMillis() + timeToLive; addUser(new User<AAFPermission>(this, timeToLive)); diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index d7810552..1ecc96ae 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> - <version>2.7.3-SNAPSHOT</version> + <version>2.7.4-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index c4d5d75b..1dc419aa 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> <relativePath>..</relativePath> - <version>2.7.3-SNAPSHOT</version> + <version>2.7.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 54080f91..a9a2207f 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> - <version>2.7.3-SNAPSHOT</version> + <version>2.7.4-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/cadi/pom.xml b/cadi/pom.xml index 89cb4058..ba74e929 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.7.3-SNAPSHOT</version> + <version>2.7.4-SNAPSHOT</version> </parent> <artifactId>cadiparent</artifactId> <name>AAF CADI Parent (Code, Access, Data, Identity)</name> diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index ac80b1b7..c2f3982f 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> <relativePath>..</relativePath> - <version>2.7.3-SNAPSHOT</version> + <version>2.7.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <name>CADI Servlet Sample (Test Only)</name> |