Merge pull request #348 from jmbarbone/347-sanitize-token

resolves #347 - lowercase characters in token
OuhscBbmc · Jul 22, 2021 · 90e52f7 · 90e52f7
2 parents 9f6b4ae + 8caa842
commit 90e52f7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,8 +1,9 @@
 Upcoming Versions
 ==========================================================
 
-In the future:
-...
+### Minor Enhacements
+
+* `sanitize_token()` no longer fails with lowercase characters (#347)
 
 Version 1.0 (released 2021-07-21)
 ==========================================================

diff --git a/R/sanitize-token.R b/R/sanitize-token.R
@@ -21,7 +21,7 @@
 
 #' @export
 sanitize_token <- function(token) {
-  pattern <- "^([0-9A-F]{32})(?:\\n)?$"
+  pattern <- "^([0-9A-Fa-f]{32})(?:\\n)?$"
 
   if (is.na(token)) {
     stop(

diff --git a/tests/testthat/test-sanitize.R b/tests/testthat/test-sanitize.R
@@ -39,3 +39,12 @@ test_that("sanitize token -empty", {
     regexp    = "The token is an empty string, not a valid 32-character hexademical value\\."
   )
 })
+
+test_that("sanitize token - lowercase (#347)", {
+  secret_token <- "12345678901234567890123456abcdef"
+  sanitize_token(secret_token)
+
+  returned <- REDCapR::sanitize_token(secret_token)
+  # No change
+  expect_equal(returned, secret_token)
+})