maximdeclercq
/
rusty-bever
forked from Chewing_Bever/rusty-bever
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added default values to admin password

develop
Jef Roosens 2021-08-21 20:22:19 +02:00
parent 13259249fd
commit 210eeee7b6
Signed by untrusted user: Jef Roosens
GPG Key ID: 955C0660072F691F
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rb/auth.rs
View File

@ -18,7 +18,7 @@ const JWT_EXP_SECONDS: i64 = 900;
/// Amount of bytes the refresh tokens should consist of
const REFRESH_TOKEN_N_BYTES: usize = 64;
/// Expire time for refresh tokens; here: one week
const REFRESH_TOKEN_EXP_SECONDS: i64 = 36288000;
const REFRESH_TOKEN_EXP_SECONDS: i64 = 604800;
fn log<T>(message: &str, o: T) -> T {
println!("{}", message);

15
src/rbs/main.rs
View File

@ -1,5 +1,5 @@
// This needs to be explicitely included before diesel is imported to make sure
// compilation succeeds
// compilation succeeds in the release Docker image.
extern crate openssl;
#[macro_use]
@ -29,16 +29,9 @@ async fn run_db_migrations(rocket: Rocket<Build>) -> Result<Rocket<Build>, Rocke
}
async fn create_admin_user(rocket: Rocket<Build>) -> Result<Rocket<Build>, Rocket<Build>> {
// In debug mode, the admin user is just a test user
let (admin_user, admin_password): (String, String);
let admin_user = std::env::var("ADMIN_USER").unwrap_or(String::from("admin"));
let admin_password = std::env::var("ADMIN_PASSWORD").unwrap_or(String::from("password"));
// if rocket.config().profile == "debug" {
admin_user = String::from("test");
admin_password = String::from("test");
// }else{
// admin_user = std::env::var("ADMIN_USER").expect("no admin user provided");
// admin_password = std::env::var("ADMIN_PASSWORD").expect("no admin password provided");
// }
let conn = RbDbConn::get_one(&rocket)
.await
.expect("database connection");
@ -59,5 +52,5 @@ fn rocket() -> _ {
"Create admin user",
create_admin_user
))
.mount("/auth", auth::routes())
.mount("/api/auth", auth::routes())
}