1309: checkpoint

Author: lhazlewood

api/src/main/java/com/stormpath/sdk/client/DefaultPairedApiKey.java

@@ -8,18 +8,16 @@
 import com.stormpath.sdk.tenant.Tenant;
 
 /**
- * Created by lhazlewood on 3/9/17.
+ * For Okta authentication against both the REST API endpoints and the OIDC endpoints.
  */
 public class DefaultPairedApiKey implements PairedApiKey {
 
     private final ApiKey primary;
     private ApiKey secondary;
 
-    public DefaultPairedApiKey(ApiKey primary, ApiKey secondary) {
+    public DefaultPairedApiKey(ApiKey primary) {
         Assert.notNull(primary, "primary ApiKey cannot be null.");
-        Assert.notNull(secondary, "secondary ApiKey cannot be null.");
         this.primary = primary;
-        this.secondary = secondary;
     }
 
     @Override

extensions/spring/boot/stormpath-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathAutoConfiguration.java

@@ -19,6 +19,8 @@
 import com.stormpath.sdk.application.Application;
 import com.stormpath.sdk.client.Client;
 import com.stormpath.spring.config.AbstractStormpathConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;

extensions/spring/stormpath-spring/src/main/java/com/stormpath/spring/config/AbstractStormpathConfiguration.java

@@ -26,12 +26,14 @@
 import com.stormpath.sdk.client.ClientBuilder;
 import com.stormpath.sdk.client.Clients;
 import com.stormpath.sdk.client.DefaultPairedApiKey;
+import com.stormpath.sdk.client.PairedApiKey;
 import com.stormpath.sdk.client.Proxy;
 import com.stormpath.sdk.lang.Assert;
 import com.stormpath.sdk.lang.Strings;
 import com.stormpath.spring.cache.SpringCacheManager;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.CacheManager;
 import org.springframework.core.io.Resource;
@@ -110,10 +112,13 @@ public ApiKey stormpathClientApiKey() {
         if (oktaEnabled) {
             Assert.hasText(oktaApiToken, "When okta.enabled is true, the okta.api.token " +
                 "property must be specified with a valid Okta API Token value.");
-            return ApiKeys.builder()
+
+            ApiKey primary = ApiKeys.builder()
                 .setId(baseUrl) //not really necessary, but what the heck, why not
                 .setSecret(oktaApiToken)
                 .build();
+
+            return new DefaultPairedApiKey(primary);
         }
 
         ApiKeyBuilder builder = ApiKeys.builder();
@@ -143,6 +148,17 @@ public ApiKey stormpathClientApiKey() {
         return builder.build();
     }
 
+    @Autowired
+    public void oktaOidcClientApiKey(@Qualifier("stormpathClientApiKey") ApiKey stormpathClientApiKey) {
+
+        //TODO: lookup client credentials
+        ApiKey secondary = null;
+
+        if (oktaEnabled) {
+            ((PairedApiKey)stormpathClientApiKey).setSecondaryApiKey(secondary);
+        }
+    }
+
     public Application stormpathApplication() {
 
         Client client = stormpathClient();
@@ -212,16 +228,10 @@ protected Proxy resolveProxy() {
         return proxy;
     }
 
-    public ApiKey oktaOidcClientApiKey() {
-        //Brian:
-        return ApiKeys.builder().setId("foo").setSecret("bar").build();
-    }
-
     public Client stormpathClient() {
 
-        ApiKey apiKey = stormpathClientApiKey();
-
         ClientBuilder builder = Clients.builder()
+            .setApiKey(stormpathClientApiKey())
             .setCacheManager(stormpathCacheManager());
 
         if (oktaEnabled) {
@@ -242,11 +252,6 @@ public Client stormpathClient() {
             if (append != null) {
                 baseUrl += append;
             }
-
-            apiKey = new DefaultPairedApiKey(apiKey, oktaOidcClientApiKey());
-
-        } else {
-            builder.setApiKey(stormpathClientApiKey());
         }
 
         if (authenticationScheme != null) {