Webhook class was actualized. WebhookCreateResponse simplifies retrieving of created record id.

Author: kalnik-a-a

libs/sparkpost-lib/src/main/java/com/sparkpost/model/AuthCredentials.java

@@ -0,0 +1,25 @@
+package com.sparkpost.model;
+
+import com.google.gson.annotations.SerializedName;
+import com.yepher.jsondoc.annotations.Description;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AuthCredentials extends Base {
+
+    @Description(value = "Basic Auth Username. Used for 'basic' authorization flow.")
+    private String username;
+
+    @Description(value = "Basic Auth Password. Used for 'basic' authorization flow.")
+    private String password;
+
+    @Description(value = "OAuth2 access token generated by SparkPost. Returned in case of 'oauth2' authorization flow.")
+    @SerializedName("access_token")
+    private String accessToken;
+
+    @Description(value = "The lifetime of the access_token in seconds. Returned in case of 'oauth2' authorization flow.")
+    @SerializedName("expires_in")
+    private Integer expiresIn;
+}

libs/sparkpost-lib/src/main/java/com/sparkpost/model/AuthRequestDetails.java

@@ -0,0 +1,31 @@
+package com.sparkpost.model;
+
+import com.google.gson.annotations.SerializedName;
+import com.yepher.jsondoc.annotations.Description;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AuthRequestDetails extends Base {
+
+    @Description(value = "This is the URL SparkPost will request tokens from.", sample = {"https://oauth.myurl.com/tokens"})
+    private String url;
+
+    @Description(value = "OAuth 2.0 parameters that your target URL uses")
+    private AuthRequestClientDetails body;
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public class AuthRequestClientDetails extends Base {
+
+        @Description(value = "OAuth 2.0 Client ID")
+        @SerializedName("client_id")
+        private String clientId;
+
+        @Description(value = "OAuth 2.0 Client Secret")
+        @SerializedName("client_secret")
+        private String clientSecret;
+    }
+}

libs/sparkpost-lib/src/main/java/com/sparkpost/model/Webhook.java

@@ -1,6 +1,7 @@
 
 package com.sparkpost.model;
 
+import java.util.Arrays;
 import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
@@ -24,6 +25,20 @@ public class Webhook extends Base {
     @Description(value = "URL of the target to which to POST relay batches", sample = {"https://webhooks.customer.example/replies"})
     private String target;
 
+    @Description(value = "Type of authentication to be used during POST requests to target.", sample = {"none", "basic", "oauth2"})
+    @SerializedName("auth_type")
+    private String authType;
+
+    @Description(value = "When using auth_type == 'oauth2', auth_request_details must be set by the user. "
+            + "Additionally, auth_credentials is set by the system and cannot be configured by the user")
+    @SerializedName("auth_request_details")
+    private AuthRequestDetails authRequestDetails;
+
+    @Description(value = "When using auth_type == 'basic', auth_credentials must be set by the user")
+    @SerializedName("auth_credentials")
+    private AuthCredentials authCredentials;
+
+    @Deprecated
     @Description(
             value = "Authentication token to present in the X-MessageSystems-Webhook-Token header of POST requests to target",
             sample = {"5ebe2294ecd0e0f08eab7690d2a6ee69"})

libs/sparkpost-lib/src/main/java/com/sparkpost/model/WebhookCreateResponseEntry.java

@@ -0,0 +1,13 @@
+package com.sparkpost.model;
+
+import com.yepher.jsondoc.annotations.Description;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WebhookCreateResponseEntry extends Base {
+
+    @Description(value = "Created webhook id.")
+    private String id;
+}

libs/sparkpost-lib/src/main/java/com/sparkpost/model/responses/WebhookCreateResponse.java

@@ -0,0 +1,15 @@
+package com.sparkpost.model.responses;
+
+import com.sparkpost.model.WebhookCreateResponseEntry;
+import com.yepher.jsondoc.annotations.Description;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WebhookCreateResponse extends Response {
+
+
+    @Description(value = "Created webhook description")
+    WebhookCreateResponseEntry results;
+}

libs/sparkpost-lib/src/main/java/com/sparkpost/resources/ResourceWebhooks.java

@@ -4,6 +4,7 @@
 import com.sparkpost.exception.SparkPostException;
 import com.sparkpost.model.Webhook;
 import com.sparkpost.model.responses.Response;
+import com.sparkpost.model.responses.WebhookCreateResponse;
 import com.sparkpost.model.responses.WebhookListAllResponse;
 import com.sparkpost.transport.RestConnection;
 
@@ -39,11 +40,12 @@ public static WebhookListAllResponse listAll(RestConnection conn, String timezon
         return allWebhooks;
     }
 
-    public static Response create(RestConnection conn, Webhook webhook) throws SparkPostException {
+    public static WebhookCreateResponse create(RestConnection conn, Webhook webhook) throws SparkPostException {
 
         String json = webhook.toJson();
         Response response = conn.post("webhooks", json);
-        return response;
+        WebhookCreateResponse webhookCreateResponse = WebhookCreateResponse.decode(response, WebhookCreateResponse.class);
+        return webhookCreateResponse;
     }
 
     public static Response describe(RestConnection conn, String id, String timezone) throws SparkPostException {