#40 ENCODE the client secret to avoid occasional 401

microsoft · Jan 12, 2017 · 8a9c28d · 8a9c28d
1 parent bea5a01
commit 8a9c28d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/R/AzureAuthenticate.R b/R/AzureAuthenticate.R
@@ -35,8 +35,10 @@ azureAuthenticate <- function(azureActiveContext, tenantID, clientID, authKey, v
 
   URLGT <- paste0("https://login.microsoftonline.com/", AtenantID, "/oauth2/token?api-version=1.0")
 
+  AauthKeyE <- URLencode(AauthKey, reserved = TRUE)
+
   bodyGT <- paste0("grant_type=client_credentials&resource=https%3A%2F%2Fmanagement.azure.com%2F&client_id=",
-                   AclientID, "&client_secret=", AauthKey)
+                   AclientID, "&client_secret=", AauthKeyE)
 
   r <- httr::POST(URLGT,
                   add_headers(

diff --git a/R/AzureTemplate.R b/R/AzureTemplate.R
@@ -82,12 +82,16 @@ azureDeployTemplate <- function(azureActiveContext, deplname, templateURL,
   r <- PUT(URL, add_headers(.headers = c(Host = "management.azure.com",
                                          Authorization = AT, `Content-type` = "application/json")), body = bodyI,
            verbosity)
+
+    rl <- content(r, "text", encoding = "UTF-8")
+    if (verbose == TRUE && status_code(r) != 200 && status_code(r) != 201 && status_code(r) !=
+      202) print (rl)
+
   # print(paste(deplname,'Submitted'))
   if (status_code(r) != 200 && status_code(r) != 201 && status_code(r) !=
       202) {
     stopWithAzureError(r)
   }
-  rl <- content(r, "text", encoding = "UTF-8")
   # print (rl)
   df <- fromJSON(rl)
   if (toupper(mode) == "SYNC") {