Updated API samples

Author: detain

openapi-client/ada/.openapi-generator/VERSION

@@ -1 +1 @@
-6.6.0
+8.0.0-SNAPSHOT

openapi-client/ada/defaultproject.gpr

@@ -8,19 +8,18 @@
 with "config";
 with "utilada_sys";
 with "utilada_xml";
-with "utilada_http";
+with "utilada_curl";
 with "security";
 with "swagger";
 project defaultProject is
 
-    Mains := ("-client.adb");
-    for Main use Mains;
-    for Source_Dirs use ("src", "src/model", "src/client");
-    for Object_Dir use "./" & Config'Exec_Dir & "/bin";
+   for Object_Dir use "obj/";
+   for Source_Dirs use ("src", "src/model", "src/client");
+   Mains := ("-client.adb");
 
-    package Binder renames Config.Binder;
-    package Builder renames Config.Builder;
-    package Compiler renames Config.Compiler;
-    package Linker renames Config.Linker;
+   package Binder renames Config.Binder;
+   package Builder renames Config.Builder;
+   package Compiler renames Config.Compiler;
+   package Linker renames Config.Linker;
 
 end defaultProject;

openapi-client/ada/src/-client.adb

@@ -1,6 +1,18 @@
+--  ------------ EDIT NOTE ------------
+--  MailBaby Email Delivery and Management Service API
+--  **Send emails fast and with confidence through our easy to use [REST](https://en.wikipedia.org/wiki/Representational_state_transfer) API interface.** # Overview This is the API interface to the [Mail Baby](https//mail.baby/) Mail services provided by [InterServer](https://www.interserver.net). To use this service you must have an account with us at [my.interserver.net](https://my.interserver.net). # Authentication In order to use most of the API calls you must pass credentials from the [my.interserver.net](https://my.interserver.net/) site. We support several different authentication methods but the preferred method is to use the **API Key** which you can get from the [Account Security](https://my.interserver.net/account_security) page. 
+--  This file was generated with openapi-generator.  You can modify it to implement
+--  the client.  After you modify this file, you should add the following line
+--  to the .openapi-generator-ignore file:
+--
+--  src/.ads
+--
+--  Then, you can drop this edit note comment.
+--  ------------ EDIT NOTE ------------
 with .Clients;
 with .Models;
 with Swagger;
+with Swagger.Credentials.OAuth;
 with Util.Http.Clients.Curl;
 with Ada.Text_IO;
 with Ada.Command_Line;
@@ -30,9 +42,11 @@ begin
    declare
       Command : constant String := Ada.Command_Line.Argument (Arg);
       Item    : constant String := Ada.Command_Line.Argument (Arg + 1);
+      Cred    : aliased Swagger.Credentials.OAuth.OAuth2_Credential_Type;
       C       : .Clients.Client_Type;
    begin
       C.Set_Server (Server);
+      C.Set_Credentials (Cred'Unchecked_Access);
       Arg := Arg + 2;
 
    exception

openapi-client/ada/src/client/-clients.adb

@@ -4,14 +4,27 @@
 --  The version of the OpenAPI document: 1.1.0
 --  Contact: support@interserver.net
 --
---  NOTE: This package is auto generated by OpenAPI-Generator 6.6.0.
+--  NOTE: This package is auto generated by OpenAPI-Generator 8.0.0-SNAPSHOT.
 --  https://openapi-generator.tech
 --  Do not edit the class manually.
 
 pragma Warnings (Off, "*is not referenced");
 with Swagger.Streams;
 package body .Clients is
-   pragma Style_Checks ("-mr");
+   pragma Style_Checks ("-bmrIu");
+
+   Mime_1 : aliased constant String := "multipart/form-data";
+   Media_List_1 : constant Swagger.Mime_List := (
+     1 => Swagger.Mime_Json   );
+   Media_List_2 : constant Swagger.Mime_List := (
+     1 => Swagger.Mime_Form,
+   
+     2 => Swagger.Mime_Json   );
+   Media_List_3 : constant Swagger.Mime_List := (
+     1 => Swagger.Mime_Json,
+   
+     2 => Mime_1'Access   );
+
 
    --  Creates a new email deny rule.
    --  Adds a new email deny rule into the system to block new emails that match the given criteria
@@ -25,8 +38,9 @@ package body .Clients is
       Req   : Swagger.Clients.Request_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
-      Client.Initialize (Req, (1 => Swagger.Clients.APPLICATION_FORM));
+      Client.Set_Accept (Media_List_1);
+
+      Client.Initialize (Req, Media_List_2);
       .Models.Serialize (Req.Stream, "user", User);
       .Models.Serialize (Req.Stream, "type", P_Type);
       .Models.Serialize (Req.Stream, "data", Data);
@@ -45,10 +59,11 @@ package body .Clients is
       URI   : Swagger.Clients.URI_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
+      Client.Set_Accept (Media_List_1);
+
 
       URI.Set_Path ("/mail/rules/{ruleId}");
-      URI.Set_Path_Param ("ruleId", Swagger.To_String (Rule_Id));
+      URI.Set_Path_Param ("ruleId", .Models.To_String (Rule_Id));
       Client.Call (Swagger.Clients.DELETE, URI, Reply);
       .Models.Deserialize (Reply, "", Result);
    end Delete_Rule;
@@ -57,16 +72,15 @@ package body .Clients is
    --  Removes an email address from the various block lists.
    procedure Delist_Block
       (Client : in out Client_Type;
-       Email_Address_Type : in .Models.EmailAddress_Type;
+       P_Body : in Swagger.UString;
        Result : out .Models.GenericResponse_Type) is
       URI   : Swagger.Clients.URI_Type;
       Req   : Swagger.Clients.Request_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
-      Client.Initialize (Req, (Swagger.Clients.APPLICATION_JSON,
-                               Swagger.Clients.MULTIPART_FORM-DATA));
-      .Models.Serialize (Req.Stream, "", Email_Address_Type);
+      Client.Set_Accept (Media_List_1);
+      Client.Initialize (Req, Media_List_3);
+      .Models.Serialize (Req.Stream, "", P_Body);
 
       URI.Set_Path ("/mail/blocks/delete");
       Client.Call (Swagger.Clients.POST, URI, Req, Reply);
@@ -80,7 +94,8 @@ package body .Clients is
       URI   : Swagger.Clients.URI_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
+      Client.Set_Accept (Media_List_1);
+
 
       URI.Set_Path ("/mail/blocks");
       Client.Call (Swagger.Clients.GET, URI, Reply);
@@ -95,21 +110,24 @@ package body .Clients is
       URI   : Swagger.Clients.URI_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
+      Client.Set_Accept (Media_List_1);
+
 
       URI.Set_Path ("/mail/rules");
       Client.Call (Swagger.Clients.GET, URI, Reply);
       .Models.Deserialize (Reply, "", Result);
    end Get_Rules;
 
-   --  displays a list of blocked email addresses
+   --  Account usage statistics.
+   --  Returns information about the usage on your mail accounts.
    procedure Get_Stats
       (Client : in out Client_Type;
        Result : out .Models.GetStats200ResponseInner_Type_Vectors.Vector) is
       URI   : Swagger.Clients.URI_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
+      Client.Set_Accept (Media_List_1);
+
 
       URI.Set_Path ("/mail/stats");
       Client.Call (Swagger.Clients.GET, URI, Reply);
@@ -135,7 +153,8 @@ package body .Clients is
       URI   : Swagger.Clients.URI_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
+      Client.Set_Accept (Media_List_1);
+
 
       URI.Add_Param ("id", Id);
       URI.Add_Param ("origin", Origin);
@@ -155,24 +174,136 @@ package body .Clients is
 
    --  Sends an Email with Advanced Options
    --  Sends An email through one of your mail orders allowing additional options such as file attachments, cc, bcc, etc.
+   --  
+   --  Here are 9 examples showing the various ways to call the advsend operation showing the different ways you can pass the to, cc, bcc, and replyto information. The first several examples are all for the application/x-www-form-urlencoded content-type while the later ones are for application/json content-types.
+   --  
+   --  ```
+   --  curl -i --request POST --url https://api.mailbaby.net/mail/advsend \
+   --  --header 'Accept: application/json' \
+   --  --header 'Content-Type: application/x-www-form-urlencoded' \
+   --  --header 'X-API-KEY: YOUR_API_KEY' \
+   --  --data 'subject=Welcome' \
+   --  --data 'body=Hello' \
+   --  --data from=user@domain.com \
+   --  --data to=support@interserver.net
+   --  ```
+   --  
+   --  ```
+   --  curl -i --request POST --url https://api.mailbaby.net/mail/advsend \
+   --  --header 'Accept: application/json' \
+   --  --header 'Content-Type: application/x-www-form-urlencoded' \
+   --  --header 'X-API-KEY: YOUR_API_KEY' \
+   --  --data 'subject=Welcome' \
+   --  --data 'body=Hello' \
+   --  --data from=user@domain.com \
+   --  --data "to[0][name]=Joe" \
+   --  --data "to[0][email]=support@interserver.net"
+   --  ```
+   --  
+   --  ```
+   --  curl -i --request POST --url https://api.mailbaby.net/mail/advsend \
+   --  --header 'Accept: application/json' \
+   --  --header 'Content-Type: application/x-www-form-urlencoded' \
+   --  --header 'X-API-KEY: YOUR_API_KEY' \
+   --  --data 'subject=Welcome' \
+   --  --data 'body=Hello' \
+   --  --data from="Joe <user@domain.com>" \
+   --  --data to="Joe <support@interserver.net>"
+   --  ```
+   --  
+   --  ```
+   --  curl -i --request POST --url https://api.mailbaby.net/mail/advsend \
+   --  --header 'Accept: application/json' \
+   --  --header 'Content-Type: application/x-www-form-urlencoded' \
+   --  --header 'X-API-KEY: YOUR_API_KEY' \
+   --  --data 'subject=Welcome' \
+   --  --data 'body=Hello' \
+   --  --data from=user@domain.com \
+   --  --data "to=support@interserver.net, support@interserver.net"
+   --  ```
+   --  
+   --  ```
+   --  curl -i --request POST --url https://api.mailbaby.net/mail/advsend \
+   --  --header 'Accept: application/json' \
+   --  --header 'Content-Type: application/x-www-form-urlencoded' \
+   --  --header 'X-API-KEY: YOUR_API_KEY' \
+   --  --data 'subject=Welcome' \
+   --  --data 'body=Hello' \
+   --  --data from=user@domain.com \
+   --  --data "to=Joe <support@interserver.net>, Joe <support@interserver.net>"
+   --  ```
+   --  
+   --  ```
+   --  curl -i --request POST --url https://api.mailbaby.net/mail/advsend \
+   --  --header 'Accept: application/json' \
+   --  --header 'Content-Type: application/x-www-form-urlencoded' \
+   --  --header 'X-API-KEY: YOUR_API_KEY' \
+   --  --data 'subject=Welcome' \
+   --  --data 'body=Hello' \
+   --  --data from=user@domain.com \
+   --  --data "to[0][name]=Joe" \
+   --  --data "to[0][email]=support@interserver.net" \
+   --  --data "to[1][name]=Joe" \
+   --  --data "to[1][email]=support@interserver.net"
+   --  ```
+   --  
+   --  ```
+   --  curl -i --request POST --url https://api.mailbaby.net/mail/advsend \
+   --  --header 'Accept: application/json' \
+   --  --header 'Content-Type: application/json' \
+   --  --header 'X-API-KEY: YOUR_API_KEY' \
+   --  --data '{
+   --  "subject": "Welcome",
+   --  "body": "Hello",
+   --  "from": "user@domain.com",
+   --  "to": "support@interserver.net"
+   --  }'
+   --  ```
+   --  
+   --  ```
+   --  curl -i --request POST --url https://api.mailbaby.net/mail/advsend \
+   --  --header 'Accept: application/json' \
+   --  --header 'Content-Type: application/json' \
+   --  --header 'X-API-KEY: YOUR_API_KEY' \
+   --  --data '{
+   --  "subject": "Welcome",
+   --  "body": "Hello",
+   --  "from": {"name": "Joe", "email": "user@domain.com"},
+   --  "to": [{"name": "Joe", "email": "support@interserver.net"}]
+   --  }'
+   --  ```
+   --  
+   --  ```
+   --  curl -i --request POST --url https://api.mailbaby.net/mail/advsend \
+   --  --header 'Accept: application/json' \
+   --  --header 'Content-Type: application/json' \
+   --  --header 'X-API-KEY: YOUR_API_KEY' \
+   --  --data '{
+   --  "subject": "Welcome",
+   --  "body": "Hello",
+   --  "from": "Joe <user@domain.com>",
+   --  "to": "Joe <support@interserver.net>"
+   --  }'
+   --  ```
    procedure Send_Adv_Mail
       (Client : in out Client_Type;
        Subject : in Swagger.UString;
        P_Body : in Swagger.UString;
-       From : in .Models..Models.EmailAddressName_Type;
-       To : in .Models.EmailAddressName_Type_Vectors.Vector;
-       Replyto : in .Models.EmailAddressName_Type_Vectors.Vector;
-       Cc : in .Models.EmailAddressName_Type_Vectors.Vector;
-       Bcc : in .Models.EmailAddressName_Type_Vectors.Vector;
+       From : in .Models..Models.EmailAddressTypes_Type;
+       To : in .Models..Models.EmailAddressesTypes_Type;
+       Replyto : in .Models..Models.EmailAddressesTypes_Type;
+       Cc : in .Models..Models.EmailAddressesTypes_Type;
+       Bcc : in .Models..Models.EmailAddressesTypes_Type;
        Attachments : in .Models.MailAttachment_Type_Vectors.Vector;
        Id : in Swagger.Nullable_Long;
        Result : out .Models.GenericResponse_Type) is
       URI   : Swagger.Clients.URI_Type;
       Req   : Swagger.Clients.Request_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
-      Client.Initialize (Req, (1 => Swagger.Clients.APPLICATION_FORM));
+      Client.Set_Accept (Media_List_1);
+
+      Client.Initialize (Req, Media_List_2);
       .Models.Serialize (Req.Stream, "subject", Subject);
       .Models.Serialize (Req.Stream, "body", P_Body);
       .Models.Serialize (Req.Stream, "from", From);
@@ -203,8 +334,9 @@ package body .Clients is
       Req   : Swagger.Clients.Request_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
-      Client.Initialize (Req, (1 => Swagger.Clients.APPLICATION_FORM));
+      Client.Set_Accept (Media_List_1);
+
+      Client.Initialize (Req, Media_List_2);
       .Models.Serialize (Req.Stream, "to", To);
       .Models.Serialize (Req.Stream, "from", From);
       .Models.Serialize (Req.Stream, "subject", Subject);
@@ -223,7 +355,8 @@ package body .Clients is
       URI   : Swagger.Clients.URI_Type;
       Reply : Swagger.Value_Type;
    begin
-      Client.Set_Accept ((1 => Swagger.Clients.APPLICATION_JSON));
+      Client.Set_Accept (Media_List_1);
+
 
       URI.Set_Path ("/mail");
       Client.Call (Swagger.Clients.GET, URI, Reply);