Release 0.0.8

Squidex · Aug 15, 2023 · eade748 · eade748
1 parent 210cf16
commit eade748
Show file tree

Hide file tree

Showing 31 changed files with 820 additions and 626 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'io.squidex'
             artifactId = 'squidex'
-            version = '0.0.7'
+            version = '0.0.8'
             from components.java
         }
     }

diff --git a/src/main/java/com/squidex/api/AccessToken.java b/src/main/java/com/squidex/api/AccessToken.java
diff --git a/src/main/java/com/squidex/api/AuthInterceptor.java b/src/main/java/com/squidex/api/AuthInterceptor.java
diff --git a/src/main/java/com/squidex/api/InMemoryTokenStore.java b/src/main/java/com/squidex/api/InMemoryTokenStore.java
diff --git a/src/main/java/com/squidex/api/SquidexApiClientBuilder.java b/src/main/java/com/squidex/api/SquidexApiClientBuilder.java
@@ -2,21 +2,16 @@
 
 import com.squidex.api.core.ClientOptions;
 import com.squidex.api.core.Environment;
-import okhttp3.OkHttpClient;
-
-import javax.net.ssl.*;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
 
 public final class SquidexApiClientBuilder {
-    private final ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();
+    private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();
 
     private Environment environment = Environment.DEFAULT;
-    private String clientId;
-    private String clientSecret;
-    private TokenStore tokenStore;
-    private OkHttpClient httpClient;
-    private boolean trustAllCerts;
+
+    public SquidexApiClientBuilder token(String token) {
+        this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + token);
+        return this;
+    }
 
     public SquidexApiClientBuilder environment(Environment environment) {
         this.environment = environment;
@@ -28,96 +23,13 @@ public SquidexApiClientBuilder url(String url) {
         return this;
     }
 
-    public SquidexApiClientBuilder clientId(String clientId) {
-        this.clientId = clientId;
-        return this;
-    }
-
-    public String clientId() {
-        return this.clientId;
-    }
-
-    public SquidexApiClientBuilder clientSecret(String clientSecret) {
-        this.clientSecret = clientSecret;
-        return this;
-    }
-
-    public String clientSecret() {
-        return this.clientSecret;
-    }
-
-    public SquidexApiClientBuilder tokenStore(TokenStore tokenStore) {
-        this.tokenStore = tokenStore;
-        return this;
-    }
-
-    public SquidexApiClientBuilder httpClient(OkHttpClient httpClient) {
-        this.httpClient = httpClient;
-        return this;
-    }
-
     public SquidexApiClientBuilder appName(String appName) {
-        this.clientOptionsBuilder.appName(appName);
-        return this;
-    }
-
-    public SquidexApiClientBuilder trustAllCerts() {
-        this.trustAllCerts = true;
+        clientOptionsBuilder.appName(appName);
         return this;
     }
 
     public SquidexApiClient build() {
         clientOptionsBuilder.environment(this.environment);
-
-        if (this.tokenStore == null) {
-            this.tokenStore = new InMemoryTokenStore();
-        }
-
-        if (this.httpClient == null) {
-            this.httpClient = new OkHttpClient();
-        }
-
-        if (this.trustAllCerts) {
-            X509TrustManager trustAllCerts = new X509TrustManager() {
-                @Override
-                public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) {
-                }
-
-                @Override
-                public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) {
-                }
-
-                @Override
-                public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-                    return new java.security.cert.X509Certificate[] {};
-                }
-            };
-
-            try {
-                SSLContext sslContext = SSLContext.getInstance("SSL");
-                sslContext.init(null, new TrustManager[] { trustAllCerts }, new java.security.SecureRandom());
-
-                this.httpClient = this.httpClient.newBuilder()
-                        .sslSocketFactory(sslContext.getSocketFactory(), trustAllCerts)
-                        .build();
-            } catch (NoSuchAlgorithmException | KeyManagementException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        AuthInterceptor interceptor = new AuthInterceptor(
-                this.httpClient,
-                this.environment,
-                this.clientId,
-                this.clientSecret,
-                this.tokenStore);
-
-        this.httpClient = this.httpClient.newBuilder()
-                .addInterceptor(interceptor)
-                .build();
-
-        clientOptionsBuilder.httpClient(this.httpClient);
-
         return new SquidexApiClient(clientOptionsBuilder.build());
     }
 }
diff --git a/src/main/java/com/squidex/api/TokenStore.java b/src/main/java/com/squidex/api/TokenStore.java
diff --git a/src/main/java/com/squidex/api/core/ApiError.java b/src/main/java/com/squidex/api/core/ApiError.java
@@ -0,0 +1,25 @@
+package com.squidex.api.core;
+
+public final class ApiError extends RuntimeException {
+    private final int statusCode;
+
+    private final Object body;
+
+    public ApiError(int statusCode, Object body) {
+        this.statusCode = statusCode;
+        this.body = body;
+    }
+
+    public int statusCode() {
+        return this.statusCode;
+    }
+
+    public Object body() {
+        return this.body;
+    }
+
+    @Override
+    public String toString() {
+        return "ApiError{" + "statusCode: " + statusCode + ", body: " + body + "}";
+    }
+}
diff --git a/src/main/java/com/squidex/api/core/ClientOptions.java b/src/main/java/com/squidex/api/core/ClientOptions.java
@@ -29,7 +29,7 @@ private ClientOptions(
                 "X-Fern-SDK-Name",
                 "com.squidex.fern:api-sdk",
                 "X-Fern-SDK-Version",
-                "0.0.7",
+                "0.0.8",
                 "X-Fern-Language",
                 "JAVA"));
         this.headerSuppliers = headerSuppliers;
@@ -67,8 +67,6 @@ public static Builder builder() {
     public static final class Builder {
         private Environment environment;
 
-        private OkHttpClient httpClient;
-
         private final Map<String, String> headers = new HashMap<>();
 
         private final Map<String, Supplier<String>> headerSuppliers = new HashMap<>();
@@ -95,17 +93,8 @@ public Builder appName(String appName) {
             return this;
         }
 
-        public Builder httpClient(OkHttpClient httpClient) {
-            this.httpClient = httpClient;
-            return this;
-        }
-
         public ClientOptions build() {
-            if (this.httpClient == null) {
-                this.httpClient = new OkHttpClient();
-            }
-
-            return new ClientOptions(environment, headers, headerSuppliers, this.httpClient, this.appName);
+            return new ClientOptions(environment, headers, headerSuppliers, new OkHttpClient(), this.appName);
         }
     }
 }