Update dependencies (#17)

Reviewed-on: phoenix/textsender_auth#17

.env.docker.sample

@@ -1,10 +1,10 @@
 SECRET_KEY=NULqYIzgt28bTiyziCd7IOO7b6LnWDW!
-DB_NAME=textsender_auth_db
+DB_AUTH_NAME=textsender_auth_db
-DB_USER=textsender_auth
+DB_AUTH_USER=textsender_auth
-DB_PASSWORD=password
+DB_AUTH_PASSWORD=password
-DB_HOST=auth_db
+DB_AUTH_HOST=auth_db
-DB_PORT=5432
+DB_AUTH_PORT=5432
-DB_SSLMODE=disable
+DB_AUTH_SSLMODE=disable
-DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:5432/${DB_NAME}
+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"

.env.local.sample

@@ -1,10 +1,10 @@
 SECRET_KEY=NULqYIzgt28bTiyziCd7IOO7b6LnWDW!
-DB_NAME=textsender_auth_db
+DB_AUTH_NAME=textsender_auth_db
-DB_USER=textsender_auth
+DB_AUTH_USER=textsender_auth
-DB_PASSWORD=password
+DB_AUTH_PASSWORD=password
-DB_HOST=localhost
+DB_AUTH_HOST=localhost
-DB_PORT=5432
+DB_AUTH_PORT=5432
-DB_SSLMODE=disable
+DB_AUTH_SSLMODE=disable
-DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:5432/${DB_NAME}
+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"

.gitea/workflows/pr.yml

@@ -0,0 +1,72 @@
+name: Rust Build
+
+on:
+  pull_request:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96
+      - 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
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+
+          cargo check
+
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
+      - 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
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+          cargo fmt --all -- --check
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
+      - 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
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+          cargo clippy -- -D warnings

.gitea/workflows/workflow.yml

@@ -4,9 +4,10 @@ on:
   push:
     branches:
       - main
-  pull_request:
+
-    branches:
+concurrency:
-      - main
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   check:
@@ -16,7 +17,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
@@ -35,12 +36,13 @@ jobs:
     # --- Add database service definition ---
     services:
       postgres:
-        image: postgres:18.3-alpine
+        image: postgres:18.4-alpine
         env:
           # Use secrets for DB init, with fallbacks for flexibility
           POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
           POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}
           POSTGRES_DB: ${{ secrets.DB_TEST_NAME || 'testdb' }}
+          POSTGRES_PORT: ${{ secrets.DB_PORT || 5432 }}
         # Options to wait until the database is ready
         options: >-
           --health-cmd pg_isready
@@ -52,7 +54,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       # --- Add this step for explicit verification ---
       - name: Verify Docker Environment
@@ -71,7 +73,7 @@ jobs:
       - name: Run tests
         env:
           # Define DATABASE_URL for tests to use
-          DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }}
+          DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:${{ secrets.DB_PORT || 5432 }}/${{ secrets.DB_TEST_NAME || 'testdb' }}
           RUST_LOG: info # Optional: configure test log level
           SECRET_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
           # Make SSH agent available if tests fetch private dependencies
@@ -95,7 +97,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: |
@@ -115,7 +117,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: |
@@ -135,7 +137,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh

.gitignore

@@ -1,5 +1,3 @@
-/textsender-auth
-
 .env
 .env.local
 .env.docker

Cargo.toml

@@ -1,27 +1,27 @@
 [package]
 name = "textsender_auth"
-version = "0.1.16"
+version = "0.2.0"
 edition = "2024"
-rust-version = "1.95"
+rust-version = "1.96"
 
 [dependencies]
 axum = { version = "0.8.9" }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.149" }
+serde_json = { version = "1.0.150" }
-tokio = { version = "1.52.2", features = ["rt-multi-thread"] }
+tokio = { version = "1.52.3", features = ["rt-multi-thread"] }
 tracing-subscriber = { version = "0.3.23" }
 tower = { version = "0.5.3", features = ["full"] }
-tower-http = { version = "0.6.10", features = ["cors"] }
+tower-http = { version = "0.6.11", features = ["cors"] }
-hyper = { version = "1.9.0" }
+hyper = { version = "1.10.1" }
-sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio-native-tls", "time", "uuid"] }
+sqlx = { version = "0.9.0", features = ["runtime-tokio", "tls-native-tls", "postgres", "time", "uuid"] }
-uuid = { version = "1.23.1", features = ["v4", "serde"] }
+uuid = { version = "1.23.3", features = ["v4", "serde"] }
 argon2 = { version = "0.5.3", features = ["std"] } # Use the latest 0.5.x version
 rand = { version = "0.10.1" }
-time = { version = "0.3.47", features = ["macros", "serde"] }
+time = { version = "0.3.49", 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.3.0" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10", features = ["config", "user"] }
 
 [dev-dependencies]
 http-body-util = { version = "0.1.3" }

Dockerfile

@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 # Use a specific Rust version for reproducibility. Choose one that matches your development environment.
 # Using slim variant for smaller base image
-FROM rust:1.95 as builder
+FROM rust:1.96 as builder
 
 # Set the working directory inside the container
 WORKDIR /usr/src/app

docker-compose.yml

@@ -23,13 +23,14 @@ services:
     container_name: textsender_auth_db # Optional: Give the container a specific name
     environment:
       # These MUST match the user, password, and database name in the DATABASE_URL above
-      POSTGRES_USER: ${DB_USER:-textsender_op}
+      POSTGRES_USER: ${DB_AUTH_USER:-textsender_op}
-      POSTGRES_PASSWORD: ${DB_PASSWORD:-password}
+      POSTGRES_PASSWORD: ${DB_AUTH_PASSWORD:-password}
-      POSTGRES_DB: ${DB_NAME:-textsender_auth_db}
+      POSTGRES_DB: ${DB_AUTH_NAME:-textsender_auth_db}
     volumes:
       # Persist database data using a named volume
       - postgres_data:/var/lib/postgresql
-    ports: []
+    ports:
+      - "5433:5432"
     healthcheck:
         # Checks if Postgres is ready to accept connections
         test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]

migrations/schema.sql

@@ -1,32 +0,0 @@
--- CREATE EXTENSION IF NOT EXISTS pgcrypto;
--- CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
--- 
--- DROP TABLE IF EXISTS "user" CASCADE;
--- DROP TABLE IF EXISTS "salt" CASCADE;
--- DROP TABLE IF EXISTS "service_user" CASCADE;
--- 
--- CREATE TABLE IF NOT EXISTS "user" (
---     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
---     first_name TEXT NOT NULL,
---     last_name TEXT NOT NULL,
---     phone_number TEXT NOT NULL,
---     username TEXT NOT NULL,
---     password TEXT NOT NULL,
---     created TIMESTAMPTZ NOT NULL DEFAULT NOW(),
---     last_login TIMESTAMPTZ NOT NULL DEFAULT NOW(),
---     salt_id UUID NOT NULL
--- );
--- 
--- 
--- CREATE TABLE IF NOT EXISTS "salt" (
---     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
---     salt TEXT NOT NULL
--- );
--- 
--- CREATE TABLE IF NOT EXISTS "service_user" (
---     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
---     username TEXT NOT NULL,
---     passphrase TEXT NOT NULL,
---     created TIMESTAMPTZ NOT NULL DEFAULT NOW(),
---     last_login timestamptz NULL
--- );

src/callers/login.rs

@@ -9,6 +9,74 @@ pub mod request {
         pub username: String,
         pub password: String,
     }
