Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade SDK to use OASv3 spec version 2024.06.1 #1523

Merged
merged 6 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ This library should be used with the Okta management API. For authentication, we
[//]: # (method: getUser)
```java
UserApi userApi = new UserApi(client);
User user = userApi.getUser("userId");
userApi.getUser("userId", "true");
```
[//]: # (end: getUser)

Expand Down Expand Up @@ -370,13 +370,13 @@ UserFactor userFactor = userFactorApi.getFactor("userId", "factorId");
[//]: # (method: enrollUserInFactor)
```java
UserFactorApi userFactorApi = new UserFactorApi(client);
SmsUserFactorProfile smsUserFactorProfile = new SmsUserFactorProfile();
smsUserFactorProfile.setPhoneNumber("555 867 5309");
SmsUserFactor smsUserFactor = new SmsUserFactor();
smsUserFactor.setProvider(FactorProvider.OKTA);
smsUserFactor.setFactorType(FactorType.SMS);
smsUserFactor.setProfile(smsUserFactorProfile);
userFactorApi.enrollFactor("userId", smsUserFactor, true, "templateId", 30, true);
UserFactorSMSProfile UserFactorSMSProfile = new UserFactorSMSProfile();
UserFactorSMSProfile.setPhoneNumber("555 867 5309");
UserFactorSMS UserFactorSMS = new UserFactorSMS();
UserFactorSMS.setProvider(UserFactorProvider.OKTA);
UserFactorSMS.setFactorType(UserFactorType.SMS);
UserFactorSMS.setProfile(UserFactorSMSProfile);
userFactorApi.enrollFactor("userId", UserFactorSMS, true, "templateId", 30, true, null);
```
[//]: # (end: enrollUserInFactor)

Expand All @@ -385,10 +385,10 @@ userFactorApi.enrollFactor("userId", smsUserFactor, true, "templateId", 30, true
[//]: # (method: activateFactor)
```java
UserFactorApi userFactorApi = new UserFactorApi(client);
CallUserFactor userFactor = (CallUserFactor) userFactorApi.getFactor("userId", "factorId");
ActivateFactorRequest activateFactorRequest = new ActivateFactorRequest();
activateFactorRequest.setPassCode("123456");
userFactorApi.activateFactor("userId", "factorId", activateFactorRequest);
UserFactorCall userFactor = (UserFactorCall) userFactorApi.getFactor("userId", "factorId");
UserFactorActivateRequest userFactorActivateRequest = new UserFactorActivateRequest();
userFactorActivateRequest.setPassCode("123456");
userFactorApi.activateFactor("userId", "factorId", userFactorActivateRequest);
```
[//]: # (end: activateFactor)

Expand All @@ -398,10 +398,10 @@ userFactorApi.activateFactor("userId", "factorId", activateFactorRequest);
```java
UserFactorApi userFactorApi = new UserFactorApi(client);
UserFactor userFactor = userFactorApi.getFactor( "userId", "factorId");
VerifyFactorRequest verifyFactorRequest = new VerifyFactorRequest();
verifyFactorRequest.setPassCode("123456");
VerifyUserFactorResponse verifyUserFactorResponse =
userFactorApi.verifyFactor("userId", "factorId", "templateId", 10, "xForwardedFor", "userAgent", "acceptLanguage", verifyFactorRequest);
UserFactorVerifyRequest userFactorVerifyRequest = new UserFactorVerifyRequest();
userFactorVerifyRequest.setPassCode("123456");
UserFactorVerifyResponse verifyUserFactorResponse =
userFactorApi.verifyFactor("userId", "factorId", "templateId", 10, "xForwardedFor", "userAgent", "acceptLanguage", userFactorVerifyRequest);
```
[//]: # (end: verifyFactor)

Expand Down Expand Up @@ -461,7 +461,7 @@ MultifactorEnrollmentPolicy mfaPolicy =
[//]: # (method: listPolicies)
```java
PolicyApi policyApi = new PolicyApi(client);
List<Policy> policies = policyApi.listPolicies(PolicyType.PASSWORD.name(), LifecycleStatus.ACTIVE.name(), null);
List<Policy> policies = policyApi.listPolicies(PolicyType.PASSWORD.name(), LifecycleStatus.ACTIVE.name(), null, null, null, null);
```
[//]: # (end: listPolicies)

Expand Down
17 changes: 17 additions & 0 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,23 @@

<build>
<plugins>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.23.0</version>
<configuration>
<directories>
<directory>${project.build.directory}/generated-sources</directory>
</directories>
</configuration>
<executions>
<execution>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package com.okta.sdk.resource.application;

import com.okta.commons.lang.Classes;
import com.okta.sdk.resource.model.JsonWebKey;
import com.okta.sdk.resource.model.OAuthEndpointAuthenticationMethod;
import com.okta.sdk.resource.model.OAuthGrantType;
import com.okta.sdk.resource.model.OAuthResponseType;
Expand Down Expand Up @@ -65,7 +64,7 @@ static OIDCApplicationBuilder instance() {

OIDCApplicationBuilder setTokenEndpointAuthMethod(OAuthEndpointAuthenticationMethod tokenEndpointAuthMethod);

OIDCApplicationBuilder setJwks(List<JsonWebKey> jsonWebKeyList);
OIDCApplicationBuilder setJwks(List<com.okta.sdk.resource.model.SchemasJsonWebKey> jsonWebKeyList);

OIDCApplicationBuilder setImplicitAssignment(Boolean isImplicitAssignment);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ public static void main(String[] args) throws ApiException {
println("User created with ID: " + userId);

// You can look up user by ID
println("User lookup by ID: "+ Objects.requireNonNull(userApi.getUser(userId).getProfile()).getLogin());
println("User lookup by ID: "+ Objects.requireNonNull(userApi.getUser(userId, "false").getProfile()).getLogin());

// or by Email
println("User lookup by Email: "+ Objects.requireNonNull(userApi.getUser(email).getProfile()).getLogin());
println("User lookup by Email: "+ Objects.requireNonNull(userApi.getUser(email, "false").getProfile()).getLogin());

// get the list of users
List<User> users = userApi.listUsers(null, null, null, "status eq \"ACTIVE\"", null, null, null);
Expand Down
35 changes: 18 additions & 17 deletions examples/quickstart/src/main/java/quickstart/ReadmeSnippets.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.okta.sdk.client.Clients;
import com.okta.sdk.helper.PaginationUtil;
import com.okta.sdk.resource.group.GroupBuilder;
import com.okta.sdk.resource.model.UserFactorType;
import com.okta.sdk.resource.user.UserBuilder;

import com.okta.sdk.resource.client.ApiClient;
Expand Down Expand Up @@ -80,7 +81,7 @@ private void createOAuth2Client() {
private void getUser() throws ApiException {
UserApi userApi = new UserApi(client);

User user = userApi.getUser("userId");
userApi.getUser("userId", "true");
}

private void listAllUsers() throws ApiException {
Expand Down Expand Up @@ -209,36 +210,36 @@ private void getUserFactor() throws ApiException {
private void enrollUserInFactor() throws ApiException {
UserFactorApi userFactorApi = new UserFactorApi(client);

SmsUserFactorProfile smsUserFactorProfile = new SmsUserFactorProfile();
smsUserFactorProfile.setPhoneNumber("555 867 5309");
UserFactorSMSProfile UserFactorSMSProfile = new UserFactorSMSProfile();
UserFactorSMSProfile.setPhoneNumber("555 867 5309");

SmsUserFactor smsUserFactor = new SmsUserFactor();
smsUserFactor.setProvider(FactorProvider.OKTA);
smsUserFactor.setFactorType(FactorType.SMS);
smsUserFactor.setProfile(smsUserFactorProfile);
UserFactorSMS UserFactorSMS = new UserFactorSMS();
UserFactorSMS.setProvider(UserFactorProvider.OKTA);
UserFactorSMS.setFactorType(UserFactorType.SMS);
UserFactorSMS.setProfile(UserFactorSMSProfile);

userFactorApi.enrollFactor("userId", smsUserFactor, true, "templateId", 30, true);
userFactorApi.enrollFactor("userId", UserFactorSMS, true, "templateId", 30, true, null);
}

private void activateFactor() throws ApiException {
UserFactorApi userFactorApi = new UserFactorApi(client);

CallUserFactor userFactor = (CallUserFactor) userFactorApi.getFactor("userId", "factorId");
ActivateFactorRequest activateFactorRequest = new ActivateFactorRequest();
activateFactorRequest.setPassCode("123456");
UserFactorCall userFactor = (UserFactorCall) userFactorApi.getFactor("userId", "factorId");
UserFactorActivateRequest userFactorActivateRequest = new UserFactorActivateRequest();
userFactorActivateRequest.setPassCode("123456");

userFactorApi.activateFactor("userId", "factorId", activateFactorRequest);
userFactorApi.activateFactor("userId", "factorId", userFactorActivateRequest);
}

private void verifyFactor() throws ApiException {
UserFactorApi userFactorApi = new UserFactorApi(client);

UserFactor userFactor = userFactorApi.getFactor( "userId", "factorId");
VerifyFactorRequest verifyFactorRequest = new VerifyFactorRequest();
verifyFactorRequest.setPassCode("123456");
UserFactorVerifyRequest userFactorVerifyRequest = new UserFactorVerifyRequest();
userFactorVerifyRequest.setPassCode("123456");

VerifyUserFactorResponse verifyUserFactorResponse =
userFactorApi.verifyFactor("userId", "factorId", "templateId", 10, "xForwardedFor", "userAgent", "acceptLanguage", verifyFactorRequest);
UserFactorVerifyResponse verifyUserFactorResponse =
userFactorApi.verifyFactor("userId", "factorId", "templateId", 10, "xForwardedFor", "userAgent", "acceptLanguage", userFactorVerifyRequest);
}

private void listApplications() throws ApiException {
Expand Down Expand Up @@ -276,7 +277,7 @@ private void createSwaApplication() throws ApiException {
private void listPolicies() throws ApiException {
PolicyApi policyApi = new PolicyApi(client);

List<Policy> policies = policyApi.listPolicies(PolicyType.PASSWORD.name(), LifecycleStatus.ACTIVE.name(), null);
List<Policy> policies = policyApi.listPolicies(PolicyType.PASSWORD.name(), LifecycleStatus.ACTIVE.name(), null, null, null, null);
}

private void getPolicy() throws ApiException {
Expand Down
Loading