fix http basc auth in R client (#13330)

This commit is contained in:
William Cheng 2022-09-01 14:14:08 +08:00 committed by GitHub
parent 225204093f
commit d1f44e8a7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 31 deletions

View File

@ -430,18 +430,9 @@
{{#isBasic}}
{{#isBasicBasic}}
# HTTP basic auth
if (is.null(self$api_client$username) || is.null(self$api_client$password)) {
{{#useDefaultExceptionHandling}}
stop("username, password in `api_client` must be set for authentication in the endpoint `{{{operationId}}}`.")
{{/useDefaultExceptionHandling}}
{{#useRlangExceptionHandling}}
rlang::abort(message = "username, password in `api_client` must be set for authentication in the endpoint `{{{operationId}}}`.",
.subclass = "ApiException",
ApiException = ApiException$new(status = 0,
reason = "username, password in `api_client` must be set for authentication in the endpoint `{{{operationId}}}`."))
{{/useRlangExceptionHandling}}
if (!is.null(self$api_client$username) || !is.null(self$api_client$password)) {
header_params["Authorization"] <- paste("Basic", base64enc::base64encode(charToRaw(paste(self$api_client$username, self$api_client$password, sep = ":"))))
}
header_params["Authorization"] <- paste("Basic", base64enc::base64encode(charToRaw(paste(self$api_client$username, self$api_client$password, sep = ":"))))
{{/isBasicBasic}}
{{#isBasicBearer}}
# Bearer token

View File

@ -719,13 +719,9 @@ PetApi <- R6::R6Class(
local_var_url_path <- "/pet"
# HTTP basic auth
if (is.null(self$api_client$username) || is.null(self$api_client$password)) {
rlang::abort(message = "username, password in `api_client` must be set for authentication in the endpoint `add_pet`.",
.subclass = "ApiException",
ApiException = ApiException$new(status = 0,
reason = "username, password in `api_client` must be set for authentication in the endpoint `add_pet`."))
if (!is.null(self$api_client$username) || !is.null(self$api_client$password)) {
header_params["Authorization"] <- paste("Basic", base64enc::base64encode(charToRaw(paste(self$api_client$username, self$api_client$password, sep = ":"))))
}
header_params["Authorization"] <- paste("Basic", base64enc::base64encode(charToRaw(paste(self$api_client$username, self$api_client$password, sep = ":"))))
# The Accept request HTTP header
local_var_accepts <- list("application/xml", "application/json")

View File

@ -719,13 +719,9 @@ PetApi <- R6::R6Class(
local_var_url_path <- "/pet"
# HTTP basic auth
if (is.null(self$api_client$username) || is.null(self$api_client$password)) {
rlang::abort(message = "username, password in `api_client` must be set for authentication in the endpoint `add_pet`.",
.subclass = "ApiException",
ApiException = ApiException$new(status = 0,
reason = "username, password in `api_client` must be set for authentication in the endpoint `add_pet`."))
if (!is.null(self$api_client$username) || !is.null(self$api_client$password)) {
header_params["Authorization"] <- paste("Basic", base64enc::base64encode(charToRaw(paste(self$api_client$username, self$api_client$password, sep = ":"))))
}
header_params["Authorization"] <- paste("Basic", base64enc::base64encode(charToRaw(paste(self$api_client$username, self$api_client$password, sep = ":"))))
# The Accept request HTTP header
local_var_accepts <- list("application/xml", "application/json")

View File

@ -719,13 +719,9 @@ PetApi <- R6::R6Class(
local_var_url_path <- "/pet"
# HTTP basic auth
if (is.null(self$api_client$username) || is.null(self$api_client$password)) {
rlang::abort(message = "username, password in `api_client` must be set for authentication in the endpoint `AddPet`.",
.subclass = "ApiException",
ApiException = ApiException$new(status = 0,
reason = "username, password in `api_client` must be set for authentication in the endpoint `AddPet`."))
if (!is.null(self$api_client$username) || !is.null(self$api_client$password)) {
header_params["Authorization"] <- paste("Basic", base64enc::base64encode(charToRaw(paste(self$api_client$username, self$api_client$password, sep = ":"))))
}
header_params["Authorization"] <- paste("Basic", base64enc::base64encode(charToRaw(paste(self$api_client$username, self$api_client$password, sep = ":"))))
# The Accept request HTTP header
local_var_accepts <- list("application/xml", "application/json")

View File

@ -12,8 +12,10 @@ pet <- Pet$new("name_test",
status = "available"
)
pet_api$api_client$username <- ""
pet_api$api_client$password <- ""
# no need to set uasername, password and there should be no error
# since the endpoint can support multi auth schema
#pet_api$api_client$username <- ""
#pet_api$api_client$password <- ""
result <- pet_api$AddPet(pet)
test_that("Test toJSONString", {