Revert "Release 0.0.11"

This reverts commit ba9fc4d.

build.gradle

@@ -40,7 +40,7 @@ publishing {
  maven(MavenPublication) {
  groupId = 'io.squidex'
  artifactId = 'squidex'
- version = '0.0.11'
+ version = '0.0.8'
  from components.java
  }
  }

src/main/java/com/squidex/api/AccessToken.java

@@ -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;
+ }
+}

src/main/java/com/squidex/api/AuthInterceptor.java

@@ -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", String.format("Bearer %s", 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;
+ }
+}

src/main/java/com/squidex/api/InMemoryTokenStore.java

@@ -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;
+ }
+}

src/main/java/com/squidex/api/SquidexApiClient.java

@@ -0,0 +1,193 @@
+package com.squidex.api;
+
+import com.squidex.api.core.ClientOptions;
+import com.squidex.api.core.Suppliers;
+import com.squidex.api.resources.apps.AppsClient;
+import com.squidex.api.resources.assets.AssetsClient;
+import com.squidex.api.resources.backups.BackupsClient;
+import com.squidex.api.resources.comments.CommentsClient;
+import com.squidex.api.resources.contents.ContentsClient;
+import com.squidex.api.resources.diagnostics.DiagnosticsClient;
+import com.squidex.api.resources.eventconsumers.EventConsumersClient;
+import com.squidex.api.resources.history.HistoryClient;
+import com.squidex.api.resources.languages.LanguagesClient;
+import com.squidex.api.resources.news.NewsClient;
+import com.squidex.api.resources.notifications.NotificationsClient;
+import com.squidex.api.resources.ping.PingClient;
+import com.squidex.api.resources.plans.PlansClient;
+import com.squidex.api.resources.rules.RulesClient;
+import com.squidex.api.resources.schemas.SchemasClient;
+import com.squidex.api.resources.search.SearchClient;
+import com.squidex.api.resources.statistics.StatisticsClient;
+import com.squidex.api.resources.teams.TeamsClient;
+import com.squidex.api.resources.templates.TemplatesClient;
+import com.squidex.api.resources.translations.TranslationsClient;
+import com.squidex.api.resources.usermanagement.UserManagementClient;
+import com.squidex.api.resources.users.UsersClient;
+import java.util.function.Supplier;
+
+public class SquidexApiClient {
+ protected final ClientOptions clientOptions;
+
+ protected final Supplier<UserManagementClient> userManagementClient;
+
+ protected final Supplier<UsersClient> usersClient;
+
+ protected final Supplier<TranslationsClient> translationsClient;
+
+ protected final Supplier<TemplatesClient> templatesClient;
+
+ protected final Supplier<TeamsClient> teamsClient;
+
+ protected final Supplier<StatisticsClient> statisticsClient;
+
+ protected final Supplier<SearchClient> searchClient;
+
+ protected final Supplier<SchemasClient> schemasClient;
+
+ protected final Supplier<RulesClient> rulesClient;
+
+ protected final Supplier<PlansClient> plansClient;
+
+ protected final Supplier<PingClient> pingClient;
+
+ protected final Supplier<NewsClient> newsClient;
+
+ protected final Supplier<LanguagesClient> languagesClient;
+
+ protected final Supplier<HistoryClient> historyClient;
+
+ protected final Supplier<EventConsumersClient> eventConsumersClient;
+
+ protected final Supplier<DiagnosticsClient> diagnosticsClient;
+
+ protected final Supplier<ContentsClient> contentsClient;
+
+ protected final Supplier<CommentsClient> commentsClient;
+
+ protected final Supplier<NotificationsClient> notificationsClient;
+
+ protected final Supplier<BackupsClient> backupsClient;
+
+ protected final Supplier<AssetsClient> assetsClient;
+
+ protected final Supplier<AppsClient> appsClient;
+
+ public SquidexApiClient(ClientOptions clientOptions) {
+ this.clientOptions = clientOptions;
+ this.userManagementClient = Suppliers.memoize(() -> new UserManagementClient(clientOptions));
+ this.usersClient = Suppliers.memoize(() -> new UsersClient(clientOptions));
+ this.translationsClient = Suppliers.memoize(() -> new TranslationsClient(clientOptions));
+ this.templatesClient = Suppliers.memoize(() -> new TemplatesClient(clientOptions));
+ this.teamsClient = Suppliers.memoize(() -> new TeamsClient(clientOptions));
+ this.statisticsClient = Suppliers.memoize(() -> new StatisticsClient(clientOptions));
+ this.searchClient = Suppliers.memoize(() -> new SearchClient(clientOptions));
+ this.schemasClient = Suppliers.memoize(() -> new SchemasClient(clientOptions));
+ this.rulesClient = Suppliers.memoize(() -> new RulesClient(clientOptions));
+ this.plansClient = Suppliers.memoize(() -> new PlansClient(clientOptions));
+ this.pingClient = Suppliers.memoize(() -> new PingClient(clientOptions));
+ this.newsClient = Suppliers.memoize(() -> new NewsClient(clientOptions));
+ this.languagesClient = Suppliers.memoize(() -> new LanguagesClient(clientOptions));
+ this.historyClient = Suppliers.memoize(() -> new HistoryClient(clientOptions));
+ this.eventConsumersClient = Suppliers.memoize(() -> new EventConsumersClient(clientOptions));
+ this.diagnosticsClient = Suppliers.memoize(() -> new DiagnosticsClient(clientOptions));
+ this.contentsClient = Suppliers.memoize(() -> new ContentsClient(clientOptions));
+ this.commentsClient = Suppliers.memoize(() -> new CommentsClient(clientOptions));
+ this.notificationsClient = Suppliers.memoize(() -> new NotificationsClient(clientOptions));
+ this.backupsClient = Suppliers.memoize(() -> new BackupsClient(clientOptions));
+ this.assetsClient = Suppliers.memoize(() -> new AssetsClient(clientOptions));
+ this.appsClient = Suppliers.memoize(() -> new AppsClient(clientOptions));
+ }
+
+ public UserManagementClient userManagement() {
+ return this.userManagementClient.get();
+ }
+
+ public UsersClient users() {
+ return this.usersClient.get();
+ }
+
+ public TranslationsClient translations() {
+ return this.translationsClient.get();
+ }
+
+ public TemplatesClient templates() {
+ return this.templatesClient.get();
+ }
+
+ public TeamsClient teams() {
+ return this.teamsClient.get();
+ }
+
+ public StatisticsClient statistics() {
+ return this.statisticsClient.get();
+ }
+
+ public SearchClient search() {
+ return this.searchClient.get();
+ }
+
+ public SchemasClient schemas() {
+ return this.schemasClient.get();
+ }
+
+ public RulesClient rules() {
+ return this.rulesClient.get();
+ }
+
+ public PlansClient plans() {
+ return this.plansClient.get();
+ }
+
+ public PingClient ping() {
+ return this.pingClient.get();
+ }
+
+ public NewsClient news() {
+ return this.newsClient.get();
+ }
+
+ public LanguagesClient languages() {
+ return this.languagesClient.get();
+ }
+
+ public HistoryClient history() {
+ return this.historyClient.get();
+ }
+
+ public EventConsumersClient eventConsumers() {
+ return this.eventConsumersClient.get();
+ }
+
+ public DiagnosticsClient diagnostics() {
+ return this.diagnosticsClient.get();
+ }
+
+ public ContentsClient contents() {
+ return this.contentsClient.get();
+ }
+
+ public CommentsClient comments() {
+ return this.commentsClient.get();
+ }
+
+ public NotificationsClient notifications() {
+ return this.notificationsClient.get();
+ }
+
+ public BackupsClient backups() {
+ return this.backupsClient.get();
+ }
+
+ public AssetsClient assets() {
+ return this.assetsClient.get();
+ }
+
+ public AppsClient apps() {
+ return this.appsClient.get();
+ }
+
+ public static SquidexApiClientBuilder builder() {
+ return new SquidexApiClientBuilder();
+ }
+}