Skip to content

Commit

Permalink
Merge pull request #611 from pharmaR/jt-prep-dev2.0.0.9000
Browse files Browse the repository at this point in the history
Initialize V2.0.0 developmental branch
  • Loading branch information
AARON-CLARK authored Aug 14, 2023
2 parents def8380 + d36ed1a commit 030f7df
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: riskassessment
Title: A web app designed to interface with the `riskmetric` package
Version: 2.0.0
Version: 2.0.0.9000
Authors@R: c(
person("Aaron", "Clark", role = c("aut", "cre"), email = "[email protected]"),
person("Robert", "Krajcik", role = "aut", email = "[email protected]"),
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# riskassessment (development version)

# riskassessment 2.0.0

### Enhancements
Expand Down
21 changes: 21 additions & 0 deletions R/run_app.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,25 @@ run_app <- function(
}
}

# Note that this overrides other credential set up
login_creds <- NULL
pre_auth_user <- NULL
if (isFALSE(getOption("golem.app.prod"))) {
arg_lst <- as.list(match.call())

login_creds <- list(user_id = "",
user_pwd = "cxk1QEMYSpYcrNB")
if (!is.null(arg_lst$pre_auth_user)) {
pre_auth_user <- arg_lst$pre_auth_user
if (isTRUE(pre_auth_user) || pre_auth_user == "admin") {
login_creds$user_id <- "admin"
} else {
login_creds$user_id <- pre_auth_user
}
credentials_db_name <- gsub("\\.sqlite", "_dev\\.sqlite", credentials_db_name)
}
}

# Run the app
with_golem_options(
app = shinyApp(
Expand All @@ -56,6 +75,8 @@ run_app <- function(
golem_opts = list(app_version = app_ver,
credentials_db_name = credentials_db_name,
assessment_db_name = assessment_db_name,
pre_auth_user = pre_auth_user,
login_creds = login_creds,
decision_categories = decision_categories,
...)
)
Expand Down
2 changes: 2 additions & 0 deletions R/utils_startup.R
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ initialize_raa <- function(assess_db, cred_db, decision_cat) {

check_credentials(db_config[["credentials"]])

if (isFALSE(getOption("golem.app.prod")) && !is.null(golem::get_golem_options('pre_auth_user')) && !file.exists(credentials_db)) create_credentials_dev_db(credentials_db)

# Create package db & credentials db if it doesn't exist yet.
if(!file.exists(assessment_db)) create_db(assessment_db)
if(!file.exists(credentials_db)) {
Expand Down

0 comments on commit 030f7df

Please sign in to comment.