fed login must actually always be true

This commit is contained in:
Hong Ooi 2019-03-19 19:23:40 +11:00
Родитель 3ba1e90e47
Коммит 88b4d76894
3 изменённых файлов: 8 добавлений и 20 удалений

Просмотреть файл

@ -33,4 +33,4 @@ Suggests:
testthat, testthat,
AzureStor (>= 2.0.0) AzureStor (>= 2.0.0)
Roxygen: list(markdown=TRUE) Roxygen: list(markdown=TRUE)
RoxygenNote: 6.1.0.9000 RoxygenNote: 6.1.1

Просмотреть файл

@ -31,7 +31,7 @@
#' - usertoken: The AAD token for user authentication. #' - usertoken: The AAD token for user authentication.
#' - * usertoken, usrtoken #' - * usertoken, usrtoken
#' - fed: Logical, whether federated authentication is enabled. Currently unsupported; if this is TRUE, `kusto_database_endpoint` will print a warning and ignore it. #' - fed: Logical, whether federated authentication is enabled. Currently unsupported; if this is TRUE, `kusto_database_endpoint` will print a warning and ignore it.
#' * federated security, federated, aadfed #' * federated security, federated, aadfed, aadfederatedsecurity
#' #'
#' App authentication properties: #' App authentication properties:
#' - appkey: The secret key for the app. #' - appkey: The secret key for the app.
@ -40,7 +40,7 @@
#' - apptoken: The AAD token for app authentication. #' - apptoken: The AAD token for app authentication.
#' * apptoken, applicationtoken #' * apptoken, applicationtoken
#' #'
#' Currently, AzureKusto only supports authentication via Azure Active Directory, and only via app or user credentials. Authenticating with federated logins, an AAD certificate, or with DSTS is planned for the future. #' Currently, AzureKusto only supports authentication via Azure Active Directory. Authenticating with DSTS is planned for the future.
#' #'
#' The way `kusto_database_endpoint` obtains an AAD token is as follows. #' The way `kusto_database_endpoint` obtains an AAD token is as follows.
#' 1. If the `.query_token` argument is supplied, use it. #' 1. If the `.query_token` argument is supplied, use it.
@ -120,7 +120,7 @@ normalize_connstring_properties <- function(properties)
response_dynamic_serialization_2="response_dynamic_serialization_2", response_dynamic_serialization_2="response_dynamic_serialization_2",
# userauth properties -- DSTS not yet supported # userauth properties -- DSTS not yet supported
fed=c("fed", "federated security", "federated", "aadfed"), fed=c("fed", "federated security", "federated", "aadfed", "aadfederatedsecurity"),
pwd=c("pwd", "password"), pwd=c("pwd", "password"),
user=c("user", "uid", "userid"), user=c("user", "uid", "userid"),
traceusername="traceusername", traceusername="traceusername",
@ -212,15 +212,10 @@ find_endpoint_token <- function(properties, .query_token)
} }
# internal checks on various properties
check_endpoint_properties <- function(props) check_endpoint_properties <- function(props)
{ {
if(isTRUE(props$fed)) if(isTRUE(props$use_integer64) && !requireNamespace("bit64", quietly=TRUE))
{
warning("Federated logins not yet supported")
props$fed <- NULL
}
if(isTRUE(props$use_integer64) && !requireNamespace("bit64"))
{ {
warning("bit64 package not installed, cannot use 64-bit integers") warning("bit64 package not installed, cannot use 64-bit integers")
props$use_integer64 <- FALSE props$use_integer64 <- FALSE
@ -233,13 +228,6 @@ check_endpoint_properties <- function(props)
props[["response_dynamic_serialization"]] <- NULL props[["response_dynamic_serialization"]] <- NULL
} }
# if(!is_empty(props[["response_dynamic_serialization_2"]]) &&
# tolower(props[["response_dynamic_serialization_2"]]) != "string")
# {
# warning("Serialization of dynamic response to JSON is not yet supported")
# props[["response_dynamic_serialization_2"]] <- NULL
# }
props props
} }

Просмотреть файл

@ -66,7 +66,7 @@ User authentication properties:
} }
\item fed: Logical, whether federated authentication is enabled. Currently unsupported; if this is TRUE, \code{kusto_database_endpoint} will print a warning and ignore it. \item fed: Logical, whether federated authentication is enabled. Currently unsupported; if this is TRUE, \code{kusto_database_endpoint} will print a warning and ignore it.
\itemize{ \itemize{
\item federated security, federated, aadfed \item federated security, federated, aadfed, aadfederatedsecurity
} }
} }
@ -83,7 +83,7 @@ App authentication properties:
} }
} }
Currently, AzureKusto only supports authentication via Azure Active Directory, and only via app or user credentials. Authenticating with federated logins, an AAD certificate, or with DSTS is planned for the future. Currently, AzureKusto only supports authentication via Azure Active Directory. Authenticating with DSTS is planned for the future.
The way \code{kusto_database_endpoint} obtains an AAD token is as follows. The way \code{kusto_database_endpoint} obtains an AAD token is as follows.
\enumerate{ \enumerate{