Header params, Request body

Added request body to OAOperation, header parameters

Author: kolodi

Assets/PetStore/PetshopConsumeExample.cs

@@ -3,6 +3,7 @@
 using UnityEngine;
 using UnityOpenApi;
 using PetStore;
+using Newtonsoft.Json;
 
 public class PetshopConsumeExample : MonoBehaviour
 {
@@ -15,6 +16,9 @@ public class PetshopConsumeExample : MonoBehaviour
  [SerializeField] PathItemAsset pet = null;
  [SerializeField] string petIdToGet = "5";
 
+ [Header("New pet")]
+ [SerializeField] NewPet newPet;
+
  [ContextMenu("Get Pets")]
  public void GetPets()
  {
@@ -42,4 +46,17 @@ public void GetPet()
  Debug.Log("Pet ID: " + pet.Id + ", type: " + pet.Type + ", price: " + pet.Price);
  });
  }
+
+ [ContextMenu("Create Pet")]
+ public void CreatePet()
+ {
+ var operation = pets.GetOperation(AOOperationType.Post);
+ var serialized = JsonConvert.SerializeObject(newPet);
+ operation.SetRequestBody(serialized);
+ 
+ pets.ExecuteOperation<Pet>(operation, pet =>
+ {
+ Debug.Log("Pet ID: " + pet.Id + ", type: " + pet.Type + ", price: " + pet.Price);
+ });
+ }
 }

Assets/PetStore/_pets.asset

@@ -20,6 +20,10 @@ MonoBehaviour:
  - OperationId: findPets
  OperationType: 0
  Deprecated: 0
+ RequestBody:
+ Description: 
+ Required: 0
+ LastRequestBody: 
  Parameters:
  - Name: tags
  Required: 0
@@ -126,6 +130,10 @@ MonoBehaviour:
  - OperationId: addPet
  OperationType: 2
  Deprecated: 0
+ RequestBody:
+ Description: Pet to add to the store
+ Required: 1
+ LastRequestBody: 
  Parameters: []
  ParametersValues: []
  Description: Creates a new pet in the store. Duplicates are allowed

Assets/PetStore/_pets_{id}.asset

@@ -20,6 +20,10 @@ MonoBehaviour:
  - OperationId: find pet by id
  OperationType: 0
  Deprecated: 0
+ RequestBody:
+ Description: 
+ Required: 0
+ LastRequestBody: 
  Parameters:
  - Name: id
  Required: 1
@@ -57,7 +61,7 @@ MonoBehaviour:
  IsLocal: 0
  Reference: 
  UnresolvedReference: 0
- value: 2
+ value: 
  Description: Returns a user based on a single ID, if the user does not have access
  to the pet
  Summary: 
@@ -67,6 +71,10 @@ MonoBehaviour:
  - OperationId: deletePet
  OperationType: 3
  Deprecated: 0
+ RequestBody:
+ Description: 
+ Required: 0
+ LastRequestBody: 
  Parameters:
  - Name: id
  Required: 1
@@ -104,7 +112,7 @@ MonoBehaviour:
  IsLocal: 0
  Reference: 
  UnresolvedReference: 0
- value: 2
+ value: 
  Description: deletes a single pet based on the ID supplied
  Summary: 
  Tags: []

Assets/PetStore/data_model/Pet.cs