+
+    #[derive(Deserialize, utoipa::ToSchema)]
+    pub struct ServiceUserLoginRequest {
+        pub username: String,
+        pub passphrase: String,
+    }
+
+    impl ServiceUserLoginRequest {
+        pub fn is_empty(&self) -> (bool, Option<String>) {
+            if self.username.is_empty() && self.passphrase.is_empty() {
+                (
+                    true,
+                    Some(String::from("Username and passphrase are empty")),
+                )
+            } else if self.username.is_empty() {
+                (true, Some(String::from("Username is empty")))
+            } else if self.username.is_empty() {
+                (true, Some(String::from("Passphrase is empty")))
+            } else {
+                (false, None)
+            }
+        }
+    }
+
+    #[derive(Deserialize, utoipa::ToSchema)]
+    pub struct RefreshTokenRequest {
+        pub access_token: String,
+    }
+
+    #[derive(Deserialize, utoipa::ToSchema)]
+    pub struct UpdatePasswordRequest {
+        pub user_id: uuid::Uuid,
+        pub current_password: String,
+        pub updated_password: String,
+        pub confirmed_password: String,
+    }
+
+    impl UpdatePasswordRequest {
+        pub fn is_valid(&self) -> bool {
+            if self.user_id.is_nil()
+                || self.current_password.is_empty()
+                || self.updated_password.is_empty()
+                || self.confirmed_password.is_empty()
+            {
+                false
+            } else {
+                self.updated_password == self.confirmed_password
+            }
+        }
+    }
+
+    #[derive(Deserialize, utoipa::ToSchema)]
+    pub struct UserUpdateNameRequest {
+        pub user_id: uuid::Uuid,
+        pub firstname: String,
+        pub lastname: String,
+    }
+
+    impl UserUpdateNameRequest {
+        pub fn is_valid(&self) -> (bool, Option<String>) {
+            if self.user_id.is_nil() || self.firstname.is_empty() || self.lastname.is_empty() {
+                let reason = String::from("Missing fields");
+                (false, Some(reason))
+            } else {
+                (true, None)
+            }
+        }
+    }
 }
 
 pub mod response {
@@ -19,6 +87,12 @@ pub mod response {
         pub data: Vec<textsender_models::token::LoginResult>,
     }
 
+    #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct ServiceUserLoginResponse {
+        pub message: String,
+        pub data: Vec<textsender_models::token::LoginResult>,
+    }
+
     pub async fn extract(
         response: axum::response::Response,
     ) -> Result<LoginResponse, std::io::Error> {
@@ -28,6 +102,24 @@ pub mod response {
         let _parsed_body: LoginResponse = serde_json::from_slice(&body).unwrap();
         todo!("Add code to convert axum::Response to this type");
     }
+
+    #[derive(Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct RefreshTokenResponse {
+        pub message: String,
+        pub data: Vec<textsender_models::token::LoginResult>,
+    }
+
+    #[derive(Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct UpdatePasswordResponse {
+        pub message: String,
+        pub data: Vec<uuid::Uuid>,
+    }
+
+    #[derive(Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct UserUpdateNameResponse {
+        pub message: String,
+        pub data: Vec<textsender_models::user::User>,
+    }
 }
 
 /// Endpoint for a user login
@@ -97,10 +189,9 @@ pub async fn user_login(
                                 let key = textsender_models::envy::environment::get_secret_key()
                                     .await
                                     .value;
-                                let (token_literal, duration) =
+                                let cst = token_stuff::create_token(&key, &user.id).unwrap();
-                                    token_stuff::create_token(&key, &user.id).unwrap();
 
-                                if token_stuff::verify_token(&key, &token_literal) {
+                                if token_stuff::verify_token(&key, &cst.access_token) {
                                     let current_time = time::OffsetDateTime::now_utc();
                                     let _ =
                                         repo::user::update_last_login(&pool, &user, &current_time)
@@ -112,12 +203,12 @@ pub async fn user_login(
                                             message: String::from("Successful"),
                                             data: vec![textsender_models::token::LoginResult {
                                                 user_id: user.id,
-                                                access_token: token_literal,
+                                                access_token: cst.access_token,
                                                 token_type: String::from(
                                                     textsender_models::token::TOKEN_TYPE,
                                                 ),
-                                                issued_at: duration,
+                                                issued_at: cst.issued,
-                                                ..Default::default()
+                                                expires_in: cst.expires_in,
                                             }],
                                         }),
                                     )
@@ -160,3 +251,548 @@ pub async fn user_login(
         }
     }
 }
