From 004fd222d725464eb9a6ad4b9f95f4473acbf366 Mon Sep 17 00:00:00 2001 From: Nils Ponsard | Nitrokey Date: Mon, 28 Aug 2023 11:35:17 +0200 Subject: [PATCH] feat: change template to use ureq --- .openapi-generator/FILES | 1 - Cargo.toml | 6 +- .../src/main/resources/crust/Cargo.mustache | 14 +- .../src/main/resources/crust/lib.mustache | 2 +- .../src/main/resources/crust/model.mustache | 2 +- .../main/resources/crust/reqwest/api.mustache | 246 +-- .../resources/crust/reqwest/api_mod.mustache | 55 +- .../crust/reqwest/configuration.mustache | 4 +- src/apis/configuration.rs | 4 +- src/apis/default_api.rs | 1705 +++++++---------- src/apis/mod.rs | 36 +- src/lib.rs | 2 +- src/models/public_key.rs | 6 +- 13 files changed, 854 insertions(+), 1229 deletions(-) diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 81a9606..9e3d96d 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -1,4 +1,3 @@ -Cargo.toml docs/BackupPassphraseConfig.md docs/DecryptData.md docs/DecryptMode.md diff --git a/Cargo.toml b/Cargo.toml index 986ac33..e162bf0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,10 +17,8 @@ exclude = [ [dependencies] serde = "^1.0" serde_derive = "^1.0" +base64 = "0.21" serde_json = "^1.0" url = "^2.2" uuid = { version = "^1.0", features = ["serde"] } - -[dependencies.reqwest] -version = "^0.11" -features = ["json", "multipart"] +ureq = { version = "2", features = ["json"] } \ No newline at end of file diff --git a/generator/src/main/resources/crust/Cargo.mustache b/generator/src/main/resources/crust/Cargo.mustache index e606e06..bdc1ad9 100644 --- a/generator/src/main/resources/crust/Cargo.mustache +++ b/generator/src/main/resources/crust/Cargo.mustache @@ -37,18 +37,8 @@ serde_derive = "^1.0" {{#serdeWith}} serde_with = "^2.0" {{/serdeWith}} +base64 = "0.21" serde_json = "^1.0" url = "^2.2" uuid = { version = "^1.0", features = ["serde"] } - -{{^supportAsync}} -reqwest = {version = "^0.11", features = ["blocking", "json"]} -{{/supportAsync}} -{{#supportAsync}} -{{#supportMiddleware}} -reqwest-middleware = "0.2.0" -{{/supportMiddleware}} -[dependencies.reqwest] -version = "^0.11" -features = ["json", "multipart"] -{{/supportAsync}} +ureq = { version = "2", features = ["json"] } diff --git a/generator/src/main/resources/crust/lib.mustache b/generator/src/main/resources/crust/lib.mustache index c1dd666..c8de984 100644 --- a/generator/src/main/resources/crust/lib.mustache +++ b/generator/src/main/resources/crust/lib.mustache @@ -4,7 +4,7 @@ extern crate serde_derive; extern crate serde; extern crate serde_json; extern crate url; -extern crate reqwest; +extern crate ureq; pub mod apis; pub mod models; diff --git a/generator/src/main/resources/crust/model.mustache b/generator/src/main/resources/crust/model.mustache index ffb29f1..57166ab 100644 --- a/generator/src/main/resources/crust/model.mustache +++ b/generator/src/main/resources/crust/model.mustache @@ -82,7 +82,7 @@ impl {{{classname}}} { pub fn new({{#requiredVars}}{{{name}}}: {{#isNullable}}Option<{{/isNullable}}{{#isEnum}}{{#isArray}}Vec<{{/isArray}}{{{enumName}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}>{{/isNullable}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{{classname}}} { {{{classname}}} { {{#vars}} - {{{name}}}{{^required}}{{#isArray}}: None{{/isArray}}{{#isMap}}: None{{/isMap}}{{^isContainer}}: None{{/isContainer}}{{/required}}{{#required}}{{#isModel}}: {{^isNullable}}Box::new({{{name}}}){{/isNullable}}{{#isNullable}}if let Some(x) = {{{name}}} {Some(Box::new(x))} else {None}{{/isNullable}}{{/isModel}}{{/required}}, + {{{name}}}{{^required}}{{#isArray}}: None{{/isArray}}{{#isMap}}: None{{/isMap}}{{^isContainer}}: None{{/isContainer}}{{/required}}{{#required}}{{#isModel}}: {{^isNullable}}Box::new({{{name}}}){{/isNullable}}{{#isNullable}}{{{name}}}.map(Box::new){{/isNullable}}{{/isModel}}{{/required}}, {{/vars}} } } diff --git a/generator/src/main/resources/crust/reqwest/api.mustache b/generator/src/main/resources/crust/reqwest/api.mustache index db09f6b..e1c4a85 100644 --- a/generator/src/main/resources/crust/reqwest/api.mustache +++ b/generator/src/main/resources/crust/reqwest/api.mustache @@ -1,7 +1,5 @@ {{>partial_header}} -use reqwest; - use crate::apis::ResponseContent; use super::{Error, configuration}; @@ -97,27 +95,6 @@ pub struct {{{operationIdCamelCase}}}Params { {{/operation}} {{/operations}} -{{#supportMultipleResponses}} -{{#operations}} -{{#operation}} -/// struct for typed successes of method [`{{operationId}}`] -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(untagged)] -pub enum {{{operationIdCamelCase}}}Success { - {{#responses}} - {{#is2xx}} - Status{{code}}({{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}), - {{/is2xx}} - {{#is3xx}} - Status{{code}}({{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}), - {{/is3xx}} - {{/responses}} - UnknownValue(serde_json::Value), -} - -{{/operation}} -{{/operations}} -{{/supportMultipleResponses}} {{#operations}} {{#operation}} /// struct for typed errors of method [`{{operationId}}`] @@ -149,75 +126,70 @@ pub enum {{{operationIdCamelCase}}}Error { {{#notes}} /// {{{.}}} {{/notes}} -{{#vendorExtensions.x-group-parameters}} -pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: &configuration::Configuration{{#allParams}}{{#-first}}, params: {{{operationIdCamelCase}}}Params{{/-first}}{{/allParams}}) -> Result<{{#supportMultipleResponses}}ResponseContent<{{{operationIdCamelCase}}}Success>{{/supportMultipleResponses}}{{^supportMultipleResponses}}{{^returnType}}(){{/returnType}}{{{returnType}}}{{/supportMultipleResponses}}, Error<{{{operationIdCamelCase}}}Error>> { - let local_var_configuration = configuration; - // unbox the parameters - {{#allParams}} - let {{paramName}} = params.{{paramName}}; - {{/allParams}} - -{{/vendorExtensions.x-group-parameters}} -{{^vendorExtensions.x-group-parameters}} {{#vendorExtensions.x-consumeMultipleMediaTypes}} -pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: &configuration::Configuration, {{#allParams}} {{#isBodyParam}} body : {{{operationIdCamelCase}}}Body{{/isBodyParam}} +pub fn {{{operationId}}}(configuration: &configuration::Configuration, {{#allParams}} {{#isBodyParam}} body : {{{operationIdCamelCase}}}Body{{/isBodyParam}} {{^isBodyParam}} {{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}{{#isArray}}Vec<{{/isArray}}{{^isUuid}}&str{{/isUuid}}{{#isArray}}>{{/isArray}}{{/isString}}{{#isUuid}}{{#isArray}}Vec<{{/isArray}}&str{{#isArray}}>{{/isArray}}{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}} {{/vendorExtensions.x-consumeMultipleMediaTypes}} {{^vendorExtensions.x-consumeMultipleMediaTypes}} -pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: &configuration::Configuration, {{#allParams}}{{{paramName}}}: +pub fn {{{operationId}}}(configuration: &configuration::Configuration, {{#allParams}}{{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}{{#isArray}}Vec<{{/isArray}}{{^isUuid}}&str{{/isUuid}}{{#isArray}}>{{/isArray}}{{/isString}}{{#isUuid}}{{#isArray}}Vec<{{/isArray}}&str{{#isArray}}>{{/isArray}}{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}{{#isBodyParam}}crate::models::{{/isBodyParam}}{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}} {{^-last}}, {{/-last}}{{/allParams}}{{/vendorExtensions.x-consumeMultipleMediaTypes}}{{#vendorExtensions.x-produceMultipleMediaTypes}}, accept : {{{operationIdCamelCase}}}Accept{{/vendorExtensions.x-produceMultipleMediaTypes}}) -> Result, Error<{{{operationIdCamelCase}}}Error>> { let local_var_configuration = configuration; -{{/vendorExtensions.x-group-parameters}} let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}{{{path}}}", local_var_configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}crate::apis::urlencode({{/isString}}{{{paramName}}}{{^required}}.unwrap(){{/required}}{{#required}}{{#isNullable}}.unwrap(){{/isNullable}}{{/required}}{{#isArray}}.join(",").as_ref(){{/isArray}}{{#isString}}){{/isString}}{{/pathParams}}); - let mut local_var_req_builder = local_var_client.request(reqwest::Method::{{{httpMethod}}}, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("{{{httpMethod}}}", local_var_uri_str.as_str()); {{#queryParams}} {{#required}} {{#isArray}} local_var_req_builder = match "{{collectionFormat}}" { - "multi" => local_var_req_builder.query(&{{{paramName}}}.into_iter().map(|p| ("{{{baseName}}}".to_owned(), p.to_string())).collect::>()), - _ => local_var_req_builder.query(&[("{{{baseName}}}", &{{{paramName}}}.into_iter().map(|p| p.to_string()).collect::>().join(",").to_string())]), + "multi" => local_var_req_builder.query_pairs({{{paramName}}}.into_iter().map(|p| ("{{{baseName}}}", p)).collect::>()), + _ => local_var_req_builder.query_pairs([("{{{baseName}}}", &{{{paramName}}}.into_iter().map(|p| p.to_string()).collect::>().join(","))]), }; {{/isArray}} {{^isArray}} {{^isNullable}} - local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &{{{paramName}}}.to_string())]); + local_var_req_builder = local_var_req_builder.query_pairs([("{{{baseName}}}", {{{paramName}}})]); {{/isNullable}} {{#isNullable}} {{#isDeepObject}} if let Some(ref local_var_str) = {{{paramName}}} { let params = crate::apis::parse_deep_object("{{{baseName}}}", local_var_str); - local_var_req_builder = local_var_req_builder.query(¶ms); + local_var_req_builder = local_var_req_builder.query_pairs(¶ms); }; {{/isDeepObject}} {{^isDeepObject}} - if let Some(ref local_var_str) = {{{paramName}}} { - local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &local_var_str.to_string())]); + if let Some(local_var_str) = {{{paramName}}} { + local_var_req_builder = local_var_req_builder.query_pairs([("{{{baseName}}}", local_var_str.to_string().as_str())]); }; {{/isDeepObject}} {{/isNullable}} {{/isArray}} {{/required}} {{^required}} - if let Some(ref local_var_str) = {{{paramName}}} { + if let Some(local_var_str) = {{{paramName}}} { {{#isArray}} local_var_req_builder = match "{{collectionFormat}}" { - "multi" => local_var_req_builder.query(&local_var_str.iter().map(|p| ("{{{baseName}}}".to_owned(), p.to_string())).collect::>()), - _ => local_var_req_builder.query(&[("{{{baseName}}}", &local_var_str.iter().map(|p| p.to_string()).collect::>().join(",").to_string())]), + "multi" => { + for i in local_var_str.iter() { + local_var_req_builder = + local_var_req_builder.query("{{{baseName}}}", i.to_string().as_str()); + } + local_var_req_builder + } + _ => local_var_req_builder.query_pairs([("{{{baseName}}}", local_var_str.iter().map(|p| p.to_string()).collect::>().join(",").as_str())]), }; {{/isArray}} {{^isArray}} {{#isDeepObject}} let params = crate::apis::parse_deep_object("{{{baseName}}}", local_var_str); - local_var_req_builder = local_var_req_builder.query(¶ms); + local_var_req_builder = local_var_req_builder.query_pairs(¶ms); {{/isDeepObject}} {{^isDeepObject}} - local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &local_var_str.to_string())]); + local_var_req_builder = local_var_req_builder.query_pairs([("{{{baseName}}}", local_var_str.to_string().as_str())]); {{/isDeepObject}} {{/isArray}} } @@ -233,7 +205,7 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), None => local_var_key, }; - local_var_req_builder = local_var_req_builder.query(&[("{{{keyParamName}}}", local_var_value)]); + local_var_req_builder = local_var_req_builder.query_pairs(&[("{{{keyParamName}}}", local_var_value)]); } {{/isKeyInQuery}} {{/isApiKey}} @@ -242,24 +214,24 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{#hasAuthMethods}} {{/hasAuthMethods}} if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } {{#hasHeaderParams}} {{#headerParams}} {{#required}} {{^isNullable}} - local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", {{{paramName}}}{{#isArray}}.join(","){{/isArray}}.to_string()); + local_var_req_builder = local_var_req_builder.set("{{{baseName}}}", {{{paramName}}}{{#isArray}}.join(","){{/isArray}}); {{/isNullable}} {{#isNullable}} match {{{paramName}}} { - Some(local_var_param_value) => { local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, - None => { local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", ""); }, + Some(local_var_param_value) => { local_var_req_builder = local_var_req_builder.set("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}); }, + None => { local_var_req_builder = local_var_req_builder.set("{{{baseName}}}", ""); }, } {{/isNullable}} {{/required}} {{^required}} if let Some(local_var_param_value) = {{{paramName}}} { - local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); + local_var_req_builder = local_var_req_builder.set("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string().as_str()); } {{/required}} {{/headerParams}} @@ -274,142 +246,63 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: Some(ref local_var_prefix) => format!("{} {}", local_var_prefix, local_var_key), None => local_var_key, }; - local_var_req_builder = local_var_req_builder.header("{{{keyParamName}}}", local_var_value); + local_var_req_builder = local_var_req_builder.set("{{{keyParamName}}}", &local_var_value); }; {{/isKeyInHeader}} {{/isApiKey}} {{#isBasic}} {{#isBasicBasic}} if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth(local_var_auth_conf.0.to_owned(), local_var_auth_conf.1.to_owned()); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; {{/isBasicBasic}} {{#isBasicBearer}} if let Some(ref local_var_token) = local_var_configuration.bearer_access_token { - local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); + local_var_req_builder = local_var_req_builder.set("authorization",format!("Bearer {}",local_var_token)); }; {{/isBasicBearer}} {{/isBasic}} {{#isOAuth}} if let Some(ref local_var_token) = local_var_configuration.oauth_access_token { - local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); + local_var_req_builder = local_var_req_builder.set("authorization",format!("Bearer {}",local_var_token)); }; {{/isOAuth}} {{/authMethods}} {{/hasAuthMethods}} - {{#isMultipart}} - {{#hasFormParams}} - let mut local_var_form = reqwest::multipart::Form::new(); - {{#formParams}} - {{#isFile}} - {{^supportAsync}} - {{#required}} - {{^isNullable}} - local_var_form = local_var_form.file("{{{baseName}}}", {{{paramName}}})?; - {{/isNullable}} - {{#isNullable}} - match {{{paramName}}} { - Some(local_var_param_value) => { local_var_form = local_var_form.file("{{{baseName}}}", local_var_param_value)?; }, - None => { unimplemented!("Required nullable form file param not supported"); }, - } - {{/isNullable}} - {{/required}} - {{^required}} - if let Some(local_var_param_value) = {{{paramName}}} { - local_var_form = local_var_form.file("{{{baseName}}}", local_var_param_value)?; - } - {{/required}} - {{/supportAsync}} - {{#supportAsync}} - // TODO: support file upload for '{{{baseName}}}' parameter - {{/supportAsync}} - {{/isFile}} - {{^isFile}} - {{#required}} - {{^isNullable}} - local_var_form = local_var_form.text("{{{baseName}}}", {{{paramName}}}{{#isArray}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isArray}}.to_string()); - {{/isNullable}} - {{#isNullable}} - match {{{paramName}}} { - Some(local_var_param_value) => { local_var_form = local_var_form.text("{{{baseName}}}", local_var_param_value{{#isArray}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isArray}}.to_string()); }, - None => { local_var_form = local_var_form.text("{{{baseName}}}", ""); }, - } - {{/isNullable}} - {{/required}} - {{^required}} - if let Some(local_var_param_value) = {{{paramName}}} { - local_var_form = local_var_form.text("{{{baseName}}}", local_var_param_value{{#isArray}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isArray}}.to_string()); - } - {{/required}} - {{/isFile}} - {{/formParams}} - local_var_req_builder = local_var_req_builder.multipart(local_var_form); - {{/hasFormParams}} - {{/isMultipart}} - {{^isMultipart}} - {{#hasFormParams}} - let mut local_var_form_params = std::collections::HashMap::new(); - {{#formParams}} - {{#isFile}} - {{#required}} - {{^isNullable}} - local_var_form_params.insert("{{{baseName}}}", unimplemented!("File form param not supported with x-www-form-urlencoded content")); - {{/isNullable}} - {{#isNullable}} - match {{{paramName}}} { - Some(local_var_param_value) => { local_var_form_params.insert("{{{baseName}}}", unimplemented!("File form param not supported with x-www-form-urlencoded content")); }, - None => { unimplemented!("Required nullable file form param not supported with x-www-form-urlencoded content"); }, - } - {{/isNullable}} - {{/required}} - {{^required}} - if let Some(local_var_param_value) = {{{paramName}}} { - local_var_form_params.insert("{{{baseName}}}", unimplemented!("File form param not supported with x-www-form-urlencoded content")); - } - {{/required}} - {{/isFile}} - {{^isFile}} - {{#required}} - {{^isNullable}} - local_var_form_params.insert("{{{baseName}}}", {{{paramName}}}{{#isArray}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isArray}}.to_string()); - {{/isNullable}} - {{#isNullable}} - match {{{paramName}}} { - Some(local_var_param_value) => { local_var_form_params.insert("{{{baseName}}}", local_var_param_value{{#isArray}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isArray}}.to_string()); }, - None => { local_var_form_params.insert("{{{baseName}}}", ""); }, - } - {{/isNullable}} - {{/required}} - {{^required}} - if let Some(local_var_param_value) = {{{paramName}}} { - local_var_form_params.insert("{{{baseName}}}", local_var_param_value{{#isArray}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isArray}}.to_string()); - } - {{/required}} - {{/isFile}} - {{/formParams}} - local_var_req_builder = local_var_req_builder.form(&local_var_form_params); - {{/hasFormParams}} - {{/isMultipart}} - + {{#hasProduces}} + {{#vendorExtensions.x-produceMultipleMediaTypes}} + let accept_str = accept.as_str(); + let is_json = accept.is_json(); + {{/vendorExtensions.x-produceMultipleMediaTypes}} + {{^vendorExtensions.x-produceMultipleMediaTypes}} + {{#produces}} + let accept_str = "{{{mediaType}}}"; + {{/produces}} + {{/vendorExtensions.x-produceMultipleMediaTypes}} + local_var_req_builder = local_var_req_builder.set("accept", accept_str); + {{/hasProduces}} + {{#vendorExtensions.x-consumeMultipleMediaTypes}} {{#hasBodyParam}}{{#bodyParams}} let body_json = body.is_json(); - local_var_req_builder = local_var_req_builder.header(reqwest::header::CONTENT_TYPE, body.content_type()); + local_var_req_builder = local_var_req_builder.set("content-type", body.content_type()); {{/bodyParams}}{{/hasBodyParam}} - if body_json { - local_var_req_builder = local_var_req_builder.json(&body); + let local_var_resp = if body_json { + local_var_req_builder.send_json(body)? } else { - local_var_req_builder = local_var_req_builder.body(body.get_string()); - } + local_var_req_builder.send_string(body.get_string().as_str())? + }; {{/vendorExtensions.x-consumeMultipleMediaTypes}} {{^vendorExtensions.x-consumeMultipleMediaTypes}} {{#consumes}} - local_var_req_builder = local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "{{{mediaType}}}"); + local_var_req_builder = local_var_req_builder.set("content-type", "{{{mediaType}}}"); {{#mediaIsJson}} - local_var_req_builder = local_var_req_builder.json(& + let local_var_resp = local_var_req_builder.send_json( {{/mediaIsJson}} {{^mediaIsJson}} - local_var_req_builder = local_var_req_builder.body( + let local_var_resp = local_var_req_builder.send_string( {{/mediaIsJson}} {{/consumes}} {{#hasBodyParam}} @@ -418,37 +311,22 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{/bodyParams}} {{/hasBodyParam}} {{#consumes}} - {{^mediaIsJson}} - .to_string() - {{/mediaIsJson}} {{/consumes}} - {{#hasBodyParam}});{{/hasBodyParam}} + {{#hasBodyParam}})?;{{/hasBodyParam}} {{/vendorExtensions.x-consumeMultipleMediaTypes}} - {{#hasProduces}} - {{#vendorExtensions.x-produceMultipleMediaTypes}} - let accept_str = accept.as_str(); - let is_json = accept.is_json(); - {{/vendorExtensions.x-produceMultipleMediaTypes}} - {{^vendorExtensions.x-produceMultipleMediaTypes}} - {{#produces}} - let accept_str = "{{{mediaType}}}"; - {{/produces}} - {{/vendorExtensions.x-produceMultipleMediaTypes}} - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); - {{/hasProduces}} + {{^hasBodyParam}} + let local_var_resp = local_var_req_builder.call()?; + {{/hasBodyParam}} - let local_var_req = local_var_req_builder.build()?; - let {{^supportAsync}}mut {{/supportAsync}}local_var_resp = local_var_client.execute(local_var_req){{#supportAsync}}.await{{/supportAsync}}?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text(){{#supportAsync}}.await{{/supportAsync}}?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { - {{^supportMultipleResponses}} + if !local_var_status >= 400 { {{#vendorExtensions.x-produceMultipleMediaTypes}} {{#returnType}} let local_var_entity : {{{returnType}}} = if is_json { serde_json::from_str(&local_var_content).map_err(Error::from)? } else { local_var_content }; @@ -466,10 +344,6 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{/mediaIsJson}} {{/produces}} {{/vendorExtensions.x-produceMultipleMediaTypes}} - {{/supportMultipleResponses}} - {{#supportMultipleResponses}} - let local_var_entity: {{{operationIdCamelCase}}}Success = serde_json::from_str(&local_var_content)?; - {{/supportMultipleResponses}} let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, entity: {{#returnType}}local_var_entity{{/returnType}}{{^returnType}}(){{/returnType}}, headers: local_var_headers }; Ok(local_var_result) } else { diff --git a/generator/src/main/resources/crust/reqwest/api_mod.mustache b/generator/src/main/resources/crust/reqwest/api_mod.mustache index 1004976..4e3b562 100644 --- a/generator/src/main/resources/crust/reqwest/api_mod.mustache +++ b/generator/src/main/resources/crust/reqwest/api_mod.mustache @@ -1,20 +1,34 @@ use std::error; use std::fmt; +use std::collections::HashMap; +use base64::{engine::general_purpose, Engine}; + +pub (crate) fn get_header_map(response : &ureq::Response) -> HashMap { + + let mut headers = HashMap::new(); + + let names = response.headers_names(); + for name in names { + if let Some(value) = response.header(&name){ + headers.insert(name, value.to_string()); + } + } + + headers +} + #[derive(Debug, Clone)] pub struct ResponseContent { - pub status: reqwest::StatusCode, + pub status: u16, pub content: String, pub entity: T, - pub headers: reqwest::header::HeaderMap + pub headers: HashMap, } #[derive(Debug)] pub enum Error { - Reqwest(reqwest::Error), - {{#supportMiddleware}} - ReqwestMiddleware(reqwest_middleware::Error), - {{/supportMiddleware}} + Ureq(ureq::Error), Serde(serde_json::Error), Io(std::io::Error), ResponseError(ResponseContent), @@ -23,10 +37,7 @@ pub enum Error { impl fmt::Display for Error { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let (module, e) = match self { - Error::Reqwest(e) => ("reqwest", e.to_string()), - {{#supportMiddleware}} - Error::ReqwestMiddleware(e) => ("reqwest-middleware", e.to_string()), - {{/supportMiddleware}} + Error::Ureq(e) => ("ureq", e.to_string()), Error::Serde(e) => ("serde", e.to_string()), Error::Io(e) => ("IO", e.to_string()), Error::ResponseError(e) => ("response", format!("status code {}", e.status)), @@ -38,10 +49,7 @@ impl fmt::Display for Error { impl error::Error for Error { fn source(&self) -> Option<&(dyn error::Error + 'static)> { Some(match self { - Error::Reqwest(e) => e, - {{#supportMiddleware}} - Error::ReqwestMiddleware(e) => e, - {{/supportMiddleware}} + Error::Ureq(e) => e, Error::Serde(e) => e, Error::Io(e) => e, Error::ResponseError(_) => return None, @@ -49,20 +57,12 @@ impl error::Error for Error { } } -impl From for Error { - fn from(e: reqwest::Error) -> Self { - Error::Reqwest(e) - } -} - -{{#supportMiddleware}} -impl From for Error { - fn from(e: reqwest_middleware::Error) -> Self { - Error::ReqwestMiddleware(e) +impl From for Error { + fn from(e: ureq::Error) -> Self { + Error::Ureq(e) } } -{{/supportMiddleware}} impl From for Error { fn from(e: serde_json::Error) -> Self { Error::Serde(e) @@ -108,6 +108,11 @@ pub fn parse_deep_object(prefix: &str, value: &serde_json::Value) -> Vec<(String unimplemented!("Only objects are supported with style=deepObject") } +pub(crate) fn basic_auth(auth: &configuration::BasicAuth) -> String { + let string = format!("{}:{}", auth.0, auth.1.as_ref().unwrap_or(&"".to_string())); + format!("Basic {}", general_purpose::STANDARD.encode(string)).to_string() +} + {{#apiInfo}} {{#apis}} pub mod {{{classFilename}}}; diff --git a/generator/src/main/resources/crust/reqwest/configuration.mustache b/generator/src/main/resources/crust/reqwest/configuration.mustache index afc3ac0..9a77307 100644 --- a/generator/src/main/resources/crust/reqwest/configuration.mustache +++ b/generator/src/main/resources/crust/reqwest/configuration.mustache @@ -4,7 +4,7 @@ pub struct Configuration { pub base_path: String, pub user_agent: Option, - pub client: {{#supportMiddleware}}reqwest_middleware::ClientWithMiddleware{{/supportMiddleware}}{{^supportMiddleware}}reqwest{{^supportAsync}}::blocking{{/supportAsync}}::Client{{/supportMiddleware}}, + pub client: ureq::Agent, pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, @@ -30,7 +30,7 @@ impl Default for Configuration { Configuration { base_path: "{{{basePath}}}".to_owned(), user_agent: {{#httpUserAgent}}Some("{{{.}}}".to_owned()){{/httpUserAgent}}{{^httpUserAgent}}Some("OpenAPI-Generator/{{{version}}}/rust".to_owned()){{/httpUserAgent}}, - client: {{#supportMiddleware}}reqwest_middleware::ClientBuilder::new(reqwest::Client::new()).build(){{/supportMiddleware}}{{^supportMiddleware}}reqwest{{^supportAsync}}::blocking{{/supportAsync}}::Client::new(){{/supportMiddleware}}, + client: ureq::agent(), basic_auth: None, oauth_access_token: None, bearer_access_token: None, diff --git a/src/apis/configuration.rs b/src/apis/configuration.rs index 781e7a2..73e27b0 100644 --- a/src/apis/configuration.rs +++ b/src/apis/configuration.rs @@ -12,7 +12,7 @@ pub struct Configuration { pub base_path: String, pub user_agent: Option, - pub client: reqwest::Client, + pub client: ureq::Agent, pub basic_auth: Option, pub oauth_access_token: Option, pub bearer_access_token: Option, @@ -38,7 +38,7 @@ impl Default for Configuration { Configuration { base_path: "https://nethsmdemo.nitrokey.com/api/v1".to_owned(), user_agent: Some("OpenAPI-Generator/v1/rust".to_owned()), - client: reqwest::Client::new(), + client: ureq::agent(), basic_auth: None, oauth_access_token: None, bearer_access_token: None, diff --git a/src/apis/default_api.rs b/src/apis/default_api.rs index 2495c23..5cb13b2 100644 --- a/src/apis/default_api.rs +++ b/src/apis/default_api.rs @@ -8,8 +8,6 @@ * Generated by: https://openapi-generator.tech */ -use reqwest; - use super::{configuration, Error}; use crate::apis::ResponseContent; @@ -733,7 +731,8 @@ pub enum UsersUserIdTagsTagPutError { } /// Update the backup passphrase. -pub async fn config_backup_passphrase_put( + +pub fn config_backup_passphrase_put( configuration: &configuration::Configuration, backup_passphrase_config: crate::models::BackupPassphraseConfig, ) -> Result, Error> { @@ -745,35 +744,28 @@ pub async fn config_backup_passphrase_put( "{}/config/backup-passphrase", local_var_configuration.base_path ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&backup_passphrase_config); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(backup_passphrase_config)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -795,7 +787,8 @@ pub async fn config_backup_passphrase_put( } /// Get logging configuration. Protocol is always syslog over UDP. Configurable are IP adress and port, log level. -pub async fn config_logging_get( + +pub fn config_logging_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -803,34 +796,29 @@ pub async fn config_logging_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/logging", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::LoggingConfig = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -853,7 +841,8 @@ pub async fn config_logging_get( } /// Configure log level and destination. -pub async fn config_logging_put( + +pub fn config_logging_put( configuration: &configuration::Configuration, logging_config: crate::models::LoggingConfig, ) -> Result, Error> { @@ -862,35 +851,28 @@ pub async fn config_logging_put( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/logging", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&logging_config); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(logging_config)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -911,7 +893,8 @@ pub async fn config_logging_put( } /// Get network configuration. IP address, netmask, router. -pub async fn config_network_get( + +pub fn config_network_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -919,34 +902,29 @@ pub async fn config_network_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/network", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::NetworkConfig = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -969,7 +947,8 @@ pub async fn config_network_get( } /// Configure network. -pub async fn config_network_put( + +pub fn config_network_put( configuration: &configuration::Configuration, network_config: crate::models::NetworkConfig, ) -> Result, Error> { @@ -978,35 +957,28 @@ pub async fn config_network_put( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/network", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&network_config); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(network_config)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -1027,7 +999,8 @@ pub async fn config_network_put( } /// Get system time. -pub async fn config_time_get( + +pub fn config_time_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -1035,34 +1008,29 @@ pub async fn config_time_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/time", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::TimeConfig = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -1085,7 +1053,8 @@ pub async fn config_time_get( } /// Configure system time. -pub async fn config_time_put( + +pub fn config_time_put( configuration: &configuration::Configuration, time_config: crate::models::TimeConfig, ) -> Result, Error> { @@ -1094,35 +1063,28 @@ pub async fn config_time_put( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/time", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&time_config); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(time_config)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -1143,7 +1105,8 @@ pub async fn config_time_put( } /// Get certificate for NetHSMs https API. -pub async fn config_tls_cert_pem_get( + +pub fn config_tls_cert_pem_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -1151,34 +1114,29 @@ pub async fn config_tls_cert_pem_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/tls/cert.pem", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/x-pem-file"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity = local_var_content.clone(); let local_var_result = ResponseContent { status: local_var_status, @@ -1200,7 +1158,8 @@ pub async fn config_tls_cert_pem_get( } /// Set certificate for NetHSMs https API e.g. to replace self-signed intital certificate. -pub async fn config_tls_cert_pem_put( + +pub fn config_tls_cert_pem_put( configuration: &configuration::Configuration, body: &str, ) -> Result, Error> { @@ -1209,35 +1168,28 @@ pub async fn config_tls_cert_pem_put( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/tls/cert.pem", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/x-pem-file"); - local_var_req_builder = local_var_req_builder.body(body.to_string()); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/x-pem-file"); + let local_var_resp = local_var_req_builder.send_string(body)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -1258,7 +1210,8 @@ pub async fn config_tls_cert_pem_put( } /// Get NetHSM certificate signing request e.g. to replace self-signed intital certificate. -pub async fn config_tls_csr_pem_post( + +pub fn config_tls_csr_pem_post( configuration: &configuration::Configuration, distinguished_name: crate::models::DistinguishedName, ) -> Result, Error> { @@ -1267,37 +1220,30 @@ pub async fn config_tls_csr_pem_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/tls/csr.pem", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&distinguished_name); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/x-pem-file"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(distinguished_name)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity = local_var_content.clone(); let local_var_result = ResponseContent { status: local_var_status, @@ -1319,7 +1265,8 @@ pub async fn config_tls_csr_pem_post( } /// Generate a new pair of public and private key for NetHSM's https API. -pub async fn config_tls_generate_post( + +pub fn config_tls_generate_post( configuration: &configuration::Configuration, tls_key_generate_request_data: crate::models::TlsKeyGenerateRequestData, ) -> Result, Error> { @@ -1328,35 +1275,28 @@ pub async fn config_tls_generate_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/config/tls/generate", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&tls_key_generate_request_data); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(tls_key_generate_request_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -1378,7 +1318,8 @@ pub async fn config_tls_generate_post( } /// Get public key for NetHSMs https API. -pub async fn config_tls_public_pem_get( + +pub fn config_tls_public_pem_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -1389,34 +1330,29 @@ pub async fn config_tls_public_pem_get( "{}/config/tls/public.pem", local_var_configuration.base_path ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/x-pem-file"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity = local_var_content.clone(); let local_var_result = ResponseContent { status: local_var_status, @@ -1439,7 +1375,8 @@ pub async fn config_tls_public_pem_get( } /// Read unattended boot configuration: is it on or off? -pub async fn config_unattended_boot_get( + +pub fn config_unattended_boot_get( configuration: &configuration::Configuration, ) -> Result, Error> { @@ -1451,34 +1388,29 @@ pub async fn config_unattended_boot_get( "{}/config/unattended-boot", local_var_configuration.base_path ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::UnattendedBootConfig = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -1502,7 +1434,8 @@ pub async fn config_unattended_boot_get( } /// Configure unattended boot: switch it on or off (flip the switch). -pub async fn config_unattended_boot_put( + +pub fn config_unattended_boot_put( configuration: &configuration::Configuration, unattended_boot_config: crate::models::UnattendedBootConfig, ) -> Result, Error> { @@ -1514,35 +1447,28 @@ pub async fn config_unattended_boot_put( "{}/config/unattended-boot", local_var_configuration.base_path ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&unattended_boot_config); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(unattended_boot_config)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -1564,7 +1490,8 @@ pub async fn config_unattended_boot_put( } /// Update the unlock passphrase. -pub async fn config_unlock_passphrase_put( + +pub fn config_unlock_passphrase_put( configuration: &configuration::Configuration, unlock_passphrase_config: crate::models::UnlockPassphraseConfig, ) -> Result, Error> { @@ -1576,35 +1503,28 @@ pub async fn config_unlock_passphrase_put( "{}/config/unlock-passphrase", local_var_configuration.base_path ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&unlock_passphrase_config); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(unlock_passphrase_config)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -1626,7 +1546,8 @@ pub async fn config_unlock_passphrase_put( } /// Retrieve wether NetHSM is alive (powered up). This corresponds to the state *Locked* or *Unprovisioned*. -pub async fn health_alive_get( + +pub fn health_alive_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -1634,25 +1555,22 @@ pub async fn health_alive_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/health/alive", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -1673,7 +1591,8 @@ pub async fn health_alive_get( } /// Retrieve wether NetHSM is alive and ready to take traffic. This corresponds to the state *Operational*. -pub async fn health_ready_get( + +pub fn health_ready_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -1681,25 +1600,22 @@ pub async fn health_ready_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/health/ready", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -1720,7 +1636,8 @@ pub async fn health_ready_get( } /// Retrieve the state of NetHSM. -pub async fn health_state_get( + +pub fn health_state_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -1728,28 +1645,24 @@ pub async fn health_state_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/health/state", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } - let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::HealthStateData = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -1772,7 +1685,8 @@ pub async fn health_state_get( } /// Information about the vendor and product. -pub async fn info_get( + +pub fn info_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -1780,28 +1694,24 @@ pub async fn info_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/info", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } - let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::InfoData = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -1824,7 +1734,8 @@ pub async fn info_get( } /// Generate a pair of public and private key and store it in NetHSM. KeyID is optional as a parameter and will be generated by NetHSM if not present. -pub async fn keys_generate_post( + +pub fn keys_generate_post( configuration: &configuration::Configuration, key_generate_request_data: crate::models::KeyGenerateRequestData, ) -> Result, Error> { @@ -1833,35 +1744,28 @@ pub async fn keys_generate_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/keys/generate", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&key_generate_request_data); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(key_generate_request_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -1882,7 +1786,8 @@ pub async fn keys_generate_post( } /// Get a list of the identifiers of all keys that are currently stored in NetHSM. Separate requests need to be made to request the individual key data. -pub async fn keys_get( + +pub fn keys_get( configuration: &configuration::Configuration, filter: Option<&str>, ) -> Result>, Error> { @@ -1891,38 +1796,33 @@ pub async fn keys_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/keys", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); - if let Some(ref local_var_str) = filter { + if let Some(local_var_str) = filter { local_var_req_builder = - local_var_req_builder.query(&[("filter", &local_var_str.to_string())]); + local_var_req_builder.query_pairs([("filter", local_var_str.to_string().as_str())]); } if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: Vec = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -1945,7 +1845,8 @@ pub async fn keys_get( } /// Delete the certificate. -pub async fn keys_key_id_cert_delete( + +pub fn keys_key_id_cert_delete( configuration: &configuration::Configuration, key_id: &str, ) -> Result, Error> { @@ -1958,31 +1859,27 @@ pub async fn keys_key_id_cert_delete( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("DELETE", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -2003,7 +1900,8 @@ pub async fn keys_key_id_cert_delete( } /// Retrieve stored certificate. The content-type header will display the media type of the stored data. -pub async fn keys_key_id_cert_get( + +pub fn keys_key_id_cert_get( configuration: &configuration::Configuration, key_id: &str, accept: KeysKeyIdCertGetAccept, @@ -2017,35 +1915,30 @@ pub async fn keys_key_id_cert_get( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = accept.as_str(); let is_json = accept.is_json(); - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: String = if is_json { serde_json::from_str(&local_var_content).map_err(Error::from)? } else { @@ -2071,7 +1964,8 @@ pub async fn keys_key_id_cert_get( } /// Store a certificate. Maximum size 1MB. The content-type header provides the media type. Only application/json, application/x-pem-file, application/x-x509-ca-cert, application/octet-stream, text/plain and application/pgp-keys is allowed. -pub async fn keys_key_id_cert_put( + +pub fn keys_key_id_cert_put( configuration: &configuration::Configuration, key_id: &str, body: KeysKeyIdCertPutBody, @@ -2085,41 +1979,34 @@ pub async fn keys_key_id_cert_put( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; let body_json = body.is_json(); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, body.content_type()); + local_var_req_builder = local_var_req_builder.set("content-type", body.content_type()); - if body_json { - local_var_req_builder = local_var_req_builder.json(&body); + let local_var_resp = if body_json { + local_var_req_builder.send_json(body)? } else { - local_var_req_builder = local_var_req_builder.body(body.get_string()); - } - - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder.send_string(body.get_string().as_str())? + }; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -2140,7 +2027,8 @@ pub async fn keys_key_id_cert_put( } /// Retrieve a certificate signing request in PEM format. -pub async fn keys_key_id_csr_pem_post( + +pub fn keys_key_id_csr_pem_post( configuration: &configuration::Configuration, key_id: &str, distinguished_name: crate::models::DistinguishedName, @@ -2154,37 +2042,30 @@ pub async fn keys_key_id_csr_pem_post( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&distinguished_name); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/x-pem-file"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(distinguished_name)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity = local_var_content.clone(); let local_var_result = ResponseContent { status: local_var_status, @@ -2206,7 +2087,8 @@ pub async fn keys_key_id_csr_pem_post( } /// Decrypt an encrypted message with the secret key. -pub async fn keys_key_id_decrypt_post( + +pub fn keys_key_id_decrypt_post( configuration: &configuration::Configuration, key_id: &str, decrypt_request_data: crate::models::DecryptRequestData, @@ -2220,37 +2102,30 @@ pub async fn keys_key_id_decrypt_post( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&decrypt_request_data); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(decrypt_request_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::DecryptData = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -2273,7 +2148,8 @@ pub async fn keys_key_id_decrypt_post( } /// Delete a pair of public and private key. -pub async fn keys_key_id_delete( + +pub fn keys_key_id_delete( configuration: &configuration::Configuration, key_id: &str, ) -> Result, Error> { @@ -2286,31 +2162,27 @@ pub async fn keys_key_id_delete( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("DELETE", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -2331,7 +2203,8 @@ pub async fn keys_key_id_delete( } /// Encrypt a message with the secret key. -pub async fn keys_key_id_encrypt_post( + +pub fn keys_key_id_encrypt_post( configuration: &configuration::Configuration, key_id: &str, encrypt_request_data: crate::models::EncryptRequestData, @@ -2345,37 +2218,30 @@ pub async fn keys_key_id_encrypt_post( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&encrypt_request_data); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(encrypt_request_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::EncryptData = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -2398,7 +2264,8 @@ pub async fn keys_key_id_encrypt_post( } /// Retrieve the public key. -pub async fn keys_key_id_get( + +pub fn keys_key_id_get( configuration: &configuration::Configuration, key_id: &str, ) -> Result, Error> { @@ -2411,34 +2278,29 @@ pub async fn keys_key_id_get( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::PublicKey = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -2461,7 +2323,8 @@ pub async fn keys_key_id_get( } /// Retrieve public key in PEM format. -pub async fn keys_key_id_public_pem_get( + +pub fn keys_key_id_public_pem_get( configuration: &configuration::Configuration, key_id: &str, ) -> Result, Error> { @@ -2474,34 +2337,29 @@ pub async fn keys_key_id_public_pem_get( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/x-pem-file"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity = local_var_content.clone(); let local_var_result = ResponseContent { status: local_var_status, @@ -2524,7 +2382,8 @@ pub async fn keys_key_id_public_pem_get( } /// Import a private key into NetHSM and store it under the *KeyID* path. The public key will be automatically derived. The parameters of the key can be passed as a PEM file or a JSON object. -pub async fn keys_key_id_put( + +pub fn keys_key_id_put( configuration: &configuration::Configuration, key_id: &str, body: KeysKeyIdPutBody, @@ -2540,79 +2399,74 @@ pub async fn keys_key_id_put( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); - if let Some(ref local_var_str) = mechanisms { + if let Some(local_var_str) = mechanisms { local_var_req_builder = match "multi" { - "multi" => local_var_req_builder.query( - &local_var_str - .iter() - .map(|p| ("mechanisms".to_owned(), p.to_string())) - .collect::>(), - ), - _ => local_var_req_builder.query(&[( + "multi" => { + for i in local_var_str.iter() { + local_var_req_builder = + local_var_req_builder.query("mechanisms", i.to_string().as_str()); + } + local_var_req_builder + } + _ => local_var_req_builder.query_pairs([( "mechanisms", - &local_var_str + local_var_str .iter() .map(|p| p.to_string()) .collect::>() .join(",") - .to_string(), + .as_str(), )]), }; } - if let Some(ref local_var_str) = tags { + if let Some(local_var_str) = tags { local_var_req_builder = match "multi" { - "multi" => local_var_req_builder.query( - &local_var_str - .iter() - .map(|p| ("tags".to_owned(), p.to_string())) - .collect::>(), - ), - _ => local_var_req_builder.query(&[( + "multi" => { + for i in local_var_str.iter() { + local_var_req_builder = + local_var_req_builder.query("tags", i.to_string().as_str()); + } + local_var_req_builder + } + _ => local_var_req_builder.query_pairs([( "tags", - &local_var_str + local_var_str .iter() .map(|p| p.to_string()) .collect::>() .join(",") - .to_string(), + .as_str(), )]), }; } if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; let body_json = body.is_json(); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, body.content_type()); + local_var_req_builder = local_var_req_builder.set("content-type", body.content_type()); - if body_json { - local_var_req_builder = local_var_req_builder.json(&body); + let local_var_resp = if body_json { + local_var_req_builder.send_json(body)? } else { - local_var_req_builder = local_var_req_builder.body(body.get_string()); - } - - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder.send_string(body.get_string().as_str())? + }; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -2633,7 +2487,8 @@ pub async fn keys_key_id_put( } /// Delete a tag from the authorized set -pub async fn keys_key_id_restrictions_tags_tag_delete( + +pub fn keys_key_id_restrictions_tags_tag_delete( configuration: &configuration::Configuration, tag: &str, key_id: &str, @@ -2648,31 +2503,27 @@ pub async fn keys_key_id_restrictions_tags_tag_delete( Tag = crate::apis::urlencode(tag), KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("DELETE", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -2694,7 +2545,8 @@ pub async fn keys_key_id_restrictions_tags_tag_delete( } /// Add a tag to the authorized set -pub async fn keys_key_id_restrictions_tags_tag_put( + +pub fn keys_key_id_restrictions_tags_tag_put( configuration: &configuration::Configuration, tag: &str, key_id: &str, @@ -2709,31 +2561,27 @@ pub async fn keys_key_id_restrictions_tags_tag_put( Tag = crate::apis::urlencode(tag), KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -2755,7 +2603,8 @@ pub async fn keys_key_id_restrictions_tags_tag_put( } /// Sign a message with the secret key. -pub async fn keys_key_id_sign_post( + +pub fn keys_key_id_sign_post( configuration: &configuration::Configuration, key_id: &str, sign_request_data: crate::models::SignRequestData, @@ -2769,37 +2618,30 @@ pub async fn keys_key_id_sign_post( local_var_configuration.base_path, KeyID = crate::apis::urlencode(key_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&sign_request_data); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(sign_request_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::SignData = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -2822,7 +2664,8 @@ pub async fn keys_key_id_sign_post( } /// Import a private key into NetHSM and let NetHSM generate a KeyID. The public key will be automatically derived. The parameters of the key can be passed as a PEM file or a JSON object. -pub async fn keys_post( + +pub fn keys_post( configuration: &configuration::Configuration, body: KeysPostBody, mechanisms: Option>, @@ -2833,79 +2676,74 @@ pub async fn keys_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/keys", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); - if let Some(ref local_var_str) = mechanisms { + if let Some(local_var_str) = mechanisms { local_var_req_builder = match "multi" { - "multi" => local_var_req_builder.query( - &local_var_str - .iter() - .map(|p| ("mechanisms".to_owned(), p.to_string())) - .collect::>(), - ), - _ => local_var_req_builder.query(&[( + "multi" => { + for i in local_var_str.iter() { + local_var_req_builder = + local_var_req_builder.query("mechanisms", i.to_string().as_str()); + } + local_var_req_builder + } + _ => local_var_req_builder.query_pairs([( "mechanisms", - &local_var_str + local_var_str .iter() .map(|p| p.to_string()) .collect::>() .join(",") - .to_string(), + .as_str(), )]), }; } - if let Some(ref local_var_str) = tags { + if let Some(local_var_str) = tags { local_var_req_builder = match "multi" { - "multi" => local_var_req_builder.query( - &local_var_str - .iter() - .map(|p| ("tags".to_owned(), p.to_string())) - .collect::>(), - ), - _ => local_var_req_builder.query(&[( + "multi" => { + for i in local_var_str.iter() { + local_var_req_builder = + local_var_req_builder.query("tags", i.to_string().as_str()); + } + local_var_req_builder + } + _ => local_var_req_builder.query_pairs([( "tags", - &local_var_str + local_var_str .iter() .map(|p| p.to_string()) .collect::>() .join(",") - .to_string(), + .as_str(), )]), }; } if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; let body_json = body.is_json(); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, body.content_type()); + local_var_req_builder = local_var_req_builder.set("content-type", body.content_type()); - if body_json { - local_var_req_builder = local_var_req_builder.json(&body); + let local_var_resp = if body_json { + local_var_req_builder.send_json(body)? } else { - local_var_req_builder = local_var_req_builder.body(body.get_string()); - } - - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder.send_string(body.get_string().as_str())? + }; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -2926,7 +2764,8 @@ pub async fn keys_post( } /// Brings an *Operational* NetHSM into *Locked* state. -pub async fn lock_post( + +pub fn lock_post( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -2934,31 +2773,27 @@ pub async fn lock_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/lock", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -2979,7 +2814,8 @@ pub async fn lock_post( } /// Get metrics. Precondition: NetHSM is *Operational* and a **R-Metrics** can be authenticated. -pub async fn metrics_get( + +pub fn metrics_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -2987,34 +2823,29 @@ pub async fn metrics_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/metrics", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: serde_json::Value = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -3037,7 +2868,8 @@ pub async fn metrics_get( } /// Initial provisioning, only available in *Unprovisioned* state. -pub async fn provision_post( + +pub fn provision_post( configuration: &configuration::Configuration, provision_request_data: crate::models::ProvisionRequestData, ) -> Result, Error> { @@ -3046,29 +2878,23 @@ pub async fn provision_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/provision", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&provision_request_data); - - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(provision_request_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3089,7 +2915,8 @@ pub async fn provision_post( } /// Retrieve cryptographically strong random bytes from NetHSM. Precondition: NetHSM is *Operational* and a **R-Operator** can be authenticated. -pub async fn random_post( + +pub fn random_post( configuration: &configuration::Configuration, random_request_data: crate::models::RandomRequestData, ) -> Result, Error> { @@ -3098,37 +2925,30 @@ pub async fn random_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/random", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&random_request_data); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(random_request_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::RandomData = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -3151,7 +2971,8 @@ pub async fn random_post( } /// Back up the key store to a backup file. -pub async fn system_backup_post( + +pub fn system_backup_post( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -3159,31 +2980,27 @@ pub async fn system_backup_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/system/backup", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3204,7 +3021,8 @@ pub async fn system_backup_post( } /// Cancel update of NetHSM software. -pub async fn system_cancel_update_post( + +pub fn system_cancel_update_post( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -3212,31 +3030,27 @@ pub async fn system_cancel_update_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/system/cancel-update", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3258,7 +3072,8 @@ pub async fn system_cancel_update_post( } /// Commit update of NetHSM software. -pub async fn system_commit_update_post( + +pub fn system_commit_update_post( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -3266,31 +3081,27 @@ pub async fn system_commit_update_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/system/commit-update", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3312,7 +3123,8 @@ pub async fn system_commit_update_post( } /// Reset NetHSM to factory settings. -pub async fn system_factory_reset_post( + +pub fn system_factory_reset_post( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -3320,31 +3132,27 @@ pub async fn system_factory_reset_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/system/factory-reset", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3366,7 +3174,8 @@ pub async fn system_factory_reset_post( } /// Get detailed system information, including firmware, system, and hardware version. -pub async fn system_info_get( + +pub fn system_info_get( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -3374,34 +3183,29 @@ pub async fn system_info_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/system/info", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::SystemInfo = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -3424,7 +3228,8 @@ pub async fn system_info_get( } /// Reboot NetHSM. -pub async fn system_reboot_post( + +pub fn system_reboot_post( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -3432,31 +3237,27 @@ pub async fn system_reboot_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/system/reboot", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3477,7 +3278,8 @@ pub async fn system_reboot_post( } /// Restore the key store and user store from a backup file. If NetHSM is *Unprovisioned*, then the configuration is restored. -pub async fn system_restore_post( + +pub fn system_restore_post( configuration: &configuration::Configuration, backup_passphrase: &str, body: &str, @@ -3488,35 +3290,29 @@ pub async fn system_restore_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/system/restore", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); local_var_req_builder = - local_var_req_builder.query(&[("backupPassphrase", &backup_passphrase.to_string())]); - if let Some(ref local_var_str) = system_time { + local_var_req_builder.query_pairs([("backupPassphrase", backup_passphrase)]); + if let Some(local_var_str) = system_time { local_var_req_builder = - local_var_req_builder.query(&[("systemTime", &local_var_str.to_string())]); + local_var_req_builder.query_pairs([("systemTime", local_var_str.to_string().as_str())]); } if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/octet-stream"); - local_var_req_builder = local_var_req_builder.body(body.to_string()); - - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/octet-stream"); + let local_var_resp = local_var_req_builder.send_string(body)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3537,7 +3333,8 @@ pub async fn system_restore_post( } /// Shut down NetHSM. -pub async fn system_shutdown_post( + +pub fn system_shutdown_post( configuration: &configuration::Configuration, ) -> Result, Error> { let local_var_configuration = configuration; @@ -3545,31 +3342,27 @@ pub async fn system_shutdown_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/system/shutdown", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3590,7 +3383,8 @@ pub async fn system_shutdown_post( } /// Update NetHSM software. -pub async fn system_update_post( + +pub fn system_update_post( configuration: &configuration::Configuration, body: &str, ) -> Result, Error> { @@ -3599,37 +3393,30 @@ pub async fn system_update_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/system/update", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/octet-stream"); - local_var_req_builder = local_var_req_builder.body(body.to_string()); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/octet-stream"); + let local_var_resp = local_var_req_builder.send_string(body)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::SystemUpdateData = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -3652,7 +3439,8 @@ pub async fn system_update_post( } /// Brings a *Locked* NetHSM into *Operational* state. -pub async fn unlock_post( + +pub fn unlock_post( configuration: &configuration::Configuration, unlock_request_data: crate::models::UnlockRequestData, ) -> Result, Error> { @@ -3661,29 +3449,23 @@ pub async fn unlock_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/unlock", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&unlock_request_data); + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(unlock_request_data)?; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; - - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3704,7 +3486,8 @@ pub async fn unlock_post( } /// Get a list of all user ids that have accounts on NetHSM. -pub async fn users_get( + +pub fn users_get( configuration: &configuration::Configuration, ) -> Result>, Error> { let local_var_configuration = configuration; @@ -3712,34 +3495,29 @@ pub async fn users_get( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/users", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: Vec = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -3762,7 +3540,8 @@ pub async fn users_get( } /// Create a new user on NetHSM. The user-ID is generated by NetHSM. -pub async fn users_post( + +pub fn users_post( configuration: &configuration::Configuration, user_post_data: crate::models::UserPostData, ) -> Result, Error> { @@ -3771,35 +3550,28 @@ pub async fn users_post( let local_var_client = &local_var_configuration.client; let local_var_uri_str = format!("{}/users", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&user_post_data); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(user_post_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3820,7 +3592,8 @@ pub async fn users_post( } /// Delete a user from keyfender. -pub async fn users_user_id_delete( + +pub fn users_user_id_delete( configuration: &configuration::Configuration, user_id: &str, ) -> Result, Error> { @@ -3833,31 +3606,27 @@ pub async fn users_user_id_delete( local_var_configuration.base_path, UserID = crate::apis::urlencode(user_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("DELETE", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -3878,7 +3647,8 @@ pub async fn users_user_id_delete( } /// Get user info: name and role. -pub async fn users_user_id_get( + +pub fn users_user_id_get( configuration: &configuration::Configuration, user_id: &str, ) -> Result, Error> { @@ -3891,34 +3661,29 @@ pub async fn users_user_id_get( local_var_configuration.base_path, UserID = crate::apis::urlencode(user_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: crate::models::UserData = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -3941,7 +3706,8 @@ pub async fn users_user_id_get( } /// Update the passphrase. -pub async fn users_user_id_passphrase_post( + +pub fn users_user_id_passphrase_post( configuration: &configuration::Configuration, user_id: &str, user_passphrase_post_data: crate::models::UserPassphrasePostData, @@ -3955,35 +3721,28 @@ pub async fn users_user_id_passphrase_post( local_var_configuration.base_path, UserID = crate::apis::urlencode(user_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("POST", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&user_passphrase_post_data); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(user_passphrase_post_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -4005,7 +3764,8 @@ pub async fn users_user_id_passphrase_post( } /// Create a user on keyfender. -pub async fn users_user_id_put( + +pub fn users_user_id_put( configuration: &configuration::Configuration, user_id: &str, user_post_data: crate::models::UserPostData, @@ -4019,35 +3779,28 @@ pub async fn users_user_id_put( local_var_configuration.base_path, UserID = crate::apis::urlencode(user_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); - local_var_req_builder = - local_var_req_builder.header(reqwest::header::CONTENT_TYPE, "application/json"); - local_var_req_builder = local_var_req_builder.json(&user_post_data); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + local_var_req_builder = local_var_req_builder.set("content-type", "application/json"); + let local_var_resp = local_var_req_builder.send_json(user_post_data)?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -4068,7 +3821,8 @@ pub async fn users_user_id_put( } /// Get the list of tags set to an Operator user. -pub async fn users_user_id_tags_get( + +pub fn users_user_id_tags_get( configuration: &configuration::Configuration, user_id: &str, ) -> Result>, Error> { @@ -4081,34 +3835,29 @@ pub async fn users_user_id_tags_get( local_var_configuration.base_path, UserID = crate::apis::urlencode(user_id) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("GET", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); - }; + let value = super::basic_auth(local_var_auth_conf); + local_var_req_builder = local_var_req_builder.set("authorization", &value); + }; let accept_str = "application/json"; - local_var_req_builder = local_var_req_builder.header(reqwest::header::ACCEPT, accept_str); + local_var_req_builder = local_var_req_builder.set("accept", accept_str); - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_entity: Vec = serde_json::from_str(&local_var_content).map_err(Error::from)?; let local_var_result = ResponseContent { @@ -4131,7 +3880,8 @@ pub async fn users_user_id_tags_get( } /// Delete a tag from the Operator user -pub async fn users_user_id_tags_tag_delete( + +pub fn users_user_id_tags_tag_delete( configuration: &configuration::Configuration, user_id: &str, tag: &str, @@ -4146,31 +3896,27 @@ pub async fn users_user_id_tags_tag_delete( UserID = crate::apis::urlencode(user_id), Tag = crate::apis::urlencode(tag) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::DELETE, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("DELETE", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, @@ -4192,7 +3938,8 @@ pub async fn users_user_id_tags_tag_delete( } /// Add a tag to the Operator user. -pub async fn users_user_id_tags_tag_put( + +pub fn users_user_id_tags_tag_put( configuration: &configuration::Configuration, user_id: &str, tag: &str, @@ -4207,31 +3954,27 @@ pub async fn users_user_id_tags_tag_put( UserID = crate::apis::urlencode(user_id), Tag = crate::apis::urlencode(tag) ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::PUT, local_var_uri_str.as_str()); + let mut local_var_req_builder = local_var_client.request("PUT", local_var_uri_str.as_str()); if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); + local_var_req_builder = local_var_req_builder.set("user-agent", local_var_user_agent); } if let Some(ref local_var_auth_conf) = local_var_configuration.basic_auth { - local_var_req_builder = local_var_req_builder.basic_auth( - local_var_auth_conf.0.to_owned(), - local_var_auth_conf.1.to_owned(), - ); + let value = super::basic_auth(local_var_auth_conf); + + local_var_req_builder = local_var_req_builder.set("authorization", &value); }; - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; + let local_var_resp = local_var_req_builder.call()?; - let local_var_headers = local_var_resp.headers().clone(); + let local_var_headers = super::get_header_map(&local_var_resp); let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; + let local_var_content = local_var_resp.into_string()?; let local_var_content_clone = local_var_content.clone(); - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { + if !local_var_status >= 400 { let local_var_result = ResponseContent { status: local_var_status, content: local_var_content_clone, diff --git a/src/apis/mod.rs b/src/apis/mod.rs index 93c4ddf..a203487 100644 --- a/src/apis/mod.rs +++ b/src/apis/mod.rs @@ -1,17 +1,32 @@ +use base64::{engine::general_purpose, Engine}; +use std::collections::HashMap; use std::error; use std::fmt; +pub(crate) fn get_header_map(response: &ureq::Response) -> HashMap { + let mut headers = HashMap::new(); + + let names = response.headers_names(); + for name in names { + if let Some(value) = response.header(&name) { + headers.insert(name, value.to_string()); + } + } + + headers +} + #[derive(Debug, Clone)] pub struct ResponseContent { - pub status: reqwest::StatusCode, + pub status: u16, pub content: String, pub entity: T, - pub headers: reqwest::header::HeaderMap, + pub headers: HashMap, } #[derive(Debug)] pub enum Error { - Reqwest(reqwest::Error), + Ureq(ureq::Error), Serde(serde_json::Error), Io(std::io::Error), ResponseError(ResponseContent), @@ -20,7 +35,7 @@ pub enum Error { impl fmt::Display for Error { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let (module, e) = match self { - Error::Reqwest(e) => ("reqwest", e.to_string()), + Error::Ureq(e) => ("ureq", e.to_string()), Error::Serde(e) => ("serde", e.to_string()), Error::Io(e) => ("IO", e.to_string()), Error::ResponseError(e) => ("response", format!("status code {}", e.status)), @@ -32,7 +47,7 @@ impl fmt::Display for Error { impl error::Error for Error { fn source(&self) -> Option<&(dyn error::Error + 'static)> { Some(match self { - Error::Reqwest(e) => e, + Error::Ureq(e) => e, Error::Serde(e) => e, Error::Io(e) => e, Error::ResponseError(_) => return None, @@ -40,9 +55,9 @@ impl error::Error for Error { } } -impl From for Error { - fn from(e: reqwest::Error) -> Self { - Error::Reqwest(e) +impl From for Error { + fn from(e: ureq::Error) -> Self { + Error::Ureq(e) } } @@ -93,6 +108,11 @@ pub fn parse_deep_object(prefix: &str, value: &serde_json::Value) -> Vec<(String unimplemented!("Only objects are supported with style=deepObject") } +pub(crate) fn basic_auth(auth: &configuration::BasicAuth) -> String { + let string = format!("{}:{}", auth.0, auth.1.as_ref().unwrap_or(&"".to_string())); + format!("Basic {}", general_purpose::STANDARD.encode(string)).to_string() +} + pub mod default_api; pub mod configuration; diff --git a/src/lib.rs b/src/lib.rs index fc22e4e..56309bf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,9 @@ #[macro_use] extern crate serde_derive; -extern crate reqwest; extern crate serde; extern crate serde_json; +extern crate ureq; extern crate url; pub mod apis; diff --git a/src/models/public_key.rs b/src/models/public_key.rs index f4aa81a..9d7d551 100644 --- a/src/models/public_key.rs +++ b/src/models/public_key.rs @@ -34,11 +34,7 @@ impl PublicKey { mechanisms, r#type, restrictions: Box::new(restrictions), - key: if let Some(x) = key { - Some(Box::new(x)) - } else { - None - }, + key: key.map(Box::new), operations, } }