Merge pull request #76 from aWhereAPI/dev

colinloftin-awhere · web-flow · commit 2fd5f4e14e34 · 2021-06-25T13:27:31.000-04:00
Dev
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: aWhereAPI
 Title: API calls for aWhere API
-Version: 0.7.2
+Version: 0.7.3
 Authors@R:
     c(person("Technical", "Support", ,"technicalsupport@awhere.com", role = c("aut","cre","ctb")))
 Description:
diff --git a/R/get-token.R b/R/get-token.R
@@ -56,7 +56,7 @@ get_token <- function(uid, secret, use_environment = TRUE, apiAddress = "api.awh
     if (use_environment) {
       if (exists('awhereEnv75247') == FALSE) {
         awhereEnv75247 <- new.env()
-        assign('awhereEnv75247',awhereEnv75247,envir = baseenv())
+        assign('awhereEnv75247',awhereEnv75247,envir = .GlobalEnv)
         rm(awhereEnv75247)
       }
       
@@ -91,7 +91,6 @@ get_token <- function(uid, secret, use_environment = TRUE, apiAddress = "api.awh
       lockBinding('token',  awhereEnv75247)
       lockBinding('apiAddress', awhereEnv75247)
       
-      lockEnvironment(awhereEnv75247,bindings = TRUE)
       rm(awhereEnv75247)
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ get_token <- function(uid, secret, use_environment = TRUE, apiAddress = "api.awh`
`56`	`56`	`if (use_environment) {`
`57`	`57`	`if (exists('awhereEnv75247') == FALSE) {`
`58`	`58`	`awhereEnv75247 <- new.env()`
`59`		`- assign('awhereEnv75247',awhereEnv75247,envir = baseenv())`
	`59`	`+ assign('awhereEnv75247',awhereEnv75247,envir = .GlobalEnv)`
`60`	`60`	`rm(awhereEnv75247)`
`61`	`61`	`}`
`62`	`62`
`@@ -91,7 +91,6 @@ get_token <- function(uid, secret, use_environment = TRUE, apiAddress = "api.awh`
`91`	`91`	`lockBinding('token', awhereEnv75247)`
`92`	`92`	`lockBinding('apiAddress', awhereEnv75247)`
`93`	`93`
`94`		`- lockEnvironment(awhereEnv75247,bindings = TRUE)`
`95`	`94`	`rm(awhereEnv75247)`
`96`	`95`	`}`
`97`	`96`	`}`