Update dependencies (#13)
Reviewed-on: #13
This commit was merged in pull request #13.
This commit is contained in:
+6
-6
@@ -14,12 +14,12 @@ pub struct App {
|
||||
|
||||
// TODO: Change this to non-async at some point.
|
||||
// Will require changes in other libraries
|
||||
pub async fn load_app() -> Result<App, std::io::Error> {
|
||||
pub fn load_app() -> Result<App, std::io::Error> {
|
||||
use textsender_models::envy;
|
||||
let auth_url_env = envy::environment::get_env("AUTH_URL").await;
|
||||
let api_url_env = envy::environment::get_env("API_URL").await;
|
||||
let service_username_env = envy::environment::get_env("SERVICE_USERNAME").await;
|
||||
let service_passphrase_env = envy::environment::get_env("SERVICE_PASSPHRASE").await;
|
||||
let auth_url_env = envy::environment::get_env("AUTH_URL");
|
||||
let api_url_env = envy::environment::get_env("API_URL");
|
||||
let service_username_env = envy::environment::get_env("SERVICE_USERNAME");
|
||||
let service_passphrase_env = envy::environment::get_env("SERVICE_PASSPHRASE");
|
||||
|
||||
let envs = vec![
|
||||
api_url_env,
|
||||
@@ -40,7 +40,7 @@ pub async fn load_app() -> Result<App, std::io::Error> {
|
||||
let (envs_valid, reason) = check_envs(&envs);
|
||||
|
||||
if envs_valid {
|
||||
match textsender_models::config::auxiliary::load_config().await {
|
||||
match textsender_models::config::auxiliary::load_config() {
|
||||
Ok(twilio_config) => Ok(App {
|
||||
api_url: envs[0].value.clone(),
|
||||
auth_url: envs[1].value.clone(),
|
||||
|
||||
Reference in New Issue
Block a user