+
+/// Endpoint for service user login
+#[utoipa::path(
+    post,
+    path = super::endpoints::LOGIN_SERVICE_USER,
+    request_body(
+        content = request::ServiceUserLoginRequest,
+        description = "Data required for service user to lgoin",
+        content_type = "application/json"
+    ),
+    responses(
+        (status = 201, description = "Service uuser login successful", body = response::ServiceUserLoginResponse),
+        (status = 400, description = "Bad data", body = response::ServiceUserLoginResponse),
+        (status = 500, description = "Something went wrong", body = response::ServiceUserLoginResponse)
+    )
+)]
+pub async fn service_user_login(
+    axum::Extension(pool): axum::Extension<sqlx::PgPool>,
+    axum::Json(payload): axum::Json<request::ServiceUserLoginRequest>,
+) -> (
+    axum::http::StatusCode,
+    axum::Json<response::ServiceUserLoginResponse>,
+) {
+    if payload.username.is_empty() || payload.passphrase.is_empty() {
+        let reason = if payload.username.is_empty() {
+            String::from("Username not provided")
+        } else {
+            String::from("Passphrase not provided")
+        };
+
+        (
+            axum::http::StatusCode::BAD_REQUEST,
+            axum::Json(response::ServiceUserLoginResponse {
+                message: reason,
+                data: Vec::new(),
+            }),
+        )
+    } else {
+        match repo::service::exists(&pool, &payload.username).await {
+            Ok(exists) => {
+                if !exists {
+                    println!("User does not exists");
+                    (
+                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                        axum::Json(response::ServiceUserLoginResponse {
+                            message: String::from("Unable to login"),
+                            data: Vec::new(),
+                        }),
+                    )
+                } else {
+                    println!("Good to create");
+                    let service_user =
+                        match repo::service::get_with_username(&pool, &payload.username).await {
+                            Ok(service_user) => service_user,
+                            Err(err) => {
+                                eprintln!("Error: {err:?}");
+                                return (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response::ServiceUserLoginResponse {
+                                        message: String::from("Unable to login"),
+                                        data: Vec::new(),
+                                    }),
+                                );
+                            }
+                        };
+                    println!("Service user: {service_user:?}");
+                    println!("Payload: {:?}", payload.passphrase);
+                    let hashed_password = service_user.passphrase.clone();
+                    println!("Hash password: {hashed_password:?}");
+
+                    match hashing::verify_password(&payload.passphrase, hashed_password) {
+                        Ok(matches) => {
+                            if matches {
+                                // Create token
+                                println!("Creating token");
+                                let key = textsender_models::envy::environment::get_secret_key()
+                                    .await
+                                    .value;
+                                let cst =
+                                    token_stuff::create_token(&key, &service_user.id).unwrap();
+
+                                if token_stuff::verify_token(&key, &cst.access_token) {
+                                    let current_time = time::OffsetDateTime::now_utc();
+                                    let _ = repo::service::update_last_login(
+                                        &pool,
+                                        &service_user,
+                                        &current_time,
+                                    )
+                                    .await;
+
+                                    (
+                                        axum::http::StatusCode::OK,
+                                        axum::Json(response::ServiceUserLoginResponse {
+                                            message: String::from(
+                                                super::messages::SUCCESSFUL_MESSAGE,
+                                            ),
+                                            data: vec![textsender_models::token::LoginResult {
+                                                user_id: service_user.id,
+                                                access_token: cst.access_token,
+                                                token_type: String::from(
+                                                    textsender_models::token::TOKEN_TYPE,
+                                                ),
+                                                issued_at: cst.issued,
+                                                expires_in: cst.expires_in,
+                                            }],
+                                        }),
+                                    )
+                                } else {
+                                    eprintln!("Invalid token");
+                                    (
+                                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                        axum::Json(response::ServiceUserLoginResponse {
+                                            message: String::from("Invalid attempt"),
+                                            data: Vec::new(),
+                                        }),
+                                    )
+                                }
+                            } else {
+                                eprintln!("No match");
+                                (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response::ServiceUserLoginResponse {
+                                        message: String::from("Invalid attempt"),
+                                        data: Vec::new(),
+                                    }),
+                                )
+                            }
+                        }
+                        Err(err) => (
+                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                            axum::Json(response::ServiceUserLoginResponse {
+                                message: err.to_string(),
+                                data: Vec::new(),
+                            }),
+                        ),
+                    }
+                }
+            }
+            Err(err) => (
+                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                axum::Json(response::ServiceUserLoginResponse {
+                    message: err.to_string(),
+                    data: Vec::new(),
+                }),
+            ),
+        }
+    }
+}
+
+/// Endpoint for service user login
+#[utoipa::path(
+    post,
+    path = super::endpoints::REFRESH_TOKEN,
+    request_body(
+        content = request::RefreshTokenRequest,
+        description = "Data required refresh token",
+        content_type = "application/json"
+    ),
+    responses(
+        (status = 200, description = "Service uuser login successful", body = response::RefreshTokenResponse),
+        (status = 400, description = "Bad data", body = response::RefreshTokenResponse),
+        (status = 500, description = "Something went wrong", body = response::RefreshTokenResponse)
+    )
+)]
+pub async fn refresh_token(
+    axum::Extension(pool): axum::Extension<sqlx::PgPool>,
+    axum::Json(payload): axum::Json<request::RefreshTokenRequest>,
+) -> (
+    axum::http::StatusCode,
+    axum::Json<response::RefreshTokenResponse>,
+) {
+    if payload.access_token.is_empty() {
+        let reason = String::from("Access token not provided");
+
+        (
+            axum::http::StatusCode::BAD_REQUEST,
+            axum::Json(response::RefreshTokenResponse {
+                message: reason,
+                data: Vec::new(),
+            }),
+        )
+    } else {
+        let key = textsender_models::envy::environment::get_secret_key()
+            .await
+            .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<textsender_models::token::CreateTokenResult> {
+                            token_stuff::create_service_refresh_token(key, id).ok()
+                        };
+
+                    let mut response = response::RefreshTokenResponse {
+                        message: String::new(),
+                        data: Vec::new(),
+                    };
+
+                    match repo::user::get_with_id(&pool, &id).await {
+                        Ok(_user) => match generate_service_token(&id, &key) {
+                            Some(cst) => {
+                                response.message =
+                                    String::from(super::messages::SUCCESSFUL_MESSAGE);
+                                let lr = textsender_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),
+                                };
+                                response.data.push(lr);
+                                (axum::http::StatusCode::OK, axum::Json(response))
+                            }
+                            None => (
+                                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                axum::Json(response::RefreshTokenResponse {
+                                    message: String::from("Refresh token not generated"),
+                                    data: Vec::new(),
+                                }),
+                            ),
+                        },
+                        Err(err) => {
+                            println!("Unable to find user, checking service user: {err:?}");
+                            match repo::service::get(&pool, &id).await {
+                                Ok(_service_user) => match generate_service_token(&id, &key) {
+                                    Some(cst) => {
+                                        response.message =
+                                            String::from(super::messages::SUCCESSFUL_MESSAGE);
+                                        let lr = textsender_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,
+                                            ),
+                                        };
+                                        response.data.push(lr);
+                                        (axum::http::StatusCode::OK, axum::Json(response))
+                                    }
+                                    None => (
+                                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                        axum::Json(response::RefreshTokenResponse {
+                                            message: String::from("Issued at not returned"),
+                                            data: Vec::new(),
+                                        }),
+                                    ),
+                                },
+                                Err(err) => (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response::RefreshTokenResponse {
+                                        message: err.to_string(),
+                                        data: Vec::new(),
+                                    }),
+                                ),
+                            }
+                        }
+                    }
+                }
+                Err(err) => (
+                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                    axum::Json(response::RefreshTokenResponse {
+                        message: err.to_string(),
+                        data: Vec::new(),
+                    }),
+                ),
+            }
+        } else {
+            (
+                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                axum::Json(response::RefreshTokenResponse {
+                    message: String::from("Unable to verify token"),
+                    data: Vec::new(),
+                }),
+            )
+        }
+    }
+}
+
+/// Endpoint for a updating password
+#[utoipa::path(
+    patch,
+    path = super::endpoints::UPDATE_PASSWORD,
+    request_body(
+        content = request::UpdatePasswordRequest,
+        description = "Data required to update password",
+        content_type = "application/json"
+    ),
+    responses(
+        (status = 200, description = "User login successful", body = response::UpdatePasswordResponse),
+        (status = 400, description = "Bad data", body = response::UpdatePasswordResponse),
+        (status = 500, description = "Something went wrong", body = response::UpdatePasswordResponse)
+    )
+)]
+pub async fn update_password(
+    axum::Extension(pool): axum::Extension<sqlx::PgPool>,
+    axum::Json(payload): axum::Json<request::UpdatePasswordRequest>,
+) -> (
+    axum::http::StatusCode,
+    axum::Json<response::UpdatePasswordResponse>,
+) {
+    if !payload.is_valid() {
+        (
+            axum::http::StatusCode::BAD_REQUEST,
+            axum::Json(response::UpdatePasswordResponse {
+                message: String::from("Invalid passwords"),
+                data: Vec::new(),
+            }),
+        )
+    } else {
+        let verify_password = |current_password, hashed_password| -> Result<bool, std::io::Error> {
+            match hashing::verify_password(current_password, hashed_password) {
+                Ok(matches) => Ok(matches),
+                Err(err) => Err(std::io::Error::other(err.to_string())),
+            }
+        };
+
+        match repo::user::get_with_id(&pool, &payload.user_id).await {
+            Ok(user) => {
+                let hashed_password = user.password.clone();
+                match verify_password(&payload.current_password, hashed_password) {
+                    Ok(matches) => {
+                        if matches {
+                            let (generate_salt, mut salt) = super::register::generate_the_salt();
+                            salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
+                            let updated_hashed_password = match hashing::hash_password(
+                                &payload.updated_password,
+                                &generate_salt,
+                            ) {
+                                Ok(hashed) => hashed,
+                                Err(err) => {
+                                    eprintln!("Error: {err:?}");
+                                    String::new()
+                                }
+                            };
+
+                            match repo::user::update_password(
+                                &pool,
+                                &user,
+                                &updated_hashed_password,
+                            )
+                            .await
+                            {
+                                Ok(()) => (
+                                    axum::http::StatusCode::OK,
+                                    axum::Json(response::UpdatePasswordResponse {
+                                        message: String::from(super::messages::SUCCESSFUL_MESSAGE),
+                                        data: vec![user.id],
+                                    }),
+                                ),
+                                Err(err) => (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response::UpdatePasswordResponse {
+                                        message: err.to_string(),
+                                        data: Vec::new(),
+                                    }),
+                                ),
+                            }
+                        } else {
+                            (
+                                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                axum::Json(response::UpdatePasswordResponse {
+                                    message: String::from("Issue updating password"),
+                                    data: Vec::new(),
+                                }),
+                            )
+                        }
+                    }
+                    Err(err) => (
+                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                        axum::Json(response::UpdatePasswordResponse {
+                            message: err.to_string(),
+                            data: Vec::new(),
+                        }),
+                    ),
+                }
+            }
+            Err(err) => {
+                println!("No User found, trying Service User: {err:?}");
+
+                // Try service user
+                match repo::service::get(&pool, &payload.user_id).await {
+                    Ok(service_user) => {
+                        let hashed_password = service_user.passphrase.clone();
+                        match verify_password(&payload.current_password, hashed_password) {
+                            Ok(matches) => {
+                                if matches {
+                                    let (generate_salt, mut salt) =
+                                        super::register::generate_the_salt();
+                                    salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
+                                    let updated_hashed_password = match hashing::hash_password(
+                                        &payload.updated_password,
+                                        &generate_salt,
+                                    ) {
+                                        Ok(hashed) => hashed,
+                                        Err(err) => {
+                                            eprintln!("Error: {err:?}");
+                                            String::new()
+                                        }
+                                    };
+
+                                    match repo::service::update_passphrase(
+                                        &pool,
+                                        &service_user,
+                                        &updated_hashed_password,
+                                    )
+                                    .await
+                                    {
+                                        Ok(()) => (
+                                            axum::http::StatusCode::OK,
+                                            axum::Json(response::UpdatePasswordResponse {
+                                                message: String::from(
+                                                    super::messages::SUCCESSFUL_MESSAGE,
+                                                ),
+                                                data: vec![service_user.id],
+                                            }),
+                                        ),
+                                        Err(err) => (
+                                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                            axum::Json(response::UpdatePasswordResponse {
+                                                message: err.to_string(),
+                                                data: Vec::new(),
+                                            }),
+                                        ),
+                                    }
+                                } else {
+                                    (
+                                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                        axum::Json(response::UpdatePasswordResponse {
+                                            message: String::from("Issue updating password"),
+                                            data: Vec::new(),
+                                        }),
+                                    )
+                                }
+                            }
+                            Err(err) => (
+                                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                axum::Json(response::UpdatePasswordResponse {
+                                    message: err.to_string(),
+                                    data: Vec::new(),
+                                }),
+                            ),
+                        }
+                    }
+                    Err(err) => (
+                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                        axum::Json(response::UpdatePasswordResponse {
+                            message: err.to_string(),
+                            data: Vec::new(),
+                        }),
+                    ),
+                }
+            }
+        }
+    }
+}
+
+/// Endpoint for a updating password
+#[utoipa::path(
+    patch,
+    path = super::endpoints::UPDATE_USER_NAME,
+    request_body(
+        content = request::UserUpdateNameRequest,
+        description = "Data required to update name of a user",
+        content_type = "application/json"
+    ),
+    responses(
+        (status = 200, description = "Names were updated", body = response::UserUpdateNameResponse),
+        (status = 304, description = "Nothing to change", body = response::UserUpdateNameResponse),
+        (status = 400, description = "Bad data", body = response::UserUpdateNameResponse),
+        (status = 500, description = "Something went wrong", body = response::UserUpdateNameResponse)
+    )
+)]
+pub async fn update_name_of_user(
+    axum::Extension(pool): axum::Extension<sqlx::PgPool>,
+    axum::Json(payload): axum::Json<request::UserUpdateNameRequest>,
+) -> (
+    axum::http::StatusCode,
+    axum::Json<response::UserUpdateNameResponse>,
+) {
+    let (valid_request, reason) = payload.is_valid();
+    if !valid_request {
+        (
+            axum::http::StatusCode::BAD_REQUEST,
+            axum::Json(response::UserUpdateNameResponse {
+                message: reason.unwrap_or_default(),
+                data: Vec::new(),
+            }),
+        )
+    } else {
+        match repo::user::get_with_id(&pool, &payload.user_id).await {
+            Ok(user) => {
+                if user.firstname == payload.firstname || user.lastname == payload.lastname {
+                    (
+                        axum::http::StatusCode::NOT_MODIFIED,
+                        axum::Json(response::UserUpdateNameResponse {
+                            message: String::from("No change"),
+                            data: Vec::new(),
+                        }),
+                    )
+                } else {
+                    match repo::user::update_name(
+                        &pool,
+                        &user.id,
+                        &payload.firstname,
+                        &payload.lastname,
+                    )
+                    .await
+                    {
+                        Ok(_) => (
+                            axum::http::StatusCode::OK,
+                            axum::Json(response::UserUpdateNameResponse {
+                                message: String::from(super::messages::SUCCESSFUL_MESSAGE),
+                                data: vec![textsender_models::user::User {
+                                    id: user.id,
+                                    phone_number: user.phone_number,
+                                    firstname: payload.firstname,
+                                    lastname: payload.lastname,
+                                    username: user.username,
+                                    created: user.created,
+                                    last_login: user.last_login,
+                                    ..Default::default()
+                                }],
+                            }),
+                        ),
+                        Err(err) => (
+                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                            axum::Json(response::UserUpdateNameResponse {
+                                message: err.to_string(),
+                                data: Vec::new(),
+                            }),
+                        ),
+                    }
+                }
+            }
+            Err(err) => (
+                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                axum::Json(response::UserUpdateNameResponse {
+                    message: err.to_string(),
+                    data: Vec::new(),
+                }),
+            ),
+        }
+    }
+}

