[java-idp-plugin-duo] branch main updated: Fix an NPE in test, clean up a couple of javadoc issues.
Scott Cantor
cantor.2 at osu.edu
Mon Mar 8 13:48:40 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-plugin-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=99c3d5edea624f9414778fcf3b91038cbc1015c2
The following commit(s) were added to refs/heads/main by this push:
new 99c3d5e Fix an NPE in test, clean up a couple of javadoc issues.
99c3d5e is described below
commit 99c3d5edea624f9414778fcf3b91038cbc1015c2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 8 08:48:38 2021 -0500
Fix an NPE in test, clean up a couple of javadoc issues.
---
.../plugin/authn/duo/nimbus/impl/NimbusClient.java | 2 +-
.../authn/duo/nimbus/impl/TokenResponse.java | 51 ++++++++++++++++++++++
.../authn/duo/sdk/impl/DuoSDKClientAdaptor.java | 3 +-
.../authn/duo/sdk/impl/DuoSDKClientFactory.java | 3 +-
.../duo/sdk/impl/DuoSDKClientFactoryTest.java | 5 +++
5 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClient.java b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClient.java
index 17e00fb..62e9340 100644
--- a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClient.java
+++ b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClient.java
@@ -57,7 +57,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
*/
@ThreadSafe
@Immutable
-final class NimbusClient extends AbstractDuoOIDCClient{
+final public class NimbusClient extends AbstractDuoOIDCClient{
/** The only supported client assertion type.*/
@Nonnull @NotEmpty private static final String CLIENT_ASSERTION_TYPE =
diff --git a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/TokenResponse.java b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/TokenResponse.java
index dfcfdfc..75e04f7 100644
--- a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/TokenResponse.java
+++ b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/TokenResponse.java
@@ -158,27 +158,78 @@ public final class TokenResponse {
/** Token stage interface.*/
public interface IIdTokenStage {
+
+ /**
+ * Supply the ID token.
+ *
+ * @param idToken the ID token
+ *
+ * @return the next stage
+ */
public IAccessTokenStage withIdToken(final String idToken);
}
/** Access token stage interface.*/
public interface IAccessTokenStage {
+
+ /**
+ * Supply the access token.
+ *
+ * @param accessToken the access token
+ *
+ * @return the next stage
+ */
public ITokenTypeStage withAccessToken(final String accessToken);
}
/** Token type stage interface.*/
public interface ITokenTypeStage {
+
+ /**
+ * Supply the token type.
+ *
+ * @param tokenType the token type
+ *
+ * @return the next stage
+ */
public IBuildStage withTokenType(final String tokenType);
}
/** Build stage interface.*/
public interface IBuildStage {
+
+ /**
+ * Supply the refresh token
+ *
+ * @param refreshToken the refresh token
+ *
+ * @return this builder
+ */
public IBuildStage withRefreshToken(final String refreshToken);
+ /**
+ * Supply the expiration.
+ *
+ * @param expiresIn the expiration
+ *
+ * @return this builder
+ */
public IBuildStage withExpiresIn(final Integer expiresIn);
+ /**
+ * Supply the scope.
+ *
+ * @param scope the scope
+ *
+ * @return this builder
+ */
public IBuildStage withScope(final String scope);
+ /**
+ * Do the build.
+ *
+ * @return the response
+ */
public TokenResponse build();
}
diff --git a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
index 3ade8ad..ee81ee5 100644
--- a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
+++ b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
@@ -44,7 +44,6 @@ import com.nimbusds.jwt.JWTClaimsSet;
import net.shibboleth.idp.plugin.authn.duo.AbstractDuoOIDCClient;
import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheckResponse;
@@ -61,7 +60,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
*/
@ThreadSafe
@Immutable
-final class DuoSDKClientAdaptor extends AbstractDuoOIDCClient{
+final public class DuoSDKClientAdaptor extends AbstractDuoOIDCClient{
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(DuoSDKClientAdaptor.class);
diff --git a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
index 1db2a56..481a90e 100644
--- a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
+++ b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
@@ -17,7 +17,6 @@
package net.shibboleth.idp.plugin.authn.duo.sdk.impl;
-import java.util.Collections;
import java.util.List;
import javax.annotation.Nonnull;
@@ -73,7 +72,7 @@ public class DuoSDKClientFactory extends AbstractInitializableComponent implemen
* @return the caCerts.
*/
@Nullable @NonnullElements @Unmodifiable private synchronized List<String> getCaCerts(){
- return Collections.unmodifiableList(caCerts);
+ return caCerts;
}
@Override
diff --git a/idp-duo-sdk-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactoryTest.java b/idp-duo-sdk-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactoryTest.java
index 4aa34f4..f9c1a86 100644
--- a/idp-duo-sdk-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactoryTest.java
+++ b/idp-duo-sdk-client-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactoryTest.java
@@ -77,6 +77,11 @@ public class DuoSDKClientFactoryTest {
factory.setCaCerts(certs);
}
+ /**
+ * Test creation.
+ *
+ * @throws DuoClientException
+ */
@Test
public final void testCreateInstance() throws DuoClientException {
final List<String> certs = new ArrayList<>();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list