@@ -1,17 +1,27 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 namespace PetStore
 {
-
+ [Serializable]
  public class Pet
  {
- public int Id { get; set; }
- public PetType Type { get; set; }
- public float Price { get; set; }
+ public int Id;
+ public PetType Type;
+ public float Price;
+ }
+
+ [Serializable]
+ public class NewPet
+ {
+ public string Name;
+ public PetType Type;
+ public float Price;
  }
 
+ [Serializable]
  public enum PetType
  {
  dog, cat, fish, bird, gecko

Assets/Scenes/ApiTesting.unity

@@ -189,6 +189,10 @@ MonoBehaviour:
  limit: 3
  pet: {fileID: 11400000, guid: 86e050ea5e7107a4c99652da82e45aa4, type: 2}
  petIdToGet: 5
+ newPet:
+ Name: Birdy
+ Type: 3
+ Price: 0
 --- !u!4 &929404285
 Transform:
  m_ObjectHideFlags: 0

Assets/UnityOpenApi/OA Models/OAOperation.cs

@@ -15,28 +15,28 @@ public class OAOperation
  public bool Deprecated;
  //public IDictionary<string, OpenApiCallback> Callbacks;
  //public OpenApiResponses Responses; 
- //public OpenApiRequestBody RequestBody; 
+ public OARequestBody RequestBody; 
  public List<OAParameter> Parameters;
  public List<ParameterValue> ParametersValues;
- //public OpenApiExternalDocs ExternalDocs; 
+ public OAExternalDocs ExternalDocs; 
  public string Description;
  public string Summary;
  public List<OATag> Tags;
  public List<OAServer> Servers;
  public PathItemAsset pathAsset;
 
- public OAOperation(OperationType operationType, OpenApiOperation openApiOperation, PathItemAsset pathItemAsset)
+ public OAOperation(OperationType operationType, OpenApiOperation op, PathItemAsset pathItemAsset)
  {
  pathAsset = pathItemAsset;
- OperationId = openApiOperation.OperationId;
+ OperationId = op.OperationId;
  OperationType = (AOOperationType)operationType;
- Summary = openApiOperation.Summary;
- Description = openApiOperation.Description;
- Deprecated = openApiOperation.Deprecated;
+ Summary = op.Summary;
+ Description = op.Description;
+ Deprecated = op.Deprecated;
 
- if (openApiOperation.Parameters.Count > 0)
+ if (op.Parameters.Count > 0)
  {
- Parameters = openApiOperation.Parameters.Select(p => new OAParameter(p)).ToList();
+ Parameters = op.Parameters.Select(p => new OAParameter(p)).ToList();
  }
  else
  {
@@ -45,9 +45,13 @@ public OAOperation(OperationType operationType, OpenApiOperation openApiOperatio
 
  ParametersValues = Parameters.Select(p => new ParameterValue { parameter = p }).ToList();
 
- Servers = openApiOperation.Servers.Select(s => new OAServer(s)).ToList();
+ Servers = op.Servers.Select(s => new OAServer(s)).ToList();
 
- Tags = openApiOperation.Tags.Select(t => new OATag(t)).ToList();
+ Tags = op.Tags.Select(t => new OATag(t)).ToList();
+
+ RequestBody = new OARequestBody(op.RequestBody);
+
+ ExternalDocs = new OAExternalDocs(op.ExternalDocs);
  }
 
  public void SetParameterValue(string parameterName, string val)
@@ -59,5 +63,10 @@ public void SetParameterValue(string parameterName, string val)
  }
  parVal.value = val;
  }
+
+ public void SetRequestBody(string body)
+ {
+ RequestBody.LastRequestBody = body;
+ }
  }
 }

Assets/UnityOpenApi/OA Models/OARequestBody.cs

@@ -0,0 +1,21 @@
+using Microsoft.OpenApi.Models;
+using System;
+
+namespace UnityOpenApi
+{
+ [Serializable]
+ public class OARequestBody
+ {
+ public string Description;
+ public bool Required;
+
+ public string LastRequestBody;
+
+ public OARequestBody(OpenApiRequestBody requestBody)
+ {
+ if (requestBody == null) return;
+ Description = requestBody.Description;
+ Required = requestBody.Required;
+ }
+ }
+}

Assets/UnityOpenApi/OA Models/OARequestBody.cs.meta

@@ -58,6 +58,9 @@ internal void ExecutePathOperation(OAOperation operation, Action<HttpRequestResu
  var pathParams = paramsWithValues.Where(p => p.parameter.In == OAParameterLocation.Path)
  .ToDictionary(p => p.parameter.Name, p => p.value);
 
+ var headerParams = paramsWithValues.Where(p => p.parameter.In == OAParameterLocation.Header)
+ .ToDictionary(p => p.parameter.Name, p => p.value);
+
  string operationPath = BuildPathWithParams(operation.pathAsset.Path, pathParams);
 
  StringBuilder urlSb = new StringBuilder(BaseUrl);
@@ -69,7 +72,7 @@ internal void ExecutePathOperation(OAOperation operation, Action<HttpRequestResu
  switch (operation.OperationType)
  {
  case AOOperationType.Get:
- Http.HttpMono.Get(url, null, response);
+ Http.HttpMono.Get(url, headerParams, response);
  break;
  case AOOperationType.Put:
  break;