src/callers/mod.rs

@@ -11,4 +11,12 @@ pub mod endpoints {
     pub const DBTEST: &str = "/api/v1/test/db";
     /// Endpoint constant for service user registration
     pub const REGISTER_SERVICE_USER: &str = "/api/v1/service/register";
+    /// Endpoint constant for service login user
+    pub const LOGIN_SERVICE_USER: &str = "/api/v1/service/login";
+    /// Endpoint constant for refresh token
+    pub const REFRESH_TOKEN: &str = "/api/v1/token/refresh";
+    /// Endpoint constant for updating password
+    pub const UPDATE_PASSWORD: &str = "/api/v1/user/password/update";
+    /// Endpoint constant for updating user's name
+    pub const UPDATE_USER_NAME: &str = "/api/v1/user/name/update";
 }

src/callers/register.rs

@@ -59,7 +59,7 @@ pub mod response {
     }
 }
 
-fn generate_the_salt() -> (
+pub fn generate_the_salt() -> (
     argon2::password_hash::SaltString,
     textsender_models::user::Salt,
 ) {
@@ -252,7 +252,7 @@ pub async fn register_service_user(
                         salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
                         let mut service_user = textsender_models::user::ServiceUser {
                             username: payload.username.clone(),
-                            passphrase: hashing::hash_password(&payload.username, &generate_salt)
+                            passphrase: hashing::hash_password(&payload.passphrase, &generate_salt)
                                 .unwrap(),
                             salt_id: salt.id,
                             ..Default::default()
@@ -261,9 +261,10 @@ pub async fn register_service_user(
                         println!("Creating user");
 
                         match repo::service::insert(&pool, &service_user).await {
-                            Ok(created) => {
+                            Ok((service_user_id, created)) => {
                                 resp.message = String::from(super::messages::SUCCESSFUL_MESSAGE);
                                 service_user.created = Some(created);
+                                service_user.id = service_user_id;
                                 resp.data.push(service_user);
                                 (axum::http::StatusCode::CREATED, axum::Json(resp))
                             }

src/lib.rs

@@ -8,7 +8,7 @@ pub mod token_stuff;
 pub mod init {
     use axum::{
         Router,
-        routing::{get, post},
+        routing::{get, patch, post},
     };
     use utoipa::OpenApi;
 
@@ -102,6 +102,22 @@ pub mod init {
                 post(callers::register::register_service_user),
             )
             .route(callers::endpoints::LOGIN, post(callers::login::user_login))
+            .route(
+                callers::endpoints::LOGIN_SERVICE_USER,
+                post(callers::login::service_user_login),
+            )
+            .route(
+                callers::endpoints::REFRESH_TOKEN,
+                post(callers::login::refresh_token),
+            )
+            .route(
+                callers::endpoints::UPDATE_PASSWORD,
+                patch(callers::login::update_password),
+            )
+            .route(
+                callers::endpoints::UPDATE_USER_NAME,
+                patch(callers::login::update_name_of_user),
+            )
             .layer(cors::configure_cors().await)
     }
 

src/repo/mod.rs

@@ -41,6 +41,36 @@ pub mod user {
         }
     }
 
+    pub async fn get_with_id(
+        pool: &sqlx::PgPool,
+        id: &uuid::Uuid,
+    ) -> Result<textsender_models::user::User, sqlx::Error> {
+        match sqlx::query(
+            r#"
+        SELECT id, username, password, phone_number, salt_id, firstname, lastname, created, last_login FROM "user" WHERE id = $1
+        "#,
+        )
+        .bind(id)
+        .fetch_optional(pool)
+        .await {
+            Ok(r) => match r {
+                Some(r) => Ok(textsender_models::user::User {
+                    id: r.try_get("id")?,
+                    username: r.try_get("username")?,
+                    password: r.try_get("password")?,
+                    phone_number: r.try_get("phone_number")?,
+                    salt_id: r.try_get("salt_id")?,
+                    firstname: r.try_get("firstname")?,
+                    lastname: r.try_get("lastname")?,
+                    created: r.try_get("created")?,
+                    last_login: r.try_get("last_login")?,
+                }),
+                None => Err(sqlx::Error::RowNotFound),
+            },
+            Err(e) => Err(e),
+        }
+    }
+
     pub async fn update_last_login(
         pool: &sqlx::PgPool,
         user: &textsender_models::user::User,
@@ -74,6 +104,60 @@ pub mod user {
         }
     }
 
+    pub async fn update_password(
+        pool: &sqlx::PgPool,
+        user: &textsender_models::user::User,
+        updated_hashed_password: &String,
+    ) -> Result<(), sqlx::Error> {
+        match sqlx::query(
+            r#"
+            UPDATE "user" SET password = $1 WHERE id = $2
+            "#,
+        )
+        .bind(updated_hashed_password)
+        .bind(user.id)
+        .execute(pool)
+        .await
+        {
+            Ok(row) => {
+                if row.rows_affected() > 0 {
+                    Ok(())
+                } else {
+                    Err(sqlx::Error::RowNotFound)
+                }
+            }
+            Err(err) => Err(err),
+        }
+    }
+
+    pub async fn update_name(
+        pool: &sqlx::PgPool,
+        id: &uuid::Uuid,
+        firstname: &str,
+        lastname: &str,
+    ) -> Result<(), sqlx::Error> {
+        match sqlx::query(
+            r#"
+            UPDATE "user" SET firstname = $1, lastname = $2 WHERE id = $3
+            "#,
+        )
+        .bind(firstname)
+        .bind(lastname)
+        .bind(id)
+        .execute(pool)
+        .await
+        {
+            Ok(row) => {
+                if row.rows_affected() > 0 {
+                    Ok(())
+                } else {
+                    Err(sqlx::Error::RowNotFound)
+                }
+            }
+            Err(err) => Err(err),
+        }
+    }
+
     pub async fn exists(pool: &sqlx::PgPool, username: &String) -> Result<bool, sqlx::Error> {
         let result = sqlx::query(
             r#"

src/repo/service.rs

@@ -49,22 +49,32 @@ pub async fn get_passphrase(
     }
 }
 
-pub async fn get_with_username(
+pub async fn get(
     pool: &sqlx::PgPool,
-    username: &String,
+    id: &uuid::Uuid,
 ) -> Result<textsender_models::user::ServiceUser, sqlx::Error> {
     match sqlx::query(
-        r#"SELECT id, username, passphrase, created, last_login FROM "service_user" WHERE username = $1"#
+        r#"SELECT id, username, passphrase, created, last_login, salt_id FROM "service_user" WHERE id = $1"#
-        ).bind(username)
+        ).bind(id)
         .fetch_one(pool).await {
         Ok(row) => {
+            let last_login: Option<time::OffsetDateTime> = match row.try_get("last_login") {
+                Ok(login) => {
+                    Some(login)
+                }
+                Err(err) => {
+                    eprintln!("Error: {err:?}");
+                    None
+                }
+            };
+
             let service_user = textsender_models::user::ServiceUser {
                 id: row.try_get("id")?,
                 username: row.try_get("username")?,
                 passphrase: row.try_get("passphrase")?,
                 created: row.try_get("created")?,
-                last_login: row.try_get("last_login")?,
+                last_login,
-                salt_id: row.try_get("salt_id")?
+                salt_id: row.try_get("salt_id")?,
             };
 
             Ok(service_user)
@@ -75,14 +85,109 @@ pub async fn get_with_username(
     }
 }
 
+pub async fn get_with_username(
+    pool: &sqlx::PgPool,
+    username: &String,
+) -> Result<textsender_models::user::ServiceUser, sqlx::Error> {
+    match sqlx::query(
+        r#"SELECT id, username, passphrase, created, last_login, salt_id FROM "service_user" WHERE username = $1"#
+        ).bind(username)
+        .fetch_one(pool).await {
+        Ok(row) => {
+            let last_login: Option<time::OffsetDateTime> = match row.try_get("last_login") {
+                Ok(login) => {
+                    Some(login)
+                }
+                Err(err) => {
+                    eprintln!("Error: {err:?}");
+                    None
+                }
+            };
+
+            let service_user = textsender_models::user::ServiceUser {
+                id: row.try_get("id")?,
+                username: row.try_get("username")?,
+                passphrase: row.try_get("passphrase")?,
+                created: row.try_get("created")?,
+                last_login,
+                salt_id: row.try_get("salt_id")?,
+            };
+
+            Ok(service_user)
+        }
+        Err(err) => {
+            Err(err)
+        }
+    }
+}
+
+pub async fn update_last_login(
+    pool: &sqlx::PgPool,
+    service_user: &textsender_models::user::ServiceUser,
+    time: &time::OffsetDateTime,
+) -> Result<time::OffsetDateTime, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        UPDATE "service_user" SET last_login = $1 WHERE id = $2 RETURNING last_login
+        "#,
+    )
+    .bind(time)
+    .bind(service_user.id)
+    .fetch_optional(pool)
+    .await
+    .map_err(|e| {
+        eprintln!("Error updating time: {e}");
+        e
+    });
+
+    match result {
+        Ok(row) => match row {
+            Some(r) => {
+                let last_login: time::OffsetDateTime = r
+                    .try_get("last_login")
+                    .map_err(|_e| sqlx::Error::RowNotFound)?;
+                Ok(last_login)
+            }
+            None => Err(sqlx::Error::RowNotFound),
+        },
+        Err(err) => Err(err),
+    }
+}
+
+pub async fn update_passphrase(
+    pool: &sqlx::PgPool,
+    user: &textsender_models::user::ServiceUser,
+    updated_hashed_passphrase: &String,
+) -> Result<(), sqlx::Error> {
+    match sqlx::query(
+        r#"
+        UPDATE "service_user" SET passphrase = $1 WHERE id = $2
+        "#,
+    )
+    .bind(updated_hashed_passphrase)
+    .bind(user.id)
+    .execute(pool)
+    .await
+    {
+        Ok(row) => {
+            if row.rows_affected() > 0 {
+                Ok(())
+            } else {
+                Err(sqlx::Error::RowNotFound)
+            }
+        }
+        Err(err) => Err(err),
+    }
+}
+
 pub async fn insert(
     pool: &sqlx::PgPool,
     service_user: &textsender_models::user::ServiceUser,
-) -> Result<time::OffsetDateTime, sqlx::Error> {
+) -> Result<(uuid::Uuid, time::OffsetDateTime), sqlx::Error> {
     match sqlx::query(
         r#"INSERT INTO "service_user" (username, passphrase, salt_id)
             VALUES ($1, $2, $3)
-            RETURNING created
+            RETURNING id, created
         "#,
     )
     .bind(&service_user.username)
@@ -92,8 +197,9 @@ pub async fn insert(
     .await
     {
         Ok(row) => {
+            let id: uuid::Uuid = row.try_get("id")?;
             let created: time::OffsetDateTime = row.try_get("created")?;
-            Ok(created)
+            Ok((id, created))
         }
         Err(err) => Err(err),
     }

src/token_stuff/mod.rs

@@ -19,12 +19,12 @@ pub fn get_expiration(issued: &time::OffsetDateTime) -> Result<time::OffsetDateT
 pub fn create_token(
     provided_key: &String,
     id: &uuid::Uuid,
-) -> Result<(String, i64), josekit::JoseError> {
+) -> Result<textsender_models::token::CreateTokenResult, josekit::JoseError> {
     let resource = textsender_models::token::TokenResource {
         message: String::from(MESSAGE),
         issuer: String::from(ISSUER),
         audiences: vec![String::from(AUDIENCE)],
-        id: *id,
+        user_id: *id,
     };
     textsender_models::token::create_token(provided_key, &resource, time::Duration::hours(4))
 }
@@ -32,12 +32,12 @@ pub fn create_token(
 pub fn create_service_token(
     provided: &String,
     id: &uuid::Uuid,
-) -> Result<(String, i64), josekit::JoseError> {
+) -> Result<textsender_models::token::CreateTokenResult, josekit::JoseError> {
     let resource = textsender_models::token::TokenResource {
         message: String::from(SERVICE_SUBJECT),
         issuer: String::from(ISSUER),
         audiences: vec![String::from(AUDIENCE)],
-        id: *id,
+        user_id: *id,
     };
     textsender_models::token::create_token(provided, &resource, time::Duration::hours(1))
 }
@@ -45,12 +45,12 @@ pub fn create_service_token(
 pub fn create_service_refresh_token(
     key: &String,
     id: &uuid::Uuid,
-) -> Result<(String, i64), josekit::JoseError> {
+) -> Result<textsender_models::token::CreateTokenResult, josekit::JoseError> {
     let resource = textsender_models::token::TokenResource {
         message: String::from(SERVICE_SUBJECT),
         issuer: String::from(ISSUER),
         audiences: vec![String::from(AUDIENCE)],
-        id: *id,
+        user_id: *id,
     };
     textsender_models::token::create_token(key, &resource, time::Duration::hours(4))
 }
@@ -67,7 +67,7 @@ pub fn verify_token(key: &String, token: &String) -> bool {
 
 pub fn extract_id_from_token(key: &String, token: &String) -> Result<uuid::Uuid, std::io::Error> {
     match get_payload(key, token) {
-        Ok((payload, _header)) => match payload.claim("id") {
+        Ok((payload, _header)) => match payload.claim("user_id") {
             Some(id) => match uuid::Uuid::parse_str(id.as_str().unwrap()) {
                 Ok(extracted) => Ok(extracted),
                 Err(err) => Err(std::io::Error::other(err.to_string())),
@@ -125,8 +125,8 @@ mod tests {
             .value;
         let id = uuid::Uuid::new_v4();
         match create_token(&special_key, &id) {
-            Ok((token, _duration)) => {
+            Ok(cst) => {
-                let result = verify_token(&special_key, &token);
+                let result = verify_token(&special_key, &cst.access_token);
                 assert!(result, "Token not verified");
             }
             Err(err) => {

tests/tests.rs

@@ -133,6 +133,98 @@ pub mod requests {
 
         app.clone().oneshot(req).await
     }
+
+    /// Function to call service user login endpoint
+    pub async fn login_service_user(
+        app: &axum::Router,
+        username: &str,
+        passphrase: &str,
+    ) -> Result<axum::response::Response, std::convert::Infallible> {
+        let payload = serde_json::json!({
+            "username": username,
+            "passphrase": passphrase,
+        });
+        let req = axum::http::Request::builder()
+            .method(axum::http::Method::POST)
+            .uri(super::callers::endpoints::LOGIN_SERVICE_USER)
+            .header(axum::http::header::CONTENT_TYPE, "application/json")
+            .body(axum::body::Body::from(payload.to_string()))
+            .unwrap();
+
+        app.clone().oneshot(req).await
+    }
+
+    /// Function to call token refresh endpoint
+    pub async fn refresh_token(
+        app: &axum::Router,
+        access_token: &str,
+    ) -> Result<axum::response::Response, std::convert::Infallible> {
+        let payload = serde_json::json!({
+            "access_token": access_token,
+        });
+        let req = axum::http::Request::builder()
+            .method(axum::http::Method::POST)
+            .uri(super::callers::endpoints::REFRESH_TOKEN)
+            .header(axum::http::header::CONTENT_TYPE, "application/json")
+            .body(axum::body::Body::from(payload.to_string()))
+            .unwrap();
+
+        app.clone().oneshot(req).await
+    }
+
+    /// Function to call update password endpoint
+    pub async fn update_password(
+        app: &axum::Router,
+        user_id: &uuid::Uuid,
+        current_password: &str,
+        updated_password: &str,
+        confirmed_password: &str,
+    ) -> Result<axum::response::Response, axum::http::Error> {
+        let payload = serde_json::json!({
+            "user_id": user_id,
+            "current_password": current_password,
+            "updated_password": updated_password,
+            "confirmed_password": confirmed_password,
+        });
+        match axum::http::Request::builder()
+            .method(axum::http::Method::PATCH)
+            .uri(super::callers::endpoints::UPDATE_PASSWORD)
+            .header(axum::http::header::CONTENT_TYPE, "application/json")
+            .body(axum::body::Body::from(payload.to_string()))
+        {
+            Ok(req) => match app.clone().oneshot(req).await {
+                Ok(resp) => Ok(resp),
+                Err(err) => Err(axum::http::Error::from(err)),
+            },
+            Err(err) => Err(err),
+        }
+    }
+
+    /// Function to call update name of user endpoint
+    pub async fn update_name_of_user(
+        app: &axum::Router,
+        user_id: &uuid::Uuid,
+        firstname: &str,
+        lastname: &str,
+    ) -> Result<axum::response::Response, axum::http::Error> {
+        let payload = serde_json::json!({
+            "user_id": user_id,
+            "firstname": firstname,
+            "lastname": lastname,
+        });
+        match axum::http::Request::builder()
+            .method(axum::http::Method::PATCH)
+            .uri(super::callers::endpoints::UPDATE_USER_NAME)
+            .header(axum::http::header::CONTENT_TYPE, "application/json")
+            .body(axum::body::Body::from(payload.to_string()))
+        {
+            Ok(req) => match app.clone().oneshot(req).await {
+                Ok(resp) => Ok(resp),
+                Err(err) => Err(axum::http::Error::from(err)),
+            },
+            Err(err) => Err(err),
+        }
+    }
 }
 
 /// Test user firstname
@@ -145,26 +237,49 @@ const TEST_USERNAME: &str = "BillyBob01";
 const TEST_PASSWORD: &str = "923ndcry392qryudx328qrdy328r";
 /// Test user phone number
 const TEST_PHONE_NUMBER: &str = "+10123456789";
+/// Test updated user password
+const TEST_UPDATED_PASSWORD: &str = "3cnf29ry8q27i3yrc928qi37ryndxc2198q7yd9xzq12837e";
+
+/// Test updated user firstname
+const TEST_UPDATED_FIRSTNAME: &str = "Kuoth";
+/// Test updated user lastname
+const TEST_UPDATED_LASTNAME: &str = "Wech";
 
 /// Test service username
 const TEST_SERVICE_USERNAME: &str = "swoon";
 /// Test service passphrase
 const TEST_SERVICE_PASSPHRASE: &str = "4n5cf349tfy34w857ty39wq45nfdq23";
+/// Test updated service user passphrase
+const TEST_SERVICE_UPDATED_PASSPHRASE: &str = "3487ncfyth934287fcrty32487fry32in7";
 
-async fn convert_response<T>(response: axum::response::Response) -> Result<T, std::io::Error>
+mod util {
+    pub async fn convert_response<T>(
+        response: axum::response::Response,
+    ) -> Result<T, std::io::Error>
     where
         T: serde::de::DeserializeOwned,
     {
         match axum::body::to_bytes(response.into_body(), usize::MAX).await {
             Ok(body) => {
-            let resp: T = serde_json::from_slice(&body).unwrap();
+                let resp: T = match serde_json::from_slice(&body) {
+                    Ok(val) => val,
+                    Err(err) => {
+                        return Err(std::io::Error::other(err.to_string()));
+                    }
+                };
                 Ok(resp)
             }
             Err(err) => Err(std::io::Error::other(err.to_string())),
         }
     }
+}
 
-async fn register_user(
+mod flow {
+    use super::callers;
+    use super::requests;
+    use super::util;
+
+    pub async fn register_user(
         app: &axum::Router,
     ) -> Result<textsender_models::user::User, std::io::Error> {
         match requests::register_user(&app).await {
@@ -175,13 +290,18 @@ async fn register_user(
                         response.status()
                     )))
                 } else {
-                match axum::body::to_bytes(response.into_body(), usize::MAX).await {
+                    match util::convert_response::<callers::register::response::Response>(response)
-                    Ok(body) => {
+                        .await
-                        let parsed_body: callers::register::response::Response =
+                    {
-                            serde_json::from_slice(&body).unwrap();
+                        Ok(response) => {
-                        Ok(parsed_body.data[0].clone())
+                            if response.data.len() > 0 {
+                                let user = response.data[0].clone();
+                                Ok(user)
+                            } else {
+                                Err(std::io::Error::other("No data returned"))
                             }
-                    Err(err) => Err(std::io::Error::other(err.to_string())),
+                        }
+                        Err(err) => Err(err),
                     }
                 }
             }
@@ -189,7 +309,7 @@ async fn register_user(
         }
     }
 
-async fn login_user(
+    pub async fn login_user(
         app: &axum::Router,
         username: &str,
         password: &str,
@@ -202,13 +322,20 @@ async fn login_user(
                         response.status()
                     )))
                 } else {
-                match axum::body::to_bytes(response.into_body(), usize::MAX).await {
+                    match util::convert_response::<callers::login::response::LoginResponse>(
-                    Ok(body) => {
+                        response,
-                        let parsed_body: callers::login::response::LoginResponse =
+                    )
-                            serde_json::from_slice(&body).unwrap();
+                    .await
-                        Ok(parsed_body.data[0].clone())
+                    {
+                        Ok(response) => {
+                            if response.data.len() > 0 {
+                                let user = response.data[0].clone();
+                                Ok(user)
+                            } else {
+                                Err(std::io::Error::other("No data returned"))
                             }
-                    Err(err) => Err(std::io::Error::other(err.to_string())),
+                        }
+                        Err(err) => Err(err),
                     }
                 }
             }
@@ -216,6 +343,185 @@ async fn login_user(
         }
     }
 
+    pub async fn register_service_user(
+        app: &axum::Router,
+    ) -> Result<textsender_models::user::ServiceUser, std::io::Error> {
+        match requests::register_service_user(&app).await {
+            Ok(response) => {
+                if axum::http::StatusCode::CREATED != response.status() {
+                    Err(std::io::Error::other(format!(
+                        "Status code is off {:?}",
+                        response.status()
+                    )))
+                } else {
+                    match util::convert_response::<
+                        callers::register::response::RegisterServiceUserResponse,
+                    >(response)
+                    .await
+                    {
+                        Ok(response) => {
+                            if response.data.len() > 0 {
+                                let service_user = response.data[0].clone();
+                                Ok(service_user)
+                            } else {
+                                Err(std::io::Error::other("No data returned"))
+                            }
+                        }
+                        Err(err) => Err(err),
+                    }
+                }
+            }
+            Err(err) => Err(std::io::Error::other(err.to_string())),
+        }
+    }
+
+    pub async fn login_service_user(
+        app: &axum::Router,
+        username: &str,
+        passphrase: &str,
+    ) -> Result<textsender_models::token::LoginResult, std::io::Error> {
+        match requests::login_service_user(&app, username, passphrase).await {
+            Ok(response) => {
+                if axum::http::StatusCode::OK != response.status() {
+                    Err(std::io::Error::other(format!(
+                        "Status code is off {:?}",
+                        response.status()
+                    )))
+                } else {
+                    match util::convert_response::<callers::login::response::ServiceUserLoginResponse>(
+                        response,
+                    )
+                    .await
+                    {
+                        Ok(response) => {
+                            if response.data.len() > 0 {
+                                let login_result = response.data[0].clone();
+                                Ok(login_result)
+                            } else {
+                                Err(std::io::Error::other("No data returned"))
+                            }
+                        }
+                        Err(err) => Err(err),
+                    }
+                }
+            }
+            Err(err) => Err(std::io::Error::other(err.to_string())),
+        }
+    }
+
+    pub async fn refresh_token(
+        app: &axum::Router,
+        access_token: &str,
+    ) -> Result<textsender_models::token::LoginResult, std::io::Error> {
+        match requests::refresh_token(app, access_token).await {
+            Ok(response) => {
+                if axum::http::StatusCode::OK != response.status() {
+                    Err(std::io::Error::other(format!(
+                        "Status code is off {:?}",
+                        response.status()
+                    )))
+                } else {
+                    match util::convert_response::<callers::login::response::RefreshTokenResponse>(
+                        response,
+                    )
+                    .await
+                    {
+                        Ok(response) => {
+                            if response.data.len() > 0 {
+                                let login_result = response.data[0].clone();
+                                Ok(login_result)
+                            } else {
+                                Err(std::io::Error::other("No data returned"))
+                            }
+                        }
+                        Err(err) => Err(err),
+                    }
+                }
+            }
+            Err(err) => Err(std::io::Error::other(err.to_string())),
+        }
+    }
+
+    pub async fn update_password(
+        app: &axum::Router,
+        user_id: &uuid::Uuid,
+        current_password: &str,
+        updated_password: &str,
+        confirmed_password: &str,
+    ) -> Result<uuid::Uuid, std::io::Error> {
+        match requests::update_password(
+            app,
+            user_id,
+            current_password,
+            updated_password,
+            confirmed_password,
+        )
+        .await
+        {
+            Ok(response) => {
+                if axum::http::StatusCode::OK != response.status() {
+                    Err(std::io::Error::other(format!(
+                        "Status code is off {:?}",
+                        response.status()
+                    )))
+                } else {
+                    match util::convert_response::<callers::login::response::UpdatePasswordResponse>(
+                        response,
+                    )
+                    .await
+                    {
+                        Ok(response) => {
+                            if response.data.len() > 0 {
+                                let id = response.data[0].clone();
+                                Ok(id)
+                            } else {
+                                Err(std::io::Error::other("No data returned"))
+                            }
+                        }
+                        Err(err) => Err(err),
+                    }
+                }
+            }
+            Err(err) => Err(std::io::Error::other(err.to_string())),
+        }
+    }
+
+    pub async fn update_name_of_user(
+        app: &axum::Router,
+        user_id: &uuid::Uuid,
+        firstname: &str,
+        lastname: &str,
+    ) -> Result<textsender_models::user::User, std::io::Error> {
+        match requests::update_name_of_user(app, user_id, firstname, lastname).await {
+            Ok(response) => {
+                if axum::http::StatusCode::OK != response.status() {
+                    Err(std::io::Error::other(format!(
+                        "Status code is off {:?}",
+                        response.status()
+                    )))
+                } else {
+                    match util::convert_response::<callers::login::response::UserUpdateNameResponse>(
+                        response,
+                    )
+                    .await
+                    {
+                        Ok(response) => {
+                            if response.data.len() > 0 {
+                                let user = response.data[0].clone();
+                                Ok(user)
+                            } else {
+                                Err(std::io::Error::other("No data returned"))
+                            }
+                        }
+                        Err(err) => Err(err),
+                    }
+                }
+            }
+            Err(err) => Err(std::io::Error::other(err.to_string())),
+        }
+    }
+}
+
 #[tokio::test]
 async fn test_register_user() {
     let tm_pool = db_mgr::get_pool().await.unwrap();
@@ -236,7 +542,7 @@ async fn test_register_user() {
 
     let app = init::routes().await.layer(axum::Extension(pool));
 
-    match register_user(&app).await {
+    match flow::register_user(&app).await {
         Ok(returned_user) => {
             assert_eq!(
                 TEST_USERNAME, returned_user.username,
@@ -276,8 +582,8 @@ async fn test_login_user() {
 
     let app = init::routes().await.layer(axum::Extension(pool));
 
-    match register_user(&app).await {
+    match flow::register_user(&app).await {
-        Ok(user) => match login_user(&app, &user.username, TEST_PASSWORD).await {
+        Ok(user) => match flow::login_user(&app, &user.username, TEST_PASSWORD).await {
             Ok(login_result) => {
                 assert_eq!(
                     false,
@@ -324,7 +630,7 @@ async fn test_register_service_user() {
 
     match requests::register_service_user(&app).await {
         Ok(response) => {
-            match convert_response::<callers::register::response::RegisterServiceUserResponse>(
+            match util::convert_response::<callers::register::response::RegisterServiceUserResponse>(
                 response,
             )
             .await
@@ -354,3 +660,332 @@ async fn test_register_service_user() {
         }
     }
 }
+
+#[tokio::test]
+async fn test_login_service_user() {
+    let tm_pool = db_mgr::get_pool().await.unwrap();
+    let db_name = db_mgr::generate_db_name().await;
+
+    match db_mgr::create_database(&tm_pool, &db_name).await {
+        Ok(_) => {
+            println!("Success");
+        }
+        Err(e) => {
+            assert!(false, "Error: {:?}", e.to_string());
+        }
+    }
+
+    let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
+
+    db::init::migrations(&pool).await;
+
+    let app = init::routes().await.layer(axum::Extension(pool));
+
+    match flow::register_service_user(&app).await {
+        Ok(user) => {
+            assert_eq!(
+                false,
+                user.id.is_nil(),
+                "The service user id should not be nil"
+            );
+            match flow::login_service_user(&app, TEST_SERVICE_USERNAME, TEST_SERVICE_PASSPHRASE)
+                .await
+            {
+                Ok(login_result) => {
+                    assert_eq!(
+                        false,
+                        login_result.access_token.is_empty(),
+                        "Access token is empty when it should not be"
+                    );
+                }
+                Err(err) => {
+                    assert!(false, "Error: {err:?}");
+                }
+            }
+        }
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+
+    match db_mgr::drop_database(&tm_pool, &db_name).await {
+        Ok(()) => {}
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+}
+
+#[tokio::test]
+async fn test_refresh_token() {
+    let tm_pool = db_mgr::get_pool().await.unwrap();
+    let db_name = db_mgr::generate_db_name().await;
+
+    match db_mgr::create_database(&tm_pool, &db_name).await {
+        Ok(_) => {
+            println!("Success");
+        }
+        Err(e) => {
+            assert!(false, "Error: {:?}", e.to_string());
+        }
+    }
+
+    let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
+
+    db::init::migrations(&pool).await;
+
+    let app = init::routes().await.layer(axum::Extension(pool));
+
+    match flow::register_user(&app).await {
+        Ok(user) => match flow::login_user(&app, &user.username, TEST_PASSWORD).await {
+            Ok(login_result) => {
+                assert_eq!(
+                    false,
+                    login_result.access_token.is_empty(),
+                    "Access token is empty when it should not be"
+                );
+                match flow::refresh_token(&app, &login_result.access_token).await {
+                    Ok(refresh_login_result) => {
+                        assert_eq!(
+                            false,
+                            refresh_login_result.access_token.is_empty(),
+                            "Refreshed access token should not be empty"
+                        );
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {err:?}");
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+            }
+        },
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+
+    match flow::register_service_user(&app).await {
+        Ok(user) => {
+            assert_eq!(
+                false,
+                user.id.is_nil(),
+                "The service user id should not be nil"
+            );
+            match flow::login_service_user(&app, TEST_SERVICE_USERNAME, TEST_SERVICE_PASSPHRASE)
+                .await
+            {
+                Ok(login_result) => {
+                    assert_eq!(
+                        false,
+                        login_result.access_token.is_empty(),
+                        "Access token is empty when it should not be"
+                    );
+
+                    match flow::refresh_token(&app, &login_result.access_token).await {
+                        Ok(refresh_login_result) => {
+                            assert_eq!(
+                                false,
+                                refresh_login_result.access_token.is_empty(),
+                                "Refreshed access token should not be empty"
+                            );
+                        }
+                        Err(err) => {
+                            assert!(false, "Error: {err:?}");
+                        }
+                    }
+                }
+                Err(err) => {
+                    assert!(false, "Error: {err:?}");
+                }
+            }
+        }
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+
+    match db_mgr::drop_database(&tm_pool, &db_name).await {
+        Ok(()) => {}
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+}
+
+#[tokio::test]
+async fn test_update_password() {
+    let tm_pool = db_mgr::get_pool().await.unwrap();
+    let db_name = db_mgr::generate_db_name().await;
+
+    match db_mgr::create_database(&tm_pool, &db_name).await {
+        Ok(_) => {
+            println!("Success");
+        }
+        Err(e) => {
+            assert!(false, "Error: {:?}", e.to_string());
+        }
+    }
+
+    let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
+
+    db::init::migrations(&pool).await;
+
+    let app = init::routes().await.layer(axum::Extension(pool));
+
+    match flow::register_user(&app).await {
+        Ok(user) => match flow::login_user(&app, &user.username, TEST_PASSWORD).await {
+            Ok(login_result) => {
+                assert_eq!(
+                    false,
+                    login_result.access_token.is_empty(),
+                    "Access token is empty when it should not be"
+                );
+
+                match flow::update_password(
+                    &app,
+                    &user.id,
+                    TEST_PASSWORD,
+                    TEST_UPDATED_PASSWORD,
+                    TEST_UPDATED_PASSWORD,
+                )
+                .await
+                {
+                    Ok(id) => {
+                        assert_eq!(id, user.id, "Ids do not match");
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {err:?}");
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+            }
+        },
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+
+    match flow::register_service_user(&app).await {
+        Ok(service_user) => {
+            assert_eq!(
+                false,
+                service_user.id.is_nil(),
+                "The service user id should not be nil"
+            );
+            match flow::login_service_user(&app, TEST_SERVICE_USERNAME, TEST_SERVICE_PASSPHRASE)
+                .await
+            {
+                Ok(login_result) => {
+                    assert_eq!(
+                        false,
+                        login_result.access_token.is_empty(),
+                        "Access token is empty when it should not be"
+                    );
+
+                    match flow::update_password(
+                        &app,
+                        &service_user.id,
+                        TEST_SERVICE_PASSPHRASE,
+                        TEST_SERVICE_UPDATED_PASSPHRASE,
+                        TEST_SERVICE_UPDATED_PASSPHRASE,
+                    )
+                    .await
+                    {
+                        Ok(id) => {
+                            assert_eq!(id, service_user.id, "Ids do not match");
+                        }
+                        Err(err) => {
+                            assert!(false, "Error: {err:?}");
+                        }
+                    }
+                }
+                Err(err) => {
+                    assert!(false, "Error: {err:?}");
+                }
+            }
+        }
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+
+    match db_mgr::drop_database(&tm_pool, &db_name).await {
+        Ok(()) => {}
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+}
+
+#[tokio::test]
+async fn test_update_name_of_password() {
+    let tm_pool = db_mgr::get_pool().await.unwrap();
+    let db_name = db_mgr::generate_db_name().await;
+
+    match db_mgr::create_database(&tm_pool, &db_name).await {
+        Ok(_) => {
+            println!("Success");
+        }
+        Err(e) => {
+            assert!(false, "Error: {:?}", e.to_string());
+        }
+    }
+
+    let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
+
+    db::init::migrations(&pool).await;
+
+    let app = init::routes().await.layer(axum::Extension(pool));
+
+    match flow::register_user(&app).await {
+        Ok(user) => match flow::login_user(&app, &user.username, TEST_PASSWORD).await {
+            Ok(login_result) => {
+                assert_eq!(
+                    false,
+                    login_result.access_token.is_empty(),
+                    "Access token is empty when it should not be"
+                );
+
+                match flow::update_name_of_user(
+                    &app,
+                    &user.id,
+                    TEST_UPDATED_FIRSTNAME,
+                    TEST_UPDATED_LASTNAME,
+                )
+                .await
+                {
+                    Ok(user) => {
+                        assert_eq!(
+                            TEST_UPDATED_FIRSTNAME, user.firstname,
+                            "Firstname do not match"
+                        );
+                        assert_eq!(
+                            TEST_UPDATED_LASTNAME, user.lastname,
+                            "Lastname do not match"
+                        );
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {err:?}");
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+            }
+        },
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+
+    match db_mgr::drop_database(&tm_pool, &db_name).await {
+        Ok(()) => {}
+        Err(err) => {
+            assert!(false, "Error: {err:?}");
+        }
+    }
+}