diff --git a/.env.docker.sample b/.env.docker.sample index 3d5a382..5c68032 100644 --- a/.env.docker.sample +++ b/.env.docker.sample @@ -1,11 +1,11 @@ SECRET_KEY=NULqYIzgt28bTiyziCd7IOO7b6LnWDW! -DB_AUTH_NAME=textsender_auth_db -DB_AUTH_USER=textsender_auth +DB_AUTH_NAME=schedtxt_auth_db +DB_AUTH_USER=schedtxt_auth DB_AUTH_PASSWORD=password DB_AUTH_HOST=auth_db DB_AUTH_PORT=5432 DB_AUTH_SSLMODE=disable DATABASE_URL=postgres://${DB_AUTH_USER}:${DB_AUTH_PASSWORD}@${DB_AUTH_HOST}:${DB_AUTH_PORT}/${DB_AUTH_NAME} ENABLE_REGISTRATION=true -ALLOWED_ORIGINS="http://textsender.com,http://localhost:5173,http://localhost:9080" +ALLOWED_ORIGINS="http://schedtxt.com,http://localhost:5173,http://localhost:9080" APP_ENV=production diff --git a/.env.local.sample b/.env.local.sample index eb17ac6..29bdff3 100644 --- a/.env.local.sample +++ b/.env.local.sample @@ -1,11 +1,11 @@ SECRET_KEY=NULqYIzgt28bTiyziCd7IOO7b6LnWDW! -DB_AUTH_NAME=textsender_auth_db -DB_AUTH_USER=textsender_auth +DB_AUTH_NAME=schedtxt_auth_db +DB_AUTH_USER=schedtxt_auth DB_AUTH_PASSWORD=password DB_AUTH_HOST=localhost DB_AUTH_PORT=5432 DB_AUTH_SSLMODE=disable DATABASE_URL=postgres://${DB_AUTH_USER}:${DB_AUTH_PASSWORD}@${DB_AUTH_HOST}:${DB_AUTH_PORT}/${DB_AUTH_NAME} ENABLE_REGISTRATION=true -ALLOWED_ORIGINS="http://textsender.com,http://localhost:5173,http://localhost:9080" +ALLOWED_ORIGINS="http://schedtxt.com,http://localhost:5173,http://localhost:9080" APP_ENV=production diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml index 90c33fa..3da5097 100644 --- a/.gitea/workflows/pr.yml +++ b/.gitea/workflows/pr.yml @@ -21,12 +21,12 @@ jobs: - uses: Swatinem/rust-cache@v2 - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key - chmod 600 ~/.ssh/textsender-models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/schedtxt-models_deploy_key + chmod 600 ~/.ssh/schedtxt-models_deploy_key ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/textsender-models_deploy_key + ssh-add -v ~/.ssh/schedtxt-models_deploy_key cargo check @@ -43,12 +43,12 @@ jobs: - run: rustup component add rustfmt - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key - chmod 600 ~/.ssh/textsender-models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/schedtxt-models_deploy_key + chmod 600 ~/.ssh/schedtxt-models_deploy_key ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/textsender-models_deploy_key + ssh-add -v ~/.ssh/schedtxt-models_deploy_key cargo fmt --all -- --check clippy: @@ -63,10 +63,10 @@ jobs: - run: rustup component add clippy - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key - chmod 600 ~/.ssh/textsender-models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/schedtxt-models_deploy_key + chmod 600 ~/.ssh/schedtxt-models_deploy_key ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/textsender-models_deploy_key + ssh-add -v ~/.ssh/schedtxt-models_deploy_key cargo clippy -- -D warnings diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index d45d94c..7e21c82 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -1,4 +1,4 @@ -name: textsender_auth Build +name: schedtxt_auth Build on: push: @@ -21,12 +21,12 @@ jobs: - uses: Swatinem/rust-cache@v2 - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key - chmod 600 ~/.ssh/textsender-models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/schedtxt-models_deploy_key + chmod 600 ~/.ssh/schedtxt-models_deploy_key ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/textsender-models_deploy_key + ssh-add -v ~/.ssh/schedtxt-models_deploy_key cargo check @@ -81,12 +81,12 @@ jobs: ENABLE_REGISTRATION: 'TRUE' run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key - chmod 600 ~/.ssh/textsender-models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/schedtxt-models_deploy_key + chmod 600 ~/.ssh/schedtxt-models_deploy_key ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/textsender-models_deploy_key + ssh-add -v ~/.ssh/schedtxt-models_deploy_key cargo test @@ -102,12 +102,12 @@ jobs: - run: rustup component add rustfmt - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key - chmod 600 ~/.ssh/textsender-models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/schedtxt-models_deploy_key + chmod 600 ~/.ssh/schedtxt-models_deploy_key ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/textsender-models_deploy_key + ssh-add -v ~/.ssh/schedtxt-models_deploy_key cargo fmt --all -- --check clippy: @@ -122,12 +122,12 @@ jobs: - run: rustup component add clippy - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key - chmod 600 ~/.ssh/textsender-models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/schedtxt-models_deploy_key + chmod 600 ~/.ssh/schedtxt-models_deploy_key ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/textsender-models_deploy_key + ssh-add -v ~/.ssh/schedtxt-models_deploy_key cargo clippy -- -D warnings build: @@ -141,10 +141,10 @@ jobs: - uses: Swatinem/rust-cache@v2 - run: | mkdir -p ~/.ssh - echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key - chmod 600 ~/.ssh/textsender-models_deploy_key + echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/schedtxt-models_deploy_key + chmod 600 ~/.ssh/schedtxt-models_deploy_key ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) - ssh-add -v ~/.ssh/textsender-models_deploy_key + ssh-add -v ~/.ssh/schedtxt-models_deploy_key cargo build --release diff --git a/Cargo.lock b/Cargo.lock index 1911108..63aad17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -191,9 +191,9 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cc" -version = "1.2.66" +version = "1.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" +checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38" dependencies = [ "find-msvc-tools", "shlex", @@ -711,9 +711,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" dependencies = [ "bytes", "http", @@ -721,9 +721,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" dependencies = [ "bytes", "futures-core", @@ -1051,9 +1051,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" +checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" dependencies = [ "libc", "wasi", @@ -1389,6 +1389,44 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "schedtxt_auth" +version = "0.2.4" +dependencies = [ + "argon2", + "axum", + "josekit", + "schedtxt_models", + "serde", + "serde_json", + "sqlx", + "time", + "tokio", + "tower", + "tower-http", + "tracing-subscriber", + "url", + "utoipa", + "utoipa-swagger-ui", + "uuid", +] + +[[package]] +name = "schedtxt_models" +version = "0.5.3" +source = "git+ssh://git@git.kundeng.us/phoenix/schedtxt_models.git?tag=v0.5.3#597af4e84c082bb437cc94817bb19592614681a5" +dependencies = [ + "const_format", + "dotenvy", + "josekit", + "serde", + "serde_json", + "sqlx", + "time", + "utoipa", + "uuid", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1556,9 +1594,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", "windows-sys", @@ -1566,9 +1604,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" dependencies = [ "lock_api", ] @@ -1817,44 +1855,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "textsender_auth" -version = "0.2.3" -dependencies = [ - "argon2", - "axum", - "josekit", - "serde", - "serde_json", - "sqlx", - "textsender_models", - "time", - "tokio", - "tower", - "tower-http", - "tracing-subscriber", - "url", - "utoipa", - "utoipa-swagger-ui", - "uuid", -] - -[[package]] -name = "textsender_models" -version = "0.5.2" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.5.2#02061bf7a380657b7bc76d64d1824388bef8e55a" -dependencies = [ - "const_format", - "dotenvy", - "josekit", - "serde", - "serde_json", - "sqlx", - "time", - "utoipa", - "uuid", -] - [[package]] name = "thiserror" version = "2.0.18" @@ -2202,9 +2202,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.23.4" +version = "1.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" +checksum = "ea5fab0d6c3c01ae70085a09cb03d4c7a1d6314e2b3e075392783396d724ca0a" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -2426,9 +2426,9 @@ checksum = "b142a20ec14a91d5bc708c1dc21b080c550113d8aa77afa29635673a65dd02c5" [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "zopfli" diff --git a/Cargo.toml b/Cargo.toml index c6c1bb3..a21c455 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "textsender_auth" -version = "0.2.3" +name = "schedtxt_auth" +version = "0.2.4" edition = "2024" rust-version = "1.97" @@ -12,13 +12,13 @@ tokio = { version = "1.52.3", features = ["rt-multi-thread"] } tracing-subscriber = { version = "0.3.23" } tower-http = { version = "0.7.0", features = ["cors"] } sqlx = { version = "0.9.0", features = ["runtime-tokio", "tls-native-tls", "postgres", "time", "uuid"] } -uuid = { version = "1.23.4", features = ["v4", "serde"] } +uuid = { version = "1.23.5", features = ["v4", "serde"] } argon2 = { version = "0.5.3", features = ["std"] } time = { version = "0.3.53", features = ["macros", "serde"] } josekit = { version = "0.10.3" } utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.2", features = ["config", "user"] } +schedtxt_models = { git = "ssh://git@git.kundeng.us/phoenix/schedtxt_models.git", tag = "v0.5.3", features = ["config", "user"] } [dev-dependencies] tower = { version = "0.5.3", features = ["full"] } diff --git a/Dockerfile b/Dockerfile index 1edb8d5..209485e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ COPY Cargo.toml Cargo.lock ./ RUN --mount=type=ssh mkdir src && \ echo "fn main() {println!(\"if you see this, the build broke\")}" > src/main.rs && \ cargo build --release --quiet && \ - rm -rf src target/release/deps/textsender_auth* + rm -rf src target/release/deps/schedtxt_auth* COPY src ./src COPY .env ./.env @@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && r WORKDIR /usr/local/bin -COPY --from=builder /usr/src/app/target/release/textsender_auth . +COPY --from=builder /usr/src/app/target/release/schedtxt_auth . COPY --from=builder /usr/src/app/.env . COPY --from=builder /usr/src/app/migrations ./migrations @@ -41,4 +41,4 @@ COPY --from=builder /usr/src/app/migrations ./migrations EXPOSE 9080 # Set the command to run your application -CMD ["./textsender_auth"] +CMD ["./schedtxt_auth"] diff --git a/docker-compose.yml b/docker-compose.yml index e9bd44e..9251492 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: . ssh: ["default"] - container_name: textsender_auth + container_name: schedtxt_auth ports: - "9080:9080" env_file: @@ -18,11 +18,11 @@ services: # PostgreSQL Database Service auth_db: image: postgres:18.4-alpine - container_name: textsender_auth_db + container_name: schedtxt_auth_db environment: - POSTGRES_USER: ${DB_AUTH_USER:-textsender_op} + POSTGRES_USER: ${DB_AUTH_USER:-schedtxt_op} POSTGRES_PASSWORD: ${DB_AUTH_PASSWORD:-password} - POSTGRES_DB: ${DB_AUTH_NAME:-textsender_auth_db} + POSTGRES_DB: ${DB_AUTH_NAME:-schedtxt_auth_db} volumes: # Persist database data using a named volume - postgres_data:/var/lib/postgresql diff --git a/src/callers/login.rs b/src/callers/login.rs index fcf80e6..62bac3b 100644 --- a/src/callers/login.rs +++ b/src/callers/login.rs @@ -84,13 +84,13 @@ pub mod response { #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)] pub struct LoginResponse { pub message: String, - pub data: Vec, + pub data: Vec, } #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)] pub struct ServiceUserLoginResponse { pub message: String, - pub data: Vec, + pub data: Vec, } pub async fn extract( @@ -114,7 +114,7 @@ pub mod response { #[derive(Deserialize, Serialize, utoipa::ToSchema)] pub struct RefreshTokenResponse { pub message: String, - pub data: Vec, + pub data: Vec, } #[derive(Deserialize, Serialize, utoipa::ToSchema)] @@ -126,13 +126,13 @@ pub mod response { #[derive(Deserialize, Serialize, utoipa::ToSchema)] pub struct UserUpdateNameResponse { pub message: String, - pub data: Vec, + pub data: Vec, } #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)] pub struct GetUserProfileResponse { pub message: String, - pub data: Vec, + pub data: Vec, } } @@ -201,7 +201,7 @@ pub async fn user_login( if matches { // Create token let key = - textsender_models::envy::environment::get_secret_key().value; + schedtxt_models::envy::environment::get_secret_key().value; let cst = match token_stuff::create_token(&key, &user.id) { Ok(token) => token, Err(_err) => { @@ -225,11 +225,11 @@ pub async fn user_login( axum::http::StatusCode::OK, axum::Json(response::LoginResponse { message: String::from("Successful"), - data: vec![textsender_models::token::LoginResult { + data: vec![schedtxt_models::token::LoginResult { user_id: user.id, access_token: cst.access_token, token_type: String::from( - textsender_models::token::TOKEN_TYPE, + schedtxt_models::token::TOKEN_TYPE, ), issued_at: cst.issued, expires_in: cst.expires_in, @@ -351,7 +351,7 @@ pub async fn service_user_login( // Create token println!("Creating token"); let key = - textsender_models::envy::environment::get_secret_key().value; + schedtxt_models::envy::environment::get_secret_key().value; let cst = token_stuff::create_token(&key, &service_user.id).unwrap(); @@ -370,11 +370,11 @@ pub async fn service_user_login( message: String::from( super::messages::SUCCESSFUL_MESSAGE, ), - data: vec![textsender_models::token::LoginResult { + data: vec![schedtxt_models::token::LoginResult { user_id: service_user.id, access_token: cst.access_token, token_type: String::from( - textsender_models::token::TOKEN_TYPE, + schedtxt_models::token::TOKEN_TYPE, ), issued_at: cst.issued, expires_in: cst.expires_in, @@ -456,12 +456,12 @@ pub async fn refresh_token( }), ) } else { - let key = textsender_models::envy::environment::get_secret_key().value; + let key = schedtxt_models::envy::environment::get_secret_key().value; if token_stuff::verify_token(&key, &payload.access_token) { match token_stuff::extract_id_from_token(&key, &payload.access_token) { Ok(id) => { let generate_service_token = - |id, key| -> Option { + |id, key| -> Option { token_stuff::create_service_refresh_token(key, id).ok() }; @@ -475,12 +475,12 @@ pub async fn refresh_token( Some(cst) => { response.message = String::from(super::messages::SUCCESSFUL_MESSAGE); - let lr = textsender_models::token::LoginResult { + let lr = schedtxt_models::token::LoginResult { user_id: id, access_token: cst.access_token, issued_at: cst.issued, expires_in: cst.expires_in, - token_type: String::from(textsender_models::token::TOKEN_TYPE), + token_type: String::from(schedtxt_models::token::TOKEN_TYPE), }; response.data.push(lr); (axum::http::StatusCode::OK, axum::Json(response)) @@ -500,13 +500,13 @@ pub async fn refresh_token( Some(cst) => { response.message = String::from(super::messages::SUCCESSFUL_MESSAGE); - let lr = textsender_models::token::LoginResult { + let lr = schedtxt_models::token::LoginResult { user_id: id, access_token: cst.access_token, issued_at: cst.issued, expires_in: cst.expires_in, token_type: String::from( - textsender_models::token::TOKEN_TYPE, + schedtxt_models::token::TOKEN_TYPE, ), }; response.data.push(lr); @@ -785,7 +785,7 @@ pub async fn update_name_of_user( axum::http::StatusCode::OK, axum::Json(response::UserUpdateNameResponse { message: String::from(super::messages::SUCCESSFUL_MESSAGE), - data: vec![textsender_models::user::User { + data: vec![schedtxt_models::user::User { id: user.id, phone_number: user.phone_number, firstname: payload.firstname, @@ -844,7 +844,7 @@ pub async fn get_user_profile( match repo::user::get_with_id(&pool, &id).await { Ok(user) => { - let user_profile = textsender_models::user::UserProfile { + let user_profile = schedtxt_models::user::UserProfile { user_id: user.id, phone_number: user.phone_number, firstname: user.firstname, diff --git a/src/callers/register.rs b/src/callers/register.rs index b57127b..41f1fb2 100644 --- a/src/callers/register.rs +++ b/src/callers/register.rs @@ -49,22 +49,22 @@ pub mod response { #[derive(Deserialize, Serialize, utoipa::ToSchema)] pub struct Response { pub message: String, - pub data: Vec, + pub data: Vec, } #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)] pub struct RegisterServiceUserResponse { pub message: String, - pub data: Vec, + pub data: Vec, } } pub fn generate_the_salt() -> ( argon2::password_hash::SaltString, - textsender_models::user::Salt, + schedtxt_models::user::Salt, ) { let salt_string = hashing::generate_salt().unwrap(); - let salt = textsender_models::user::Salt::default(); + let salt = schedtxt_models::user::Salt::default(); (salt_string, salt) } @@ -102,7 +102,7 @@ pub async fn register_user( }; if registration_enabled { - let mut user = textsender_models::user::User { + let mut user = schedtxt_models::user::User { username: payload.username.clone(), password: payload.password.clone(), phone_number: payload.phone_number.clone(), @@ -181,7 +181,7 @@ pub async fn register_user( /// Checks to see if registration is enabled async fn is_registration_enabled() -> Result { let key = String::from("ENABLE_REGISTRATION"); - let var = textsender_models::envy::environment::get_env(&key); + let var = schedtxt_models::envy::environment::get_env(&key); let parsed_value = var.value.to_uppercase(); if parsed_value == "TRUE" { @@ -248,7 +248,7 @@ pub async fn register_service_user( } else { let (generate_salt, mut salt) = generate_the_salt(); salt.id = repo::salt::insert(&pool, &salt).await.unwrap(); - let mut service_user = textsender_models::user::ServiceUser { + let mut service_user = schedtxt_models::user::ServiceUser { username: payload.username.clone(), passphrase: hashing::hash_password(&payload.passphrase, &generate_salt) .unwrap(), diff --git a/src/db/init.rs b/src/db/init.rs index 9d65582..feb110d 100644 --- a/src/db/init.rs +++ b/src/db/init.rs @@ -1,7 +1,7 @@ use sqlx::postgres::PgPoolOptions; pub async fn create_pool() -> Result { - let database_url = textsender_models::envy::environment::get_db_url().value; + let database_url = schedtxt_models::envy::environment::get_db_url().value; println!("Database url: {database_url}"); PgPoolOptions::new() diff --git a/src/lib.rs b/src/lib.rs index ec1f3bd..547890e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -54,11 +54,11 @@ pub mod init { .max_age(std::time::Duration::from_secs(3600)); // Cache the preflight response for 1 hour:cite[2] // Dynamically set the allowed origin based on the environment - match std::env::var(textsender_models::envy::keys::APP_ENV).as_deref() { + match std::env::var(schedtxt_models::envy::keys::APP_ENV).as_deref() { Ok("production") => { let allowed_origins_env = - textsender_models::envy::environment::get_allowed_origins(); - match textsender_models::envy::utility::delimitize(&allowed_origins_env) { + schedtxt_models::envy::environment::get_allowed_origins(); + match schedtxt_models::envy::utility::delimitize(&allowed_origins_env) { Ok(alwd) => { let allowed_origins: Vec = alwd .into_iter() diff --git a/src/main.rs b/src/main.rs index 026e22a..7a05d5b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,10 +3,10 @@ async fn main() { // initialize tracing tracing_subscriber::fmt::init(); - let app = textsender_auth::init::app().await; + let app = schedtxt_auth::init::app().await; // run our app with hyper, listening globally on port 9080 - let url = textsender_auth::config::get_full(); + let url = schedtxt_auth::config::get_full(); let listener = tokio::net::TcpListener::bind(url).await.unwrap(); axum::serve(listener, app).await.unwrap(); } diff --git a/src/repo/mod.rs b/src/repo/mod.rs index 81f37a9..f23edf4 100644 --- a/src/repo/mod.rs +++ b/src/repo/mod.rs @@ -12,7 +12,7 @@ pub mod user { pub async fn get( pool: &sqlx::PgPool, username: &String, - ) -> Result { + ) -> Result { let result = sqlx::query( r#" SELECT id, username, password, phone_number, salt_id, firstname, lastname, created, last_login FROM "user" WHERE username = $1 @@ -24,7 +24,7 @@ pub mod user { match result { Ok(r) => match r { - Some(r) => Ok(textsender_models::user::User { + Some(r) => Ok(schedtxt_models::user::User { id: r.try_get("id")?, username: r.try_get("username")?, password: r.try_get("password")?, @@ -44,7 +44,7 @@ pub mod user { pub async fn get_with_id( pool: &sqlx::PgPool, id: &uuid::Uuid, - ) -> Result { + ) -> Result { match sqlx::query( r#" SELECT id, username, password, phone_number, salt_id, firstname, lastname, created, last_login FROM "user" WHERE id = $1 @@ -54,7 +54,7 @@ pub mod user { .fetch_optional(pool) .await { Ok(r) => match r { - Some(r) => Ok(textsender_models::user::User { + Some(r) => Ok(schedtxt_models::user::User { id: r.try_get("id")?, username: r.try_get("username")?, password: r.try_get("password")?, @@ -73,7 +73,7 @@ pub mod user { pub async fn update_last_login( pool: &sqlx::PgPool, - user: &textsender_models::user::User, + user: &schedtxt_models::user::User, time: &time::OffsetDateTime, ) -> Result { let result = sqlx::query( @@ -106,7 +106,7 @@ pub mod user { pub async fn update_password( pool: &sqlx::PgPool, - user: &textsender_models::user::User, + user: &schedtxt_models::user::User, updated_hashed_password: &String, ) -> Result<(), sqlx::Error> { match sqlx::query( @@ -189,7 +189,7 @@ pub mod user { pub async fn insert( pool: &sqlx::PgPool, - user: &textsender_models::user::User, + user: &schedtxt_models::user::User, ) -> Result<(uuid::Uuid, std::option::Option), sqlx::Error> { let row = sqlx::query( r#" @@ -237,7 +237,7 @@ pub mod salt { pub async fn get( pool: &sqlx::PgPool, id: &uuid::Uuid, - ) -> Result { + ) -> Result { let result = sqlx::query( r#" SELECT id, salt FROM "salt" WHERE id = $1 @@ -249,7 +249,7 @@ pub mod salt { match result { Ok(r) => match r { - Some(r) => Ok(textsender_models::user::Salt { + Some(r) => Ok(schedtxt_models::user::Salt { id: r.try_get("id")?, salt: r.try_get("salt")?, }), @@ -261,7 +261,7 @@ pub mod salt { pub async fn insert( pool: &sqlx::PgPool, - salt: &textsender_models::user::Salt, + salt: &schedtxt_models::user::Salt, ) -> Result { let row = sqlx::query( r#" diff --git a/src/repo/service.rs b/src/repo/service.rs index da80247..09de19e 100644 --- a/src/repo/service.rs +++ b/src/repo/service.rs @@ -52,7 +52,7 @@ pub async fn get_passphrase( pub async fn get( pool: &sqlx::PgPool, id: &uuid::Uuid, -) -> Result { +) -> Result { match sqlx::query( r#"SELECT id, username, passphrase, created, last_login, salt_id FROM "service_user" WHERE id = $1"# ).bind(id) @@ -68,7 +68,7 @@ pub async fn get( } }; - let service_user = textsender_models::user::ServiceUser { + let service_user = schedtxt_models::user::ServiceUser { id: row.try_get("id")?, username: row.try_get("username")?, passphrase: row.try_get("passphrase")?, @@ -88,7 +88,7 @@ pub async fn get( pub async fn get_with_username( pool: &sqlx::PgPool, username: &String, -) -> Result { +) -> Result { match sqlx::query( r#"SELECT id, username, passphrase, created, last_login, salt_id FROM "service_user" WHERE username = $1"# ).bind(username) @@ -104,7 +104,7 @@ pub async fn get_with_username( } }; - let service_user = textsender_models::user::ServiceUser { + let service_user = schedtxt_models::user::ServiceUser { id: row.try_get("id")?, username: row.try_get("username")?, passphrase: row.try_get("passphrase")?, @@ -123,7 +123,7 @@ pub async fn get_with_username( pub async fn update_last_login( pool: &sqlx::PgPool, - service_user: &textsender_models::user::ServiceUser, + service_user: &schedtxt_models::user::ServiceUser, time: &time::OffsetDateTime, ) -> Result { let result = sqlx::query( @@ -156,7 +156,7 @@ pub async fn update_last_login( pub async fn update_passphrase( pool: &sqlx::PgPool, - user: &textsender_models::user::ServiceUser, + user: &schedtxt_models::user::ServiceUser, updated_hashed_passphrase: &String, ) -> Result<(), sqlx::Error> { match sqlx::query( @@ -182,7 +182,7 @@ pub async fn update_passphrase( pub async fn insert( pool: &sqlx::PgPool, - service_user: &textsender_models::user::ServiceUser, + service_user: &schedtxt_models::user::ServiceUser, ) -> Result<(uuid::Uuid, time::OffsetDateTime), sqlx::Error> { match sqlx::query( r#"INSERT INTO "service_user" (username, passphrase, salt_id) diff --git a/src/token_stuff/mod.rs b/src/token_stuff/mod.rs index f4b716e..f07e4f3 100644 --- a/src/token_stuff/mod.rs +++ b/src/token_stuff/mod.rs @@ -8,8 +8,8 @@ use time; pub const KEY_ENV: &str = "SECRET_KEY"; pub const MESSAGE: &str = "Something random"; -pub const ISSUER: &str = "textsender_auth"; -pub const AUDIENCE: &str = "textsender"; +pub const ISSUER: &str = "schedtxt_auth"; +pub const AUDIENCE: &str = "schedtxt"; pub fn get_expiration(issued: &time::OffsetDateTime) -> Result { let duration_expire = time::Duration::hours(4); @@ -19,40 +19,40 @@ pub fn get_expiration(issued: &time::OffsetDateTime) -> Result Result { - let resource = textsender_models::token::TokenResource { +) -> Result { + let resource = schedtxt_models::token::TokenResource { message: String::from(MESSAGE), issuer: String::from(ISSUER), audiences: vec![String::from(AUDIENCE)], user_id: *id, }; - textsender_models::token::create_token(provided_key, resource, time::Duration::hours(4)) + schedtxt_models::token::create_token(provided_key, resource, time::Duration::hours(4)) } pub fn create_service_token( provided: &str, id: &uuid::Uuid, -) -> Result { - let resource = textsender_models::token::TokenResource { +) -> Result { + let resource = schedtxt_models::token::TokenResource { message: String::from(SERVICE_SUBJECT), issuer: String::from(ISSUER), audiences: vec![String::from(AUDIENCE)], user_id: *id, }; - textsender_models::token::create_token(provided, resource, time::Duration::hours(1)) + schedtxt_models::token::create_token(provided, resource, time::Duration::hours(1)) } pub fn create_service_refresh_token( key: &str, id: &uuid::Uuid, -) -> Result { - let resource = textsender_models::token::TokenResource { +) -> Result { + let resource = schedtxt_models::token::TokenResource { message: String::from(SERVICE_SUBJECT), issuer: String::from(ISSUER), audiences: vec![String::from(AUDIENCE)], user_id: *id, }; - textsender_models::token::create_token(key, resource, time::Duration::hours(4)) + schedtxt_models::token::create_token(key, resource, time::Duration::hours(4)) } pub fn verify_token(key: &str, token: &str) -> bool { @@ -78,9 +78,9 @@ pub fn extract_id_from_token(key: &str, token: &str) -> Result Result { @@ -119,7 +119,7 @@ mod tests { #[test] fn test_tokenize() { - let special_key = textsender_models::envy::environment::get_secret_key(); + let special_key = schedtxt_models::envy::environment::get_secret_key(); let id = uuid::Uuid::new_v4(); match create_token(&special_key.value, &id) { Ok(cst) => { diff --git a/tests/tests.rs b/tests/tests.rs index 118013e..bfc56ca 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -1,7 +1,7 @@ -use textsender_auth; -use textsender_auth::callers; -use textsender_auth::db; -use textsender_auth::init; +use schedtxt_auth; +use schedtxt_auth::callers; +use schedtxt_auth::db; +use schedtxt_auth::init; mod db_mgr { use std::str::FromStr; @@ -9,7 +9,7 @@ mod db_mgr { pub const LIMIT: usize = 6; pub async fn get_pool() -> Result { - let tm_db_url = textsender_models::envy::environment::get_db_url().value; + let tm_db_url = schedtxt_models::envy::environment::get_db_url().value; let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap(); sqlx::PgPool::connect_with(tm_options).await } @@ -21,7 +21,7 @@ mod db_mgr { } pub async fn connect_to_db(db_name: &str) -> Result { - let db_url = textsender_models::envy::environment::get_db_url().value; + let db_url = schedtxt_models::envy::environment::get_db_url().value; let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name); sqlx::PgPool::connect_with(options).await } @@ -53,7 +53,7 @@ mod db_mgr { } pub async fn get_database_name() -> Result> { - let database_url = textsender_models::envy::environment::get_db_url().value; + let database_url = schedtxt_models::envy::environment::get_db_url().value; let parsed_url = url::Url::parse(&database_url)?; if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" { @@ -231,7 +231,7 @@ pub mod requests { user_id: &uuid::Uuid, ) -> Result { let url = super::util::format_url_with_value( - textsender_auth::callers::endpoints::GET_USER_PROFILE, + schedtxt_auth::callers::endpoints::GET_USER_PROFILE, user_id, ); match axum::http::Request::builder() @@ -308,7 +308,7 @@ mod flow { pub async fn register_user( app: &axum::Router, - ) -> Result { + ) -> Result { match requests::register_user(&app).await { Ok(response) => { if axum::http::StatusCode::CREATED != response.status() { @@ -340,7 +340,7 @@ mod flow { app: &axum::Router, username: &str, password: &str, - ) -> Result { + ) -> Result { match requests::login_user(&app, username, password).await { Ok(response) => { if axum::http::StatusCode::OK != response.status() { @@ -372,7 +372,7 @@ mod flow { pub async fn register_service_user( app: &axum::Router, - ) -> Result { + ) -> Result { match requests::register_service_user(&app).await { Ok(response) => { if axum::http::StatusCode::CREATED != response.status() { @@ -406,7 +406,7 @@ mod flow { app: &axum::Router, username: &str, passphrase: &str, - ) -> Result { + ) -> Result { match requests::login_service_user(&app, username, passphrase).await { Ok(response) => { if axum::http::StatusCode::OK != response.status() { @@ -439,7 +439,7 @@ mod flow { pub async fn refresh_token( app: &axum::Router, access_token: &str, - ) -> Result { + ) -> Result { match requests::refresh_token(app, access_token).await { Ok(response) => { if axum::http::StatusCode::OK != response.status() { @@ -518,7 +518,7 @@ mod flow { user_id: &uuid::Uuid, firstname: &str, lastname: &str, - ) -> Result { + ) -> Result { match requests::update_name_of_user(app, user_id, firstname, lastname).await { Ok(response) => { if axum::http::StatusCode::OK != response.status() { @@ -1063,7 +1063,7 @@ async fn test_get_user_profile() { match requests::get_user_profile(&app, &user_id).await { Ok(response) => { match util::convert_response::< - textsender_auth::callers::login::response::GetUserProfileResponse, + schedtxt_auth::callers::login::response::GetUserProfileResponse, >(response) .await {