Merge pull request #159 from lawinslow/master

Addressing issue #158
DOI-USGS · Jan 18, 2016 · 270a28b · 270a28b
2 parents ffa4eef + b43684c
commit 270a28b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: sbtools
 Title: USGS ScienceBase Tools
 Maintainer: Luke Winslow <lwinslow@usgs.gov>
-Version: 0.14.3
+Version: 0.14.4
 Authors@R: c(person("Luke", "Winslow", role = c("aut","cre"),
     email = "lwinslow@usgs.gov"),
     person("Scott", "Chamberlain", role = c("aut"),

diff --git a/R/current_session.R b/R/current_session.R
@@ -2,7 +2,8 @@
 #'
 #'@description 
 #'Returns the currently cached SB session. If there
-#'is no authenticated session, returns NULL.
+#'is no authenticated session, returns NULL. Emits a
+#'warning if the session has expired. 
 #'
 #'@author Luke Winslow
 #'
@@ -12,6 +13,8 @@
 #'
 #'@export
 current_session = function(){
-
+	if(session_expired(pkg.env$session)){
+		warning('SB authentication expired, SB interaction may fail. Please re-authenticate using authenticate_sb().')
+	}
 	return(pkg.env$session)
 }
diff --git a/man/current_session.Rd b/man/current_session.Rd