diff --git a/R/global.R b/R/global.R index 1cb7d673c..7ca78238b 100644 --- a/R/global.R +++ b/R/global.R @@ -63,7 +63,9 @@ utils::globalVariables( 'user_role', 'old_role', 'new_role', - 'role' + 'role', + 'Package', + 'Actions' ) ) diff --git a/R/run_app.R b/R/run_app.R index 6f201d1d7..cac789b79 100644 --- a/R/run_app.R +++ b/R/run_app.R @@ -43,25 +43,6 @@ 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( @@ -75,8 +56,6 @@ 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, ...) ) diff --git a/R/utils_startup.R b/R/utils_startup.R index d2fdc2d66..e473d26be 100644 --- a/R/utils_startup.R +++ b/R/utils_startup.R @@ -213,8 +213,6 @@ 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)) {