-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Some tests and and improvements to squidex builder.
- Loading branch information
1 parent
85a7f4b
commit 7f49ecc
Showing
13 changed files
with
470 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,16 @@ | ||
# Specify files that shouldn't be modified by Fern | ||
|
||
README.md | ||
|
||
# Wrappers | ||
**/AccessToken.java | ||
**/AuthInterceptor.java | ||
**/InMemoryTokenStore.java | ||
**/SquidexApiClient.java | ||
**/SquidexApiClientBuilder.java | ||
**/TokenStore.java | ||
|
||
# Workflows | ||
.github/workflows/check-updates.yml | ||
.github/workflows/test.yml | ||
|
||
#tests | ||
src/test/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package com.squidex.api; | ||
|
||
import com.fasterxml.jackson.annotation.JsonCreator; | ||
import com.fasterxml.jackson.annotation.JsonIgnore; | ||
import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
||
import java.time.Instant; | ||
|
||
public final class AccessToken { | ||
private final String accessToken; | ||
private final int expiresIn; | ||
private final Instant expiresAt; | ||
|
||
@JsonCreator() | ||
public AccessToken( | ||
@JsonProperty("access_token")String accessToken, | ||
@JsonProperty("expires_in")int expiresIn) { | ||
this.accessToken = accessToken; | ||
this.expiresIn = expiresIn; | ||
this.expiresAt = Instant.now().plusSeconds(expiresIn); | ||
} | ||
|
||
|
||
public String getAccessToken() { | ||
return accessToken; | ||
} | ||
|
||
|
||
public int getExpiresIn() { | ||
return expiresIn; | ||
} | ||
|
||
@JsonIgnore() | ||
public Instant getExpiresAt() { | ||
return expiresAt; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
package com.squidex.api; | ||
|
||
import com.squidex.api.core.Environment; | ||
import com.squidex.api.core.ObjectMappers; | ||
import okhttp3.*; | ||
import org.jetbrains.annotations.NotNull; | ||
|
||
import java.io.IOException; | ||
import java.time.Instant; | ||
import java.util.Objects; | ||
|
||
public final class AuthInterceptor implements Interceptor { | ||
private final Environment environment; | ||
private final String clientId; | ||
private final String clientSecret; | ||
private final TokenStore tokenStore; | ||
private final OkHttpClient httpClient; | ||
|
||
public AuthInterceptor(OkHttpClient httpClient, Environment environment, String clientId, String clientSecret, TokenStore tokenStore) { | ||
this.httpClient = httpClient; | ||
this.environment = environment; | ||
this.clientId = clientId; | ||
this.clientSecret = clientSecret; | ||
this.tokenStore = tokenStore; | ||
} | ||
|
||
@NotNull | ||
@Override | ||
public Response intercept(@NotNull Chain chain) throws IOException { | ||
Request originalRequest = chain.request(); | ||
|
||
AccessToken token = this.tokenStore.get(); | ||
if (token != null && token.getExpiresAt().isBefore(Instant.now())) { | ||
// The token has been expired, therefore also remove it from the store for other calls. | ||
token = null; | ||
this.tokenStore.clear(); | ||
} | ||
|
||
if (token == null) { | ||
token = acquireToken(); | ||
this.tokenStore.set(token); | ||
} | ||
|
||
Request requestWithHeader = originalRequest.newBuilder() | ||
.header("Authorization", "Bearer " + token.getAccessToken()) | ||
.build(); | ||
|
||
Response response = chain.proceed(requestWithHeader); | ||
if (response.code() == 401) { | ||
this.tokenStore.clear(); | ||
|
||
return intercept(chain); | ||
} | ||
|
||
return response; | ||
} | ||
|
||
private AccessToken acquireToken() throws IOException { | ||
RequestBody formBody = new FormBody.Builder() | ||
.add("grant_type", "client_credentials") | ||
.add("client_id", this.clientId) | ||
.add("client_secret", this.clientSecret) | ||
.add("scope", "squidex-api") | ||
.build(); | ||
|
||
HttpUrl tokenUrl = Objects.requireNonNull(HttpUrl.parse(this.environment.getUrl())) | ||
.newBuilder() | ||
.addPathSegments("identity-server/connect/token") | ||
.build(); | ||
|
||
Request tokenRequest = new Request.Builder() | ||
.url(tokenUrl.url()) | ||
.post(formBody) | ||
.build(); | ||
|
||
AccessToken token; | ||
try (Response response = this.httpClient.newCall(tokenRequest).execute()) { | ||
assert response.body() != null; | ||
token = ObjectMappers.JSON_MAPPER.readValue(response.body().string(), AccessToken.class); | ||
} | ||
|
||
return token; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package com.squidex.api; | ||
|
||
public class InMemoryTokenStore implements TokenStore { | ||
private AccessToken currentToken; | ||
|
||
@Override | ||
public AccessToken get() { | ||
return this.currentToken; | ||
} | ||
|
||
@Override | ||
public void set(AccessToken token) { | ||
this.currentToken = token; | ||
} | ||
|
||
@Override | ||
public void clear() { | ||
this.currentToken = null; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.squidex.api; | ||
|
||
public interface TokenStore { | ||
AccessToken get(); | ||
|
||
void set(AccessToken token); | ||
|
||
void clear(); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
package com.squidex.api; | ||
|
||
import com.squidex.api.resources.schemas.requests.CreateSchemaDto; | ||
import com.squidex.api.types.*; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import java.util.Collections; | ||
import java.util.UUID; | ||
|
||
import static org.junit.jupiter.api.Assertions.*; | ||
|
||
public class SchemasTests extends TestBase { | ||
private final SquidexApiClient client = Utils.getClient().client(); | ||
|
||
@Test | ||
public void should_create_and_fetch_schema() { | ||
CreateSchemaDto request = CreateSchemaDto.builder() | ||
.name("schema-%s".formatted(UUID.randomUUID())) | ||
.fields(Collections.singletonList( | ||
UpsertSchemaFieldDto.builder() | ||
.name("field1") | ||
.properties(FieldPropertiesDto.string(StringFieldPropertiesDto.builder().build())) | ||
.build() | ||
) | ||
) | ||
.isPublished(true) | ||
.build(); | ||
|
||
SchemaDto createdSchema = client.schemas().postSchema(request); | ||
|
||
SchemaDto schema = client.schemas().getSchema(createdSchema.getId()); | ||
assertFalse(createdSchema.getFields().isEmpty()); | ||
assertEquals(createdSchema.getName(), schema.getName()); | ||
assertEquals(createdSchema.getFields().get(0), schema.getFields().get(0)); | ||
assertEquals(SchemaType.DEFAULT, schema.getType()); | ||
assertTrue(schema.getIsPublished()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package com.squidex.api; | ||
|
||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
||
public abstract class TestBase { | ||
@RegisterExtension | ||
static TestSetup staticExtension = new TestSetup(); | ||
} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.