Skip to content
This repository was archived by the owner on Dec 12, 2018. It is now read-only.

Commit 619c367

Browse files
committed
Merge remote-tracking branch 'origin/okta' into okta
2 parents 9c17dc2 + b3002f4 commit 619c367

File tree

3 files changed

+15
-64
lines changed

3 files changed

+15
-64
lines changed

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.stormpath.sdk.api.ApiKeyBuilder;
2020
import com.stormpath.sdk.api.ApiKeys;
2121
import com.stormpath.sdk.application.Application;
22+
import com.stormpath.sdk.application.okta.ApplicationCredentials;
2223
import com.stormpath.sdk.application.okta.ClientApiKeyResolver;
2324
import com.stormpath.sdk.cache.Caches;
2425
import com.stormpath.sdk.client.AuthenticationScheme;
@@ -151,10 +152,21 @@ public ApiKey stormpathClientApiKey() {
151152
@Autowired
152153
public void oktaOidcClientApiKey(@Qualifier("stormpathClientApiKey") ApiKey stormpathClientApiKey) {
153154

154-
//TODO: lookup client credentials
155-
ApiKey secondary = null;
156-
157155
if (oktaEnabled) {
156+
Assert.hasText(oktaApplicationId, "When okta.enabled is true, okta.application.id " +
157+
"must be configured with your Okta Application ID. This can be found in the URL when accessing " +
158+
"you application in a browser.");
159+
160+
Client client = stormpathClient();
161+
162+
String applicationCredentialsHref = "/internal/apps/" + oktaApplicationId + "/settings/clientcreds";
163+
ApplicationCredentials applicationCredentials = client.getResource(applicationCredentialsHref, ApplicationCredentials.class);
164+
165+
ApiKey secondary = ApiKeys.builder()
166+
.setId(applicationCredentials.getClientId())
167+
.setSecret(applicationCredentials.getClientSecret())
168+
.build();
169+
158170
((PairedApiKey)stormpathClientApiKey).setSecondaryApiKey(secondary);
159171
}
160172
}

impl/src/main/java/com/stormpath/sdk/impl/application/okta/OktaClientApiKeyResolver.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

impl/src/test/groovy/com/stormpath/sdk/impl/application/okta/OktaClientApiKeyResolverTest.groovy

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)