fix token logic to allow for AAD 2.0

R/kusto_token.R

@@ -74,10 +74,15 @@ list_kusto_tokens <- function()
 {
     lst <- AzureAuth::list_azure_tokens()
 
-    is_kusto <- sapply(lst, function(tok)
-        grepl("kusto.windows.net", tok$credentials$resource, fixed=TRUE))
+    is_kusto <- function(x)
+    {
+        !is.null(x) && grepl("kusto.windows.net", x, fixed=TRUE)
+    }
 
-    lst[is_kusto]
+    lst[sapply(lst, function(tok)
+    {
+        is_kusto(tok$resource) || is_kusto(tok$scope) || is_kusto(tok$credentials$resource)
+    })]
 }
 
 

tests/testthat/test00_token.R

@@ -40,7 +40,10 @@ if(!interactive())
 lapply(AzureAuth::list_azure_tokens(), function(token)
 {
     hash <- token$hash()
-    if(grepl("kusto\\.windows\\.net", token$credentials$resource))
+    name_suffix <- "kusto\\.windows\\.net"
+    if((!is.null(token$resource) && grepl(name_suffix, token$resource)) ||
+       (!is.null(token$scope) && grepl(name_suffix, token$scope)) ||
+       (!is.null(token$credentials$resource) && grepl(name_suffix, token$credentials$resource)))
         file.remove(file.path(AzureAuth::AzureR_dir(), hash))
 })