Update (#16)

Reviewed-on: phoenix/textsender_auth#16

.env.docker.sample

@@ -1,7 +1,10 @@
 SECRET_KEY=NULqYIzgt28bTiyziCd7IOO7b6LnWDW!
-DB_NAME=textsender_auth_db
-DB_USER=textsender_auth
-DB_PASSWORD=password
-DB_HOST=auth_db
-DB_PORT=5432
-DB_SSLMODE=disable
+DB_AUTH_NAME=textsender_auth_db
+DB_AUTH_USER=textsender_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"

.env.local.sample

@@ -0,0 +1,10 @@
+SECRET_KEY=NULqYIzgt28bTiyziCd7IOO7b6LnWDW!
+DB_AUTH_NAME=textsender_auth_db
+DB_AUTH_USER=textsender_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"

.env.sample

@@ -1,7 +0,0 @@
-SECRET_KEY=NULqYIzgt28bTiyziCd7IOO7b6LnWDW!
-DB_NAME=textsender_auth_db
-DB_USER=textsender_auth
-DB_PASSWORD=yEDjWZCH2vdctjn!
-DB_HOST=localhost
-DB_PORT=5432
-DB_SSLMODE=disable

.gitea/workflows/pr.yml

@@ -0,0 +1,68 @@
+name: Rust Build
+
+on:
+  pull_request:
+    branches:
+      - main
+
+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.yaml

@@ -1,128 +0,0 @@
-name: Go
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-    runs-on: ubuntu-24.04  # You can change this to macos-latest or windows-latest if needed
-
-    steps:
-    - uses: actions/checkout@v5
-
-    - name: Set up Go
-      uses: actions/setup-go@v6
-      with:
-        go-version: '1.25.4' # You can specify a specific version or 'stable'
-
-    - name: Build
-      run: |
-        echo "Initializing config"
-        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
-
-        go env -w GOPRIVATE='${{ secrets.GIT_HOST_ROOT }}'
-
-        echo "Creating local .gitconfig"
-        touch ~/.gitconfig
-        cat > ~/.gitconfig << "EOF"
-        [url "ssh://git@${{ secrets.GIT_HOST_ROOT }}"]
-          insteadOf = https://${{ secrets.GIT_HOST_ROOT }}
-        EOF
-
-        echo "Building binary"
-        make build
-
-        echo "Binary built"
-        file textsender-auth
-
-  test:
-    name: Test
-    runs-on: ubuntu-24.04
-    services:
-      postgres:
-        image: postgres:18.0
-        env:
-          POSTGRES_USER: ${{ secrets.DB_TEST_USER }}
-          POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD }}
-          POSTGRES_DB: ${{ secrets.DB_TEST_NAME }}
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.25.3'
-
-      - name: Install PostgreSQL client
-        run: sudo apt update && sudo apt-get install -y postgresql-client
-
-      - name: Wait for PostgreSQL to be ready
-        run: |
-          for i in {1..30}; do
-            if pg_isready -h postgres -p 5432; then
-              echo "PostgreSQL is ready"
-              exit 0
-            fi
-            echo "Waiting for PostgreSQL... Attempt $i"
-            sleep 2
-          done
-          echo "PostgreSQL did not start in time"
-          exit 1
-
-      - name: Run tests
-        env:
-          DB_NAME: ${{ secrets.DB_TEST_NAME }}
-          DB_USER: ${{ secrets.DB_TEST_USER }}
-          DB_PASSWORD: ${{ secrets.DB_TEST_PASSWORD }}
-          DB_HOST: postgres
-          DB_PORT: 5432
-          DB_SSLMODE: disable
-          SECRET_KEY: ${{ secrets.SECRET_KEY }}
-        run: |
-          echo "Parent directory"
-          echo `pwd`
-
-          echo "SECRET_KEY=$SECRET_KEY" >> .env
-          echo "DB_NAME=$DB_NAME" > .env
-          echo "DB_USER=$DB_USER" >> .env
-          echo "DB_PASSWORD=$DB_PASSWORD" >> .env
-          echo "DB_HOST=$DB_HOST" >> .env
-          echo "DB_PORT=$DB_PORT" >> .env
-          echo "DB_SSLMODE=$DB_SSLMODE" >> .env
-
-          echo "Initializing config"
-          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
-
-          go env -w GOPRIVATE='${{ secrets.GIT_HOST_ROOT }}'
-
-          echo "Creating local .gitconfig"
-          touch ~/.gitconfig
-          cat > ~/.gitconfig << "EOF"
-          [url "ssh://git@${{ secrets.GIT_HOST_ROOT }}"]
-            insteadOf = https://${{ secrets.GIT_HOST_ROOT }}
-          EOF
-
-          go test -v ./...

.gitea/workflows/workflow.yml

@@ -0,0 +1,146 @@
+name: Rust Build
+
+on:
+  push:
+    branches:
+      - main
+
+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
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-24.04
+    # --- Add database service definition ---
+    services:
+      postgres:
+        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
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
+      # --- Add this step for explicit verification ---
+      - name: Verify Docker Environment
+        run: |
+          echo "Runner User Info:"
+          id
+          echo "Checking Docker Version:"
+          docker --version
+          echo "Checking Docker Daemon Status (info):"
+          docker info
+          echo "Checking Docker Daemon Status (ps):"
+          docker ps -a
+          echo "Docker environment check complete."
+        # NOTE: Do NOT use continue-on-error here.
+        # If Docker isn't working as expected, the job SHOULD fail here.
+      - 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:${{ 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
+          SSH_AUTH_SOCK: ${{ env.SSH_AUTH_SOCK }}
+          ENABLE_REGISTRATION: 'TRUE'
+        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 test
+
+  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
+
+  build:
+    name: build
+    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 build --release

.gitignore

@@ -1,7 +1,5 @@
-/textsender-auth
-
 .env
 .env.local
 .env.docker
 
-/vendor
+/target

Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = "textsender_auth"
+version = "0.1.23"
+edition = "2024"
+rust-version = "1.96"
+
+[dependencies]
+axum = { version = "0.8.9" }
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = { version = "1.0.150" }
+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.11", features = ["cors"] }
+hyper = { version = "1.10.1" }
+sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio-native-tls", "time", "uuid"] }
+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.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.4.0", features = ["config", "user"] }
+
+[dev-dependencies]
+http-body-util = { version = "0.1.3" }
+url = { version = "2.5.8" }
+once_cell = { version = "1.21.4" } # Useful for lazy initialization in tests/app setup
+async-std = { version = "1.13.2" }

Dockerfile

@@ -1,53 +1,70 @@
-# Multi-stage Dockerfile for Go application
-FROM golang:1.25.3 AS builder
+# 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.96 as builder
 
-WORKDIR /app
+# Set the working directory inside the container
+WORKDIR /usr/src/app
 
+# Install build dependencies if needed (e.g., for certain crates like sqlx with native TLS)
+# RUN apt-get update && apt-get install -y pkg-config libssl-dev
+
+# Install build dependencies if needed (e.g., git for cloning)
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    pkg-config libssl3 \
     ca-certificates \
-    openssh-client git
+    openssh-client git \
+    && rm -rf /var/lib/apt/lists/*
 
+# << --- ADD HOST KEY HERE --- >>
+# Replace 'yourgithost.com' with the actual hostname (e.g., github.com)
 RUN mkdir -p -m 0700 ~/.ssh && \
     ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts
 
-# Configure Git to use SSH for GitHub
-RUN git config --global url."ssh://git@git.kundeng.us".insteadOf "https://git.kundeng.us"
-
-# Set up the Go environment for private modules
-ENV GOPRIVATE=git.kundeng.us
-
-
-# Copy go mod and sum files
-COPY go.mod go.sum ./
+# Copy Cargo manifests
+COPY Cargo.toml Cargo.lock ./
 
+# Build *only* dependencies to leverage Docker cache
+# This dummy build caches dependencies as a separate layer
 RUN --mount=type=ssh mkdir src && \
-    go mod download
+    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* # Clean up dummy build artifacts
 
-# Copy source code
-COPY ./cmd ./cmd
-COPY ./internal ./internal
-COPY ./Makefile .
-COPY ./.env .
-COPY ./migrations ./migrations
-COPY ./docs ./docs
+# Copy the actual source code
+COPY src ./src
+# If you have other directories like `templates` or `static`, copy them too
+COPY .env ./.env
+COPY migrations ./migrations
 
-# Build the application
-RUN CGO_ENABLED=0 GOOS=linux make build
+# << --- SSH MOUNT ADDED HERE --- >>
+# Build *only* dependencies to leverage Docker cache
+# This dummy build caches dependencies as a separate layer
+# Mount the SSH agent socket for this command
+RUN --mount=type=ssh \
+    cargo build --release --quiet
 
-# Runtime stage
-FROM alpine:latest AS production
+# Stage 2: Create the final, smaller runtime image
+# Use a minimal base image like debian-slim or even distroless for security/size
+FROM debian:trixie-slim
 
-RUN apk --no-cache add ca-certificates
+# Install runtime dependencies if needed (e.g., SSL certificates)
+RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /root/
+# Set the working directory
+WORKDIR /usr/local/bin
 
-# Copy the pre-built binary file from the previous stage
-COPY --from=builder /app/textsender-auth .
-COPY --from=builder /app/.env ./
-COPY --from=builder /app/migrations ./migrations
+# Copy the compiled binary from the builder stage
+COPY --from=builder /usr/src/app/target/release/textsender_auth .
 
-# Expose port
+# Copy other necessary files like .env (if used for runtime config) or static assets
+# It's generally better to configure via environment variables in Docker though
+COPY --from=builder /usr/src/app/.env .
+COPY --from=builder /usr/src/app/migrations ./migrations
+
+# Expose the port your Axum app listens on (e.g., 3000 or 8000)
 EXPOSE 9080
 
-# Command to run the executable
-CMD ["./textsender-auth"]
+# Set the command to run your application
+# Ensure this matches the binary name copied above
+CMD ["./textsender_auth"]

Makefile

@@ -1,21 +0,0 @@
-VERSION ?= $(shell git describe --tags 2>/dev/null || echo "dev")
-COMMIT ?= $(shell git rev-parse --short HEAD)
-BUILD_TIME ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
-GO_VERSION ?= $(shell go version | awk '{print $$3}')
-
-.PHONY: build
-build:
-	go build -ldflags="\
-		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.Version=$(VERSION)' \
-		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.BuildTime=$(BUILD_TIME)' \
-		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.Commit=$(COMMIT)' \
-		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.GoVersion=$(GO_VERSION)'" \
-		-o textsender-auth cmd/api/main.go
-
-.PHONY: install
-install:
-	go install -ldflags="\
-		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.Version=$(VERSION)' \
-		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.BuildTime=$(BUILD_TIME)' \
-		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.Commit=$(COMMIT)' \
-		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.GoVersion=$(GO_VERSION)'"

README.md

@@ -1,31 +1 @@
-# textsender-auth
-A service that handles the authorization aspect of the textsender project.
 
-
-## Getting started
-Assumes that the postgresql database has already been created with privileges to
-create and drop databases. Copy the `.env.sample` file to `.env`. Within the `.env`
-file, update the database keys. The `SECRET_KEY` is used for token generation.
-
-
-### Building api
-```
-make build
-```
-
-
-### Resetting the database
-```
-./textsender-auth -reset-db
-```
-
-
-Generate API documentation
-```
-go install github.com/swaggo/swag/cmd/swag@latest
-go get -u github.com/swaggo/http-swagger/v2
-
-swag init --generalInfo main.go --dir ./cmd/api,./internal/handler --output docs/ --parseDependency --parseInternal
-```
-
-The API documentation can be viewed from `http://localhost:9080/swagger/index.html`.

cmd/api/main.go

@@ -1,132 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
-
-	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/chi/v5/middleware"
-	"github.com/swaggo/http-swagger/v2"
-
-	_ "git.kundeng.us/phoenix/textsender-auth/docs"
-	"git.kundeng.us/phoenix/textsender-auth/internal/config"
-	database "git.kundeng.us/phoenix/textsender-auth/internal/db"
-	"git.kundeng.us/phoenix/textsender-auth/internal/handler"
-	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
-	mdleware "git.kundeng.us/phoenix/textsender-auth/internal/middleware"
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
-	"git.kundeng.us/phoenix/textsender-auth/internal/store"
-)
-
-// @title           textsender-auth
-// @version         1.0
-// @description     Auth API to send text messages
-
-// @host      localhost:9080
-// @BasePath  /api/v1
-
-// @securityDefinitions.apikey  BearerAuth
-// @in                          header
-// @name                        Authorization
-// @description                 JWT Bearer Token
-func main() {
-	cfg := config.Load()
-	if cfg == nil {
-		fmt.Println("Error initializing config")
-		os.Exit(-1)
-	}
-
-	db, err := database.NewDatabase(cfg.GetDBConnString())
-	if err != nil {
-		log.Fatalf("Failed to connect to database: %v", err)
-	}
-	defer db.Close()
-
-	ctx := context.Background()
-
-	if cfg.ResetDB {
-		if err := db.ResetDatabase(ctx); err != nil {
-			log.Fatalf("Failed to reset database: %v", err)
-		} else {
-			log.Println("Resetting database")
-			log.Println("Database reset completed. Exiting.")
-		}
-		return
-	} else {
-		if exists, err := database.TableExists(ctx, db.Pool, "users"); err == nil {
-			if !exists {
-				if err = db.ResetDatabase(ctx); err != nil {
-					fmt.Println("Error:", err)
-				} else {
-					fmt.Println("Database reset")
-				}
-			}
-		} else {
-			fmt.Println("Error:", err)
-		}
-	}
-
-	// Services
-	userStore := model.NewUserStore(db.Pool)
-	serviceStore := store.NewServiceStore(db.Pool)
-
-	userHandler := handler.NewUserHandler(userStore)
-	loginHandler := handler.NewLoginHandler(userStore)
-	serviceHandler := handler.NewServiceHandler(serviceStore)
-	refreshHandler := handler.NewRefreshHandler(userStore, serviceStore)
-
-	router := chi.NewRouter()
-
-	router.Use(middleware.Logger)
-	router.Use(middleware.Recoverer)
-	router.Use(middleware.Timeout(60 * time.Second))
-	router.Use(mdleware.JSONContentType)
-
-	router.Method("Post", endpoint.Register, http.HandlerFunc(userHandler.Register))
-	router.Method("Post", endpoint.Login, http.HandlerFunc(loginHandler.Login))
-	router.Method("Post", endpoint.CreateServiceUser, http.HandlerFunc(serviceHandler.Register))
-	router.Method("Post", endpoint.LoginServiceUser, http.HandlerFunc(serviceHandler.Login))
-	router.Method("Post", endpoint.TokenRefresh, http.HandlerFunc(refreshHandler.Refresh))
-
-	router.Method("GET", "/swagger/*", httpSwagger.Handler(
-		httpSwagger.URL(fmt.Sprintf("http://localhost:%s/swagger/doc.json", config.Port)),
-	))
-
-	// Start server
-	server := &http.Server{
-		Addr:         ":" + cfg.ServerPort,
-		Handler:      router,
-		ReadTimeout:  15 * time.Second,
-		WriteTimeout: 15 * time.Second,
-		IdleTimeout:  60 * time.Second,
-	}
-
-	// Graceful shutdown
-	go func() {
-		log.Printf("Server starting on port %s", cfg.ServerPort)
-		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			log.Fatalf("Server failed to start: %v", err)
-		}
-	}()
-
-	// Wait for interrupt signal
-	quit := make(chan os.Signal, 1)
-	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
-	<-quit
-	log.Println("Shutting down server...")
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	if err := server.Shutdown(ctx); err != nil {
-		log.Fatalf("Server forced to shutdown: %v", err)
-	}
-
-	log.Println("Server exited")
-}

cmd/api/main_test.go

@@ -1,91 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/gorilla/mux"
-	"github.com/joho/godotenv"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/config"
-	"git.kundeng.us/phoenix/textsender-auth/internal/db"
-	"git.kundeng.us/phoenix/textsender-auth/internal/handler"
-	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
-	"git.kundeng.us/phoenix/textsender-auth/internal/store"
-)
-
-var testRouter *mux.Router
-
-func TestMain(m *testing.M) {
-	cfg := load()
-
-	database, err := db.NewDatabase(cfg.GetDBConnString())
-	if err != nil {
-		fmt.Println(err.Error())
-		panic("Failed to initialize database")
-	}
-	defer database.Close()
-
-	ctx := context.Background()
-	err = database.ResetDatabase(ctx)
-	if err != nil {
-		fmt.Println(err.Error())
-		panic("Failed to initialize database")
-	}
-
-	userStore := model.NewUserStore(database.Pool)
-	serviceStore := store.NewServiceStore(database.Pool)
-	userHandler := handler.NewUserHandler(userStore)
-	loginHandler := handler.NewLoginHandler(userStore)
-	serviceHandler := handler.NewServiceHandler(serviceStore)
-	refreshHandler := handler.NewRefreshHandler(userStore, serviceStore)
-
-	testRouter = mux.NewRouter()
-	testRouter.HandleFunc(endpoint.Register, userHandler.Register).Methods("POST")
-	testRouter.HandleFunc(endpoint.Login, loginHandler.Login).Methods("POST")
-	testRouter.HandleFunc(endpoint.CreateServiceUser, serviceHandler.Register).Methods("POST")
-	testRouter.HandleFunc(endpoint.LoginServiceUser, serviceHandler.Login).Methods("POST")
-	testRouter.HandleFunc(endpoint.TokenRefresh, refreshHandler.Refresh).Methods("POST")
-
-	code := m.Run()
-	os.Exit(code)
-}
-
-func load() *config.Config {
-	resetDb := flag.Bool("reset-db", false, "Reset the database schema and exit")
-	port := flag.String("port", config.Port, "Server port")
-	flag.Parse()
-
-	cwd, _ := os.Getwd()
-	envPath := path.Join(cwd, ".env")
-
-	err := godotenv.Load(envPath)
-	if err != nil {
-		envPath = path.Join(cwd, "../..", ".env")
-		if err := godotenv.Load(envPath); err != nil {
-			panic("Error loading .env file: " + err.Error())
-		}
-	}
-
-	unpackedConnString := config.UnpackDBConnString()
-	dbConnString := unpackedConnString.Parse()
-
-	return &config.Config{
-		DBConnString: dbConnString,
-		ServerPort:   *port,
-		ResetDB:      *resetDb,
-	}
-}
-
-func resetTestDB(t *testing.T) {
-	t.Helper()
-	_, err := db.Pool.Exec(context.Background(), "DELETE FROM users")
-	if err != nil {
-		t.Fatalf("Failed to reset test database: %v", err)
-	}
-}

docker-compose.yml

@@ -1,6 +1,7 @@
 version: '3.8' # Use a recent version
 
 services:
+  # Your Rust Application Service
   auth_api:
     build: # Tells docker-compose to build the Dockerfile in the current directory
       context: .
@@ -18,17 +19,18 @@ services:
 
   # PostgreSQL Database Service
   auth_db:
-    image: postgres:18.0-alpine # Use an official Postgres image (Alpine variant is smaller)
+    image: postgres:18.4-alpine # Use an official Postgres image (Alpine variant is smaller)
     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: ${POSTGRES_AUTH_USER:-textsender_auth}
-      POSTGRES_PASSWORD: ${POSTGRES_AUTH_PASSWORD:-password}
-      POSTGRES_DB: ${POSTGRES_AUTH_DB:-textsender_auth_db}
+      POSTGRES_USER: ${DB_AUTH_USER:-textsender_op}
+      POSTGRES_PASSWORD: ${DB_AUTH_PASSWORD:-password}
+      POSTGRES_DB: ${DB_AUTH_NAME:-textsender_auth_db}
     volumes:
       # Persist database data using a named volume
-      - postgres_data:/var/lib/postgresql/data
-    ports: []
+      - postgres_data:/var/lib/postgresql
+    ports:
+      - "5433:5432"
     healthcheck:
         # Checks if Postgres is ready to accept connections
         test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]

docs/docs.go

@@ -1,466 +0,0 @@
-// Package docs Code generated by swaggo/swag. DO NOT EDIT
-package docs
-
-import "github.com/swaggo/swag"
-
-const docTemplate = `{
-    "schemes": {{ marshal .Schemes }},
-    "swagger": "2.0",
-    "info": {
-        "description": "{{escape .Description}}",
-        "title": "{{.Title}}",
-        "contact": {},
-        "version": "{{.Version}}"
-    },
-    "host": "{{.Host}}",
-    "basePath": "{{.BasePath}}",
-    "paths": {
-        "/login": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Login and be given an access token (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "users"
-                ],
-                "summary": "Login",
-                "parameters": [
-                    {
-                        "description": "Data to obtain a token",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.LoginAccount"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.LoginResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/handler.LoginResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.LoginResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/register": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Create a user that can send texts (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "users"
-                ],
-                "summary": "Register user",
-                "parameters": [
-                    {
-                        "description": "Data to add user",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.RegisterUser"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RegisterResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RegisterResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RegisterResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/service/login": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Servce login and be given an access token (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "service users"
-                ],
-                "summary": "Service login",
-                "parameters": [
-                    {
-                        "description": "Data to obtain a service token",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceLoginRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceLoginResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceLoginResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/service/register": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Create a service user that can send texts (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "service users"
-                ],
-                "summary": "Register service user",
-                "parameters": [
-                    {
-                        "description": "Data to add user",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceCreationRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceCreationResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceCreationResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceCreationResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/token/refresh": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Refresh token endpoint (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "refresh"
-                ],
-                "summary": "Obtain a refresh token",
-                "parameters": [
-                    {
-                        "description": "Data to refresh token",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.RefreshRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RefreshResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RefreshResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RefreshResponse"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "definitions": {
-        "handler.LoginAccount": {
-            "type": "object",
-            "properties": {
-                "password": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.LoginResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/token.Login"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RefreshRequest": {
-            "type": "object",
-            "properties": {
-                "access_token": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RefreshResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/token.Login"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RegisterResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/handler.RegisterResponseItem"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RegisterResponseItem": {
-            "type": "object",
-            "properties": {
-                "id": {
-                    "type": "string"
-                },
-                "phone_number": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RegisterUser": {
-            "type": "object",
-            "properties": {
-                "password": {
-                    "type": "string"
-                },
-                "phone_number": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.ServiceCreationRequest": {
-            "type": "object",
-            "properties": {
-                "passphrase": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.ServiceCreationResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/user.ServiceUser"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.ServiceLoginRequest": {
-            "type": "object",
-            "properties": {
-                "passphrase": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.ServiceLoginResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/token.Login"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "token.Login": {
-            "type": "object",
-            "properties": {
-                "access_token": {
-                    "type": "string"
-                },
-                "expires_in": {
-                    "type": "integer"
-                },
-                "token_type": {
-                    "type": "string"
-                }
-            }
-        },
-        "user.ServiceUser": {
-            "type": "object",
-            "properties": {
-                "date_created": {
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "passphrase": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        }
-    },
-    "securityDefinitions": {
-        "BearerAuth": {
-            "description": "JWT Bearer Token",
-            "type": "apiKey",
-            "name": "Authorization",
-            "in": "header"
-        }
-    }
-}`
-
-// SwaggerInfo holds exported Swagger Info so clients can modify it
-var SwaggerInfo = &swag.Spec{
-	Version:          "1.0",
-	Host:             "localhost:9080",
-	BasePath:         "/api/v1",
-	Schemes:          []string{},
-	Title:            "textsender-auth",
-	Description:      "Auth API to send text messages",
-	InfoInstanceName: "swagger",
-	SwaggerTemplate:  docTemplate,
-	LeftDelim:        "{{",
-	RightDelim:       "}}",
-}
-
-func init() {
-	swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo)
-}

docs/swagger.json

@@ -1,442 +0,0 @@
-{
-    "swagger": "2.0",
-    "info": {
-        "description": "Auth API to send text messages",
-        "title": "textsender-auth",
-        "contact": {},
-        "version": "1.0"
-    },
-    "host": "localhost:9080",
-    "basePath": "/api/v1",
-    "paths": {
-        "/login": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Login and be given an access token (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "users"
-                ],
-                "summary": "Login",
-                "parameters": [
-                    {
-                        "description": "Data to obtain a token",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.LoginAccount"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.LoginResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/handler.LoginResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.LoginResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/register": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Create a user that can send texts (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "users"
-                ],
-                "summary": "Register user",
-                "parameters": [
-                    {
-                        "description": "Data to add user",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.RegisterUser"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RegisterResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RegisterResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RegisterResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/service/login": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Servce login and be given an access token (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "service users"
-                ],
-                "summary": "Service login",
-                "parameters": [
-                    {
-                        "description": "Data to obtain a service token",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceLoginRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceLoginResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceLoginResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/service/register": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Create a service user that can send texts (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "service users"
-                ],
-                "summary": "Register service user",
-                "parameters": [
-                    {
-                        "description": "Data to add user",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceCreationRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceCreationResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceCreationResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.ServiceCreationResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/token/refresh": {
-            "post": {
-                "security": [
-                    {
-                        "BearerAuth": []
-                    }
-                ],
-                "description": "Refresh token endpoint (requires JWT)",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "refresh"
-                ],
-                "summary": "Obtain a refresh token",
-                "parameters": [
-                    {
-                        "description": "Data to refresh token",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/handler.RefreshRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RefreshResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RefreshResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RefreshResponse"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "definitions": {
-        "handler.LoginAccount": {
-            "type": "object",
-            "properties": {
-                "password": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.LoginResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/token.Login"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RefreshRequest": {
-            "type": "object",
-            "properties": {
-                "access_token": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RefreshResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/token.Login"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RegisterResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/handler.RegisterResponseItem"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RegisterResponseItem": {
-            "type": "object",
-            "properties": {
-                "id": {
-                    "type": "string"
-                },
-                "phone_number": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.RegisterUser": {
-            "type": "object",
-            "properties": {
-                "password": {
-                    "type": "string"
-                },
-                "phone_number": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.ServiceCreationRequest": {
-            "type": "object",
-            "properties": {
-                "passphrase": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.ServiceCreationResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/user.ServiceUser"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.ServiceLoginRequest": {
-            "type": "object",
-            "properties": {
-                "passphrase": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "handler.ServiceLoginResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/token.Login"
-                    }
-                },
-                "message": {
-                    "type": "string"
-                }
-            }
-        },
-        "token.Login": {
-            "type": "object",
-            "properties": {
-                "access_token": {
-                    "type": "string"
-                },
-                "expires_in": {
-                    "type": "integer"
-                },
-                "token_type": {
-                    "type": "string"
-                }
-            }
-        },
-        "user.ServiceUser": {
-            "type": "object",
-            "properties": {
-                "date_created": {
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "passphrase": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        }
-    },
-    "securityDefinitions": {
-        "BearerAuth": {
-            "description": "JWT Bearer Token",
-            "type": "apiKey",
-            "name": "Authorization",
-            "in": "header"
-        }
-    }
-}

docs/swagger.yaml

@@ -1,281 +0,0 @@
-basePath: /api/v1
-definitions:
-  handler.LoginAccount:
-    properties:
-      password:
-        type: string
-      username:
-        type: string
-    type: object
-  handler.LoginResponse:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/token.Login'
-        type: array
-      message:
-        type: string
-    type: object
-  handler.RefreshRequest:
-    properties:
-      access_token:
-        type: string
-    type: object
-  handler.RefreshResponse:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/token.Login'
-        type: array
-      message:
-        type: string
-    type: object
-  handler.RegisterResponse:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/handler.RegisterResponseItem'
-        type: array
-      message:
-        type: string
-    type: object
-  handler.RegisterResponseItem:
-    properties:
-      id:
-        type: string
-      phone_number:
-        type: string
-      username:
-        type: string
-    type: object
-  handler.RegisterUser:
-    properties:
-      password:
-        type: string
-      phone_number:
-        type: string
-      username:
-        type: string
-    type: object
-  handler.ServiceCreationRequest:
-    properties:
-      passphrase:
-        type: string
-      username:
-        type: string
-    type: object
-  handler.ServiceCreationResponse:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/user.ServiceUser'
-        type: array
-      message:
-        type: string
-    type: object
-  handler.ServiceLoginRequest:
-    properties:
-      passphrase:
-        type: string
-      username:
-        type: string
-    type: object
-  handler.ServiceLoginResponse:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/token.Login'
-        type: array
-      message:
-        type: string
-    type: object
-  token.Login:
-    properties:
-      access_token:
-        type: string
-      expires_in:
-        type: integer
-      token_type:
-        type: string
-    type: object
-  user.ServiceUser:
-    properties:
-      date_created:
-        type: string
-      id:
-        type: string
-      passphrase:
-        type: string
-      username:
-        type: string
-    type: object
-host: localhost:9080
-info:
-  contact: {}
-  description: Auth API to send text messages
-  title: textsender-auth
-  version: "1.0"
-paths:
-  /login:
-    post:
-      consumes:
-      - application/json
-      description: Login and be given an access token (requires JWT)
-      parameters:
-      - description: Data to obtain a token
-        in: body
-        name: request
-        required: true
-        schema:
-          $ref: '#/definitions/handler.LoginAccount'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/handler.LoginResponse'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/handler.LoginResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/handler.LoginResponse'
-      security:
-      - BearerAuth: []
-      summary: Login
-      tags:
-      - users
-  /register:
-    post:
-      consumes:
-      - application/json
-      description: Create a user that can send texts (requires JWT)
-      parameters:
-      - description: Data to add user
-        in: body
-        name: request
-        required: true
-        schema:
-          $ref: '#/definitions/handler.RegisterUser'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/handler.RegisterResponse'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/handler.RegisterResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/handler.RegisterResponse'
-      security:
-      - BearerAuth: []
-      summary: Register user
-      tags:
-      - users
-  /service/login:
-    post:
-      consumes:
-      - application/json
-      description: Servce login and be given an access token (requires JWT)
-      parameters:
-      - description: Data to obtain a service token
-        in: body
-        name: request
-        required: true
-        schema:
-          $ref: '#/definitions/handler.ServiceLoginRequest'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/handler.ServiceLoginResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/handler.ServiceLoginResponse'
-      security:
-      - BearerAuth: []
-      summary: Service login
-      tags:
-      - service users
-  /service/register:
-    post:
-      consumes:
-      - application/json
-      description: Create a service user that can send texts (requires JWT)
-      parameters:
-      - description: Data to add user
-        in: body
-        name: request
-        required: true
-        schema:
-          $ref: '#/definitions/handler.ServiceCreationRequest'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/handler.ServiceCreationResponse'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/handler.ServiceCreationResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/handler.ServiceCreationResponse'
-      security:
-      - BearerAuth: []
-      summary: Register service user
-      tags:
-      - service users
-  /token/refresh:
-    post:
-      consumes:
-      - application/json
-      description: Refresh token endpoint (requires JWT)
-      parameters:
-      - description: Data to refresh token
-        in: body
-        name: request
-        required: true
-        schema:
-          $ref: '#/definitions/handler.RefreshRequest'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/handler.RefreshResponse'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/handler.RefreshResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/handler.RefreshResponse'
-      security:
-      - BearerAuth: []
-      summary: Obtain a refresh token
-      tags:
-      - refresh
-securityDefinitions:
-  BearerAuth:
-    description: JWT Bearer Token
-    in: header
-    name: Authorization
-    type: apiKey
-swagger: "2.0"

go.mod

@@ -1,40 +0,0 @@
-module git.kundeng.us/phoenix/textsender-auth
-
-go 1.25.4
-
-require (
-	git.kundeng.us/phoenix/textsender-models v0.0.9
-	github.com/go-chi/chi/v5 v5.2.3
-	github.com/golang-jwt/jwt/v5 v5.3.0
-	github.com/google/uuid v1.6.0
-	github.com/gorilla/mux v1.8.1
-	github.com/jackc/pgx/v5 v5.7.5
-	github.com/joho/godotenv v1.5.1
-	github.com/stretchr/testify v1.11.1
-	github.com/swaggo/http-swagger/v2 v2.0.2
-	github.com/swaggo/swag v1.16.6
-	golang.org/x/crypto v0.42.0
-)
-
-require (
-	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/spec v0.20.6 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/puddle/v2 v2.2.2 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.14.1 // indirect
-	github.com/swaggo/files/v2 v2.0.0 // indirect
-	golang.org/x/mod v0.27.0 // indirect
-	golang.org/x/sync v0.17.0 // indirect
-	golang.org/x/text v0.29.0 // indirect
-	golang.org/x/tools v0.36.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)

go.sum

@@ -1,90 +0,0 @@
-git.kundeng.us/phoenix/textsender-models v0.0.9 h1:wHEbDLYzMpXQ8OaIf05xFY1V19iTpQogTJEuKInkjEQ=
-git.kundeng.us/phoenix/textsender-models v0.0.9/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
-github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
-github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
-github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ=
-github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
-github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
-github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
-github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.5 h1:JHGfMnQY+IEtGM63d+NGMjoRpysB2JBwDr5fsngwmJs=
-github.com/jackc/pgx/v5 v5.7.5/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M=
-github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
-github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/swaggo/files/v2 v2.0.0 h1:hmAt8Dkynw7Ssz46F6pn8ok6YmGZqHSVLZ+HQM7i0kw=
-github.com/swaggo/files/v2 v2.0.0/go.mod h1:24kk2Y9NYEJ5lHuCra6iVwkMjIekMCaFq/0JQj66kyM=
-github.com/swaggo/http-swagger/v2 v2.0.2 h1:FKCdLsl+sFCx60KFsyM0rDarwiUSZ8DqbfSyIKC9OBg=
-github.com/swaggo/http-swagger/v2 v2.0.2/go.mod h1:r7/GBkAWIfK6E/OLnE8fXnviHiDeAHmgIyooa4xm3AQ=
-github.com/swaggo/swag v1.16.6 h1:qBNcx53ZaX+M5dxVyTrgQ0PJ/ACK+NzhwcbieTt+9yI=
-github.com/swaggo/swag v1.16.6/go.mod h1:ngP2etMK5a0P3QBizic5MEwpRmluJZPHjXcMoj4Xesg=
-golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
-golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
-golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
-golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
-golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
-golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
-golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
-golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/config/config.go

@@ -1,125 +0,0 @@
-package config
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"strconv"
-
-	"github.com/joho/godotenv"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/version"
-)
-
-type Config struct {
-	DBConnString string
-	ServerPort   string
-	ResetDB      bool
-}
-
-type ConnectionInfo struct {
-	Username string
-	Password string
-	Database string
-	Host     string
-	Port     int
-	SslMode  string
-}
-
-const Port = "9080"
-const App_Name = "textsender_auth"
-
-func (ci ConnectionInfo) Parse() string {
-	return fmt.Sprintf("postgres://%s:%s@%s:%d/%s?sslmode=%s", ci.Username, ci.Password, ci.Host, ci.Port, ci.Database, ci.SslMode)
-}
-
-func PrintName() {
-	fmt.Println(App_Name)
-	fmt.Println(version.String())
-}
-
-func Load() *Config {
-	versionFlag := flag.Bool("version", false, "Print version information")
-	resetDb := flag.Bool("reset-db", false, "Reset the database schema and exit")
-	port := flag.String("port", Port, "Server port")
-	flag.Parse()
-
-	if *versionFlag {
-		fmt.Println(version.String())
-		os.Exit(-1)
-	}
-
-	err := godotenv.Load()
-	if err != nil {
-		log.Fatal("Error loading .env file")
-	}
-
-	unpackedConnString := UnpackDBConnString()
-	dbConnString := unpackedConnString.Parse()
-
-	return &Config{
-		DBConnString: dbConnString,
-		ServerPort:   *port,
-		ResetDB:      *resetDb,
-	}
-}
-
-func GetSecretKey() string {
-	return os.Getenv("SECRET_KEY")
-}
-
-func UnpackDBConnString() (connInfo ConnectionInfo) {
-	username := os.Getenv("DB_USER")
-	password := os.Getenv("DB_PASSWORD")
-	host := os.Getenv("DB_HOST")
-	port := os.Getenv("DB_PORT")
-	database := os.Getenv("DB_NAME")
-	sslMode := os.Getenv("DB_SSLMODE")
-
-	if username != "" {
-		connInfo.Username = username
-	} else {
-		connInfo.Username = "user"
-	}
-
-	if password != "" {
-		connInfo.Password = password
-	} else {
-		connInfo.Password = "password"
-	}
-
-	if host != "" {
-		connInfo.Host = host
-	} else {
-		connInfo.Host = "localhost"
-	}
-
-	if port != "" {
-		num, err := strconv.Atoi(port)
-		if err != nil {
-			return
-		}
-		connInfo.Port = num
-	} else {
-		connInfo.Port = 5432
-	}
-
-	if database != "" {
-		connInfo.Database = database
-	} else {
-		connInfo.Database = "textsender_auth_db"
-	}
-
-	if sslMode != "" {
-		connInfo.SslMode = sslMode
-	} else {
-		connInfo.SslMode = "disable"
-	}
-
-	return
-}
-
-func (c *Config) GetDBConnString() string {
-	return c.DBConnString
-}

internal/db/connection.go

@@ -1,136 +0,0 @@
-// db/connection.go
-package db
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"os"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/jackc/pgx/v5/pgxpool"
-)
-
-var Pool *pgxpool.Pool
-
-type Database struct {
-	Pool *pgxpool.Pool
-}
-
-func NewDatabase(connString string) (*Database, error) {
-	ctx := context.Background()
-	// Parse the connection string and create pool configuration
-	config, err := pgxpool.ParseConfig(connString)
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse DSN: %v", err)
-	}
-
-	// Configure connection pool settings
-	config.MaxConns = 25
-	config.MinConns = 5
-	config.MaxConnLifetime = time.Hour
-	config.MaxConnIdleTime = 30 * time.Minute
-	config.HealthCheckPeriod = time.Minute
-
-	// Configure connection timeouts
-	config.ConnConfig.ConnectTimeout = 10 * time.Second
-	config.ConnConfig.RuntimeParams["timezone"] = "UTC"
-
-	// Create the connection pool
-	pool, err := pgxpool.NewWithConfig(ctx, config)
-	if err != nil {
-		return nil, fmt.Errorf("unable to create connection pool: %v", err)
-	}
-
-	// Test the connection with a short timeout
-	if err := pool.Ping(ctx); err != nil {
-		pool.Close()
-		return nil, fmt.Errorf("unable to ping database: %v", err)
-	}
-
-	log.Printf("Successfully connected to database")
-	return &Database{Pool: pool}, nil
-}
-
-func TableExists(ctx context.Context, conn *pgxpool.Pool, tableName string) (bool, error) {
-	var exists bool
-
-	query := `
-        SELECT EXISTS (
-            SELECT FROM information_schema.tables
-            WHERE table_schema = 'public'
-            AND table_name = $1
-        );
-    `
-
-	err := conn.QueryRow(ctx, query, tableName).Scan(&exists)
-	if err != nil {
-		return false, fmt.Errorf("error checking if table exists: %w", err)
-	}
-
-	return exists, nil
-}
-
-func (db *Database) Close() {
-	if db.Pool != nil {
-		db.Pool.Close()
-		log.Println("Database connection pool closed")
-	}
-}
-
-// HealthCheck verifies the database connection is still alive
-func (db *Database) HealthCheck(ctx context.Context) error {
-	return db.Pool.Ping(ctx)
-}
-
-// GetPoolStats returns connection pool statistics
-func (db *Database) GetPoolStats() string {
-	stats := db.Pool.Stat()
-	return fmt.Sprintf("TotalConns: %d, IdleConns: %d, AcquiredConns: %d",
-		stats.TotalConns(), stats.IdleConns(), stats.AcquiredConns())
-}
-
-func (db *Database) ResetDatabase(ctx context.Context) error {
-	tx, err := db.Pool.Begin(ctx)
-	if err != nil {
-		return fmt.Errorf("Transaction unable to begin: %v", err)
-	}
-	defer tx.Rollback(ctx)
-
-	schemaContent, err := os.ReadFile("migrations/schema.sql")
-	if err != nil {
-		log.Println("Default migrations not found. Checking different directory")
-		cwd, _ := os.Getwd()
-		migrationsPath := path.Join(cwd, "../..", "migrations/schema.sql")
-		schemaContent, err = os.ReadFile(migrationsPath)
-		if err != nil {
-			return fmt.Errorf("error reading schema file: %v", err)
-		}
-	}
-
-	for _, stmt := range strings.Split(string(schemaContent), ";") {
-		stmt = strings.TrimSpace(stmt)
-		if stmt == "" {
-			continue
-		}
-
-		if strings.HasPrefix(stmt, "--") {
-			continue
-		}
-
-		_, err := tx.Exec(ctx, stmt)
-		if err != nil {
-			return fmt.Errorf("error executing SQL statement: %v\nStatement: %s", err, stmt)
-		}
-	}
-
-	if err := tx.Commit(ctx); err != nil {
-		return fmt.Errorf("unable to commit transaction: %v", err)
-	}
-
-	log.Println("Database schema applied successfully")
-
-	return nil
-}

internal/handler/endpoint/endpoint.go

@@ -1,8 +0,0 @@
-package endpoint
-
-// Endpoint for registering a user
-const Register = "/api/v1/register"
-const Login = "/api/v1/login"
-const CreateServiceUser = "/api/v1/service/register"
-const LoginServiceUser = "/api/v1/service/login"
-const TokenRefresh = "/api/v1/token/refresh"

internal/handler/login.go

@@ -1,92 +0,0 @@
-package handler
-
-import (
-	"fmt"
-	"net/http"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/token"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/config"
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
-	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
-)
-
-type LoginAccount struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
-type LoginResponse struct {
-	Message string        `json:"message"`
-	Data    []token.Login `json:"data"`
-}
-
-type LoginHandler struct {
-	UserStore model.UserStore
-}
-
-func NewLoginHandler(userStore model.UserStore) *LoginHandler {
-	return &LoginHandler{UserStore: userStore}
-}
-
-// Login godoc
-// @Summary      Login
-// @Description  Login and be given an access token (requires JWT)
-// @Tags         users
-// @Accept       json
-// @Produce      json
-// @Security     BearerAuth
-// @Param        request body      LoginAccount true  "Data to obtain a token"
-// @Success      200  {object}  LoginResponse
-// @Failure      400  {object}  LoginResponse
-// @Failure      500  {object}  LoginResponse
-// @Router       /login [post]
-func (l *LoginHandler) Login(w http.ResponseWriter, r *http.Request) {
-	var req LoginAccount
-	if err := ExtractFromRequest(r, &req); err != nil {
-		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
-	}
-	defer r.Body.Close()
-
-	var statusCode int
-	var resp LoginResponse
-
-	ctx := r.Context()
-
-	if exists, err := l.UserStore.UserExists(ctx, req.Username); err != nil {
-		fmt.Printf("Error: %v", err)
-		statusCode = http.StatusInternalServerError
-		resp.Message = err.Error()
-	} else {
-		if !exists {
-			statusCode = http.StatusBadRequest
-			resp.Message = "Failure in user check"
-		} else {
-			if user, err := l.UserStore.GetUserByUsername(ctx, req.Username); err != nil {
-				statusCode = http.StatusInternalServerError
-				resp.Message = err.Error()
-			} else {
-				hashing := utility.HashMash{Password: req.Password}
-				if hashing.CheckPasswordHash(req.Password, user.Password) {
-					var tokGen utility.TokenGenerator
-					secretKey := config.GetSecretKey()
-					tokGen.SetSecretKey(secretKey)
-					if myToken, err := tokGen.GenerateToken(*user); err != nil {
-						fmt.Println(err.Error())
-						statusCode = http.StatusInternalServerError
-						resp.Message = "Error generating token"
-					} else {
-						statusCode = http.StatusOK
-						resp.Data = append(resp.Data, *myToken)
-						resp.Message = "Successful"
-					}
-				} else {
-					statusCode = http.StatusNotFound
-					resp.Message = "User not found"
-				}
-			}
-		}
-	}
-
-	RespondWithJson(w, statusCode, &resp)
-}

internal/handler/login_test.go

@@ -1,51 +0,0 @@
-package handler
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
-	"git.kundeng.us/phoenix/textsender-auth/internal/store/mock"
-	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
-)
-
-func TestLogin(t *testing.T) {
-	mockstore := mock.NewMockUserStore()
-	handler := NewLoginHandler(mockstore)
-
-	testUser := GetTestUser()
-	unhashedPassword := testUser.Password
-	hashing := utility.HashMash{Password: testUser.Password}
-	hashedPassword, err := hashing.HashPassword()
-	assert.NoError(t, err)
-
-	testUser.Password = hashedPassword
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	mockstore.CreateUser(ctx, &testUser)
-
-	loginUser := LoginAccount{Username: testUser.Username, Password: unhashedPassword}
-	jsonValue, _ := json.Marshal(loginUser)
-
-	req, _ := http.NewRequest("POST", endpoint.Login, strings.NewReader(string(jsonValue)))
-	rr := httptest.NewRecorder()
-
-	handler.Login(rr, req)
-
-	assert.Equal(t, http.StatusOK, rr.Code)
-
-	var response LoginResponse
-	err = json.Unmarshal(rr.Body.Bytes(), &response)
-	assert.NoError(t, err)
-
-	assert.NotEmpty(t, response.Data, "An access token should have been returned")
-}

internal/handler/refresh.go

@@ -1,100 +0,0 @@
-package handler
-
-import (
-	"net/http"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/token"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/config"
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
-	"git.kundeng.us/phoenix/textsender-auth/internal/store"
-	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
-)
-
-type RefreshHandler struct {
-	UserStore    model.UserStore
-	ServiceStore store.ServiceStore
-}
-
-func NewRefreshHandler(userStore model.UserStore, serviceStore store.ServiceStore) *RefreshHandler {
-	return &RefreshHandler{UserStore: userStore, ServiceStore: serviceStore}
-}
-
-type RefreshRequest struct {
-	AccessToken string `json:"access_token"`
-}
-
-type RefreshResponse struct {
-	Message string         `json:"message"`
-	Data    []*token.Login `json:"data"`
-}
-
-// Refresh godoc
-// @Summary      Obtain a refresh token
-// @Description  Refresh token endpoint (requires JWT)
-// @Tags         refresh
-// @Accept       json
-// @Produce      json
-// @Security     BearerAuth
-// @Param        request body      RefreshRequest true  "Data to refresh token"
-// @Success      200  {object}  RefreshResponse
-// @Failure      400  {object}  RefreshResponse
-// @Failure      500  {object}  RefreshResponse
-// @Router       /token/refresh [post]
-func (rh *RefreshHandler) Refresh(w http.ResponseWriter, r *http.Request) {
-	var req RefreshRequest
-	if err := ExtractFromRequest(r, &req); err != nil {
-		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
-	}
-	defer r.Body.Close()
-
-	var statusCode int
-	var resp RefreshResponse
-
-	secretKey := config.GetSecretKey()
-	tokGen := utility.TokenGenerator{}
-	tokGen.SetSecretKey(secretKey)
-	tokGen.SetHourOffset(12)
-	if verified, err := tokGen.VerifyToken(req.AccessToken); err != nil {
-		statusCode = http.StatusInternalServerError
-		resp.Message = err.Error()
-	} else {
-		if verified {
-			if id, err := tokGen.ExtractIdFromToken(req.AccessToken); err != nil {
-				statusCode = http.StatusInternalServerError
-				resp.Message = err.Error()
-			} else {
-				ctx := r.Context()
-				if usr, err := rh.UserStore.GetUserByID(ctx, id); err != nil || usr == nil {
-					if serviceUsr, err := rh.ServiceStore.GetWithId(ctx, id); err != nil || serviceUsr == nil {
-						statusCode = http.StatusInternalServerError
-						resp.Message = err.Error()
-					} else {
-						if myToken, err := tokGen.GenerateToken(serviceUsr); err != nil {
-							statusCode = http.StatusInternalServerError
-							resp.Message = err.Error()
-						} else {
-							statusCode = http.StatusOK
-							resp.Data = append(resp.Data, myToken)
-							resp.Message = "Successful"
-						}
-					}
-				} else {
-					if myToken, err := tokGen.GenerateToken(usr); err != nil {
-						statusCode = http.StatusInternalServerError
-						resp.Message = err.Error()
-					} else {
-						statusCode = http.StatusOK
-						resp.Data = append(resp.Data, myToken)
-						resp.Message = "Successful"
-					}
-				}
-			}
-		} else {
-			statusCode = http.StatusBadRequest
-			resp.Message = "Unverified"
-		}
-	}
-
-	RespondWithJson(w, statusCode, &resp)
-}

internal/handler/refresh_test.go

@@ -1,65 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-	"github.com/stretchr/testify/assert"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
-	"git.kundeng.us/phoenix/textsender-auth/internal/store/mock"
-	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
-)
-
-func TestRefreshTokenWithMock(t *testing.T) {
-	var serviceUser user.ServiceUser
-	var hashedPassword string
-	var err error
-	unhashed := "9328nr29nudx3292m320!"
-	hashing := utility.HashMash{Password: unhashed}
-	if hashedPassword, err = hashing.HashPassword(); err != nil {
-		assert.NoError(t, err, "Error hashing password: %v", err)
-	} else {
-		serviceUser.Passphrase = hashedPassword
-	}
-	serviceUser.Username = "swoon"
-	ctx := t.Context()
-	mockStore := mock.NewMockServiceUserStore()
-	userStore := mock.NewMockUserStore()
-
-	if err := mockStore.Create(ctx, &serviceUser); err != nil {
-		assert.NoError(t, err, "Error creating service user: %v", err)
-	}
-
-	handler := NewServiceHandler(mockStore)
-	testService := ServiceLoginRequest{Username: serviceUser.Username, Passphrase: unhashed}
-	jsonValue, err := json.Marshal(testService)
-	assert.NoError(t, err, "Error marshaling request")
-
-	req, _ := http.NewRequest("POST", endpoint.LoginServiceUser, strings.NewReader(string(jsonValue)))
-	rr := httptest.NewRecorder()
-
-	handler.Login(rr, req)
-	assert.Equal(t, http.StatusOK, rr.Code)
-
-	var response ServiceLoginResponse
-	err = json.Unmarshal(rr.Body.Bytes(), &response)
-	assert.NoError(t, err)
-
-	accessToken := response.Data[0].AccessToken
-
-	testReq := RefreshRequest{AccessToken: accessToken}
-	jsonValue, err = json.Marshal(testReq)
-	assert.NoError(t, err, "Error marshaling request")
-
-	newHandler := NewRefreshHandler(userStore, mockStore)
-	req, _ = http.NewRequest("POST", endpoint.TokenRefresh, strings.NewReader(string(jsonValue)))
-	rr = httptest.NewRecorder()
-
-	newHandler.Refresh(rr, req)
-	assert.Equal(t, http.StatusOK, rr.Code)
-}

internal/handler/register.go

@@ -1,100 +0,0 @@
-package handler
-
-import (
-	"fmt"
-	"net/http"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-	"github.com/google/uuid"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
-	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
-)
-
-type RegisterUser struct {
-	PhoneNumber string `json:"phone_number"`
-	Username    string `json:"username"`
-	Password    string `json:"password"`
-}
-
-type RegisterResponseItem struct {
-	Id          uuid.UUID `json:"id"`
-	PhoneNumber string    `json:"phone_number"`
-	Username    string    `json:"username"`
-}
-
-type RegisterResponse struct {
-	Message string                 `json:"message"`
-	Data    []RegisterResponseItem `json:"data"`
-}
-
-type UserHandler struct {
-	UserStore model.UserStore
-}
-
-func NewUserHandler(userStore model.UserStore) *UserHandler {
-	return &UserHandler{UserStore: userStore}
-}
-
-// Register godoc
-// @Summary      Register user
-// @Description  Create a user that can send texts (requires JWT)
-// @Tags         users
-// @Accept       json
-// @Produce      json
-// @Security     BearerAuth
-// @Param        request body      RegisterUser true  "Data to add user"
-// @Success      200  {object}  RegisterResponse
-// @Failure      400  {object}  RegisterResponse
-// @Failure      500  {object}  RegisterResponse
-// @Router       /register [post]
-func (u *UserHandler) Register(w http.ResponseWriter, r *http.Request) {
-	var req RegisterUser
-	err := ExtractFromRequest(r, &req)
-	if err != nil {
-		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	defer r.Body.Close()
-
-	var statusCode int
-	var resp RegisterResponse
-	user := user.User{Username: req.Username, Password: req.Password, PhoneNumber: req.PhoneNumber}
-
-	fmt.Println("Username:", user.Username)
-
-	ctx := r.Context()
-
-	if exists, err := u.UserStore.UserExists(ctx, user.Username); err != nil {
-		fmt.Printf("Error: %v", err)
-		statusCode = http.StatusInternalServerError
-		resp.Message = err.Error()
-	} else {
-		if exists {
-			// User already exists
-			statusCode = http.StatusBadRequest
-			resp.Message = "Failure in creating User"
-		} else {
-			hashing := utility.HashMash{Password: user.Password}
-			if hashedPassword, err := hashing.HashPassword(); err != nil {
-				statusCode = http.StatusInternalServerError
-				resp.Message = err.Error()
-			} else {
-				user.Password = hashedPassword
-				err := u.UserStore.CreateUser(ctx, &user)
-				if err != nil {
-					statusCode = http.StatusInternalServerError
-					resp.Message = err.Error()
-				} else {
-					resp.Message = "Successful"
-					statusCode = http.StatusOK
-					resp.Data = append(resp.Data, RegisterResponseItem{Id: user.Id, PhoneNumber: user.PhoneNumber, Username: user.Username})
-				}
-			}
-		}
-
-	}
-
-	RespondWithJson(w, statusCode, &resp)
-}

internal/handler/register_test.go

@@ -1,35 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
-	"git.kundeng.us/phoenix/textsender-auth/internal/store/mock"
-)
-
-func TestCreateUserWithMock(t *testing.T) {
-	mockstore := mock.NewMockUserStore()
-	handler := NewUserHandler(mockstore)
-
-	testUser := GetTestUser()
-	jsonValue, _ := json.Marshal(testUser)
-
-	req, _ := http.NewRequest("POST", endpoint.Register, strings.NewReader(string(jsonValue)))
-	rr := httptest.NewRecorder()
-
-	handler.Register(rr, req)
-
-	assert.Equal(t, http.StatusOK, rr.Code)
-
-	var response RegisterResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
-	assert.NoError(t, err)
-
-	assert.NotNil(t, response.Data[0].Id, "Id should not be nil")
-}

internal/handler/service.go

@@ -1,157 +0,0 @@
-package handler
-
-import (
-	"net/http"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/token"
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/config"
-	"git.kundeng.us/phoenix/textsender-auth/internal/store"
-	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
-)
-
-type ServiceHandler struct {
-	ServiceStore store.ServiceStore
-}
-
-func NewServiceHandler(serviceStore store.ServiceStore) *ServiceHandler {
-	return &ServiceHandler{ServiceStore: serviceStore}
-}
-
-type ServiceCreationRequest struct {
-	Username   string `json:"username"`
-	Passphrase string `json:"passphrase"`
-}
-
-type ServiceCreationResponse struct {
-	Message string              `json:"message"`
-	Data    []*user.ServiceUser `json:"data"`
-}
-
-// Register godoc
-// @Summary      Register service user
-// @Description  Create a service user that can send texts (requires JWT)
-// @Tags         service users
-// @Accept       json
-// @Produce      json
-// @Security     BearerAuth
-// @Param        request body      ServiceCreationRequest true  "Data to add user"
-// @Success      200  {object}  ServiceCreationResponse
-// @Failure      400  {object}  ServiceCreationResponse
-// @Failure      500  {object}  ServiceCreationResponse
-// @Router       /service/register [post]
-func (s *ServiceHandler) Register(w http.ResponseWriter, r *http.Request) {
-	var req ServiceCreationRequest
-	if err := ExtractFromRequest(r, &req); err != nil {
-		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	defer r.Body.Close()
-
-	var statusCode int
-	var resp ServiceCreationResponse
-
-	ctx := r.Context()
-	if exists, err := s.ServiceStore.CheckWithUsername(ctx, req.Username); err != nil {
-		statusCode = http.StatusInternalServerError
-		resp.Message = err.Error()
-	} else {
-		if exists {
-			statusCode = http.StatusBadRequest
-			resp.Message = "Service user already exists"
-		} else {
-			hashing := utility.HashMash{Password: req.Passphrase}
-			if hashedPassword, err := hashing.HashPassword(); err != nil {
-				statusCode = http.StatusInternalServerError
-				resp.Message = err.Error()
-			} else {
-				serviceUser := user.ServiceUser{Username: req.Username, Passphrase: hashedPassword}
-				if err := s.ServiceStore.Create(ctx, &serviceUser); err != nil {
-					statusCode = http.StatusInternalServerError
-					resp.Message = err.Error()
-				} else {
-					statusCode = http.StatusCreated
-					resp.Message = "Successful"
-					resp.Data = append(resp.Data, &serviceUser)
-				}
-			}
-		}
-	}
-
-	RespondWithJson(w, statusCode, &resp)
-}
-
-type ServiceLoginRequest struct {
-	Username   string `json:"username"`
-	Passphrase string `json:"passphrase"`
-}
-
-type ServiceLoginResponse struct {
-	Message string         `json:"message"`
-	Data    []*token.Login `json:"data"`
-}
-
-// Login godoc
-// @Summary      Service login
-// @Description  Servce login and be given an access token (requires JWT)
-// @Tags         service users
-// @Accept       json
-// @Produce      json
-// @Security     BearerAuth
-// @Param        request body      ServiceLoginRequest true  "Data to obtain a service token"
-// @Success      200  {object}  ServiceLoginResponse
-// @Failure      500  {object}  ServiceLoginResponse
-// @Router       /service/login [post]
-func (s *ServiceHandler) Login(w http.ResponseWriter, r *http.Request) {
-	var req ServiceLoginRequest
-	if err := ExtractFromRequest(r, &req); err != nil {
-		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
-	}
-	defer r.Body.Close()
-
-	var statusCode int
-	var resp ServiceLoginResponse
-
-	if len(req.Username) == 0 || len(req.Passphrase) == 0 {
-		statusCode = http.StatusBadRequest
-		resp.Message = "Invalid request"
-		RespondWithJson(w, statusCode, &resp)
-		return
-	}
-
-	ctx := r.Context()
-
-	if serviceUser, err := s.ServiceStore.GetWithUsername(ctx, req.Username); err != nil {
-		statusCode = http.StatusInternalServerError
-		resp.Message = err.Error()
-	} else {
-		if serviceUser == nil {
-			statusCode = http.StatusNotFound
-			resp.Message = "Not found"
-		} else {
-			hashing := utility.HashMash{Password: req.Passphrase}
-			if !hashing.CheckPasswordHash(req.Passphrase, serviceUser.Passphrase) {
-				statusCode = http.StatusInternalServerError
-				resp.Message = "Not valid"
-			} else {
-				var tokGen utility.TokenGenerator
-				tokGen.SetHourOffset(8)
-				secretKey := config.GetSecretKey()
-				tokGen.SetSecretKey(secretKey)
-
-				if myToken, err := tokGen.GenerateToken(*serviceUser); err != nil {
-					statusCode = http.StatusInternalServerError
-					resp.Message = err.Error()
-				} else {
-					statusCode = http.StatusOK
-					resp.Data = append(resp.Data, myToken)
-					resp.Message = "Successful"
-				}
-			}
-		}
-	}
-
-	RespondWithJson(w, statusCode, &resp)
-}

internal/handler/service_test.go

@@ -1,70 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-	"github.com/stretchr/testify/assert"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
-	"git.kundeng.us/phoenix/textsender-auth/internal/store/mock"
-	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
-)
-
-func TestCreateServiceUserWithMock(t *testing.T) {
-	mockStore := mock.NewMockServiceUserStore()
-	handler := NewServiceHandler(mockStore)
-
-	testService := ServiceCreationRequest{Username: "swoon", Passphrase: "ewrewr329n12y3x2!2"}
-	jsonValue, err := json.Marshal(testService)
-	assert.NoError(t, err, "Error marshaling request")
-
-	req, _ := http.NewRequest("POST", endpoint.CreateServiceUser, strings.NewReader(string(jsonValue)))
-	rr := httptest.NewRecorder()
-
-	handler.Register(rr, req)
-	assert.Equal(t, http.StatusCreated, rr.Code)
-
-	var response ServiceCreationResponse
-	err = json.Unmarshal(rr.Body.Bytes(), &response)
-	assert.NoError(t, err)
-}
-
-func TestLoginServiceUserWithMock(t *testing.T) {
-	var serviceUser user.ServiceUser
-	var hashedPassword string
-	var err error
-	unhashed := "9328nr29nudx3292m320!"
-	hashing := utility.HashMash{Password: unhashed}
-	if hashedPassword, err = hashing.HashPassword(); err != nil {
-		assert.NoError(t, err, "Error hashing password: %v", err)
-	} else {
-		serviceUser.Passphrase = hashedPassword
-	}
-	serviceUser.Username = "swoon"
-	ctx := t.Context()
-	mockStore := mock.NewMockServiceUserStore()
-
-	if err := mockStore.Create(ctx, &serviceUser); err != nil {
-		assert.NoError(t, err, "Error creating service user: %v", err)
-	}
-
-	handler := NewServiceHandler(mockStore)
-	testService := ServiceLoginRequest{Username: serviceUser.Username, Passphrase: unhashed}
-	jsonValue, err := json.Marshal(testService)
-	assert.NoError(t, err, "Error marshaling request")
-
-	req, _ := http.NewRequest("POST", endpoint.LoginServiceUser, strings.NewReader(string(jsonValue)))
-	rr := httptest.NewRecorder()
-
-	handler.Login(rr, req)
-	assert.Equal(t, http.StatusOK, rr.Code)
-
-	var response ServiceLoginResponse
-	err = json.Unmarshal(rr.Body.Bytes(), &response)
-	assert.NoError(t, err)
-}

internal/handler/utility.go

@@ -1,21 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"net/http"
-)
-
-func ExtractFromRequest(r *http.Request, reqItem interface{}) error {
-	err := json.NewDecoder(r.Body).Decode(&reqItem)
-	if err != nil {
-		return err
-	} else {
-		return nil
-	}
-}
-
-func RespondWithJson(w http.ResponseWriter, statusCode int, data interface{}) {
-	w.Header().Set("Content-type", "application/json")
-	w.WriteHeader(statusCode)
-	json.NewEncoder(w).Encode(data)
-}

internal/handler/utility_test.go

@@ -1,9 +0,0 @@
-package handler
-
-import (
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-)
-
-func GetTestUser() user.User {
-	return user.User{Username: "ghost", PhoneNumber: "+1234567890", Password: "dfgdffddfd"}
-}

internal/middleware/middleware.go

@@ -1,22 +0,0 @@
-package middleware
-
-import (
-	"log"
-	"net/http"
-	"time"
-)
-
-func Logging(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		start := time.Now()
-		next.ServeHTTP(w, r)
-		log.Printf("%s %s %v", r.Method, r.URL.Path, time.Since(start))
-	})
-}
-
-func JSONContentType(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json")
-		next.ServeHTTP(w, r)
-	})
-}

internal/model/user.go

@@ -1,116 +0,0 @@
-package model
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgxpool"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-)
-
-
-type UserStore interface {
-	CreateUser(ctx context.Context, user *user.User) error
-	GetUserByID(ctx context.Context, id uuid.UUID) (*user.User, error)
-	GetUserByUsername(ctx context.Context, username string) (*user.User, error)
-	GetAllUsers(ctx context.Context) ([]*user.User, error)
-	UserExists(ctx context.Context, username string) (bool, error)
-}
-
-type PGUserStore struct {
-	db *pgxpool.Pool
-}
-
-func NewUserStore(db *pgxpool.Pool) *PGUserStore {
-	return &PGUserStore{db: db}
-}
-
-func (s *PGUserStore) CreateUser(ctx context.Context, user *user.User) error {
-	query := `
-		INSERT INTO users (phone_number, username, password)
-		VALUES ($1, $2, $3)
-		RETURNING id, phone_number, username
-	`
-
-	return s.db.QueryRow(ctx, query, user.PhoneNumber, user.Username, user.Password).Scan(
-		&user.Id, &user.PhoneNumber, &user.Username,
-	)
-}
-
-func (s *PGUserStore) GetUserByID(ctx context.Context, id uuid.UUID) (*user.User, error) {
-	query := `SELECT id, username, password, phone_number FROM users WHERE id = $1`
-
-	var user user.User
-	err := s.db.QueryRow(ctx, query, id).Scan(
-		&user.Id, &user.Username, &user.Password, &user.PhoneNumber,
-	)
-
-	if err == pgx.ErrNoRows {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, fmt.Errorf("getting user by ID: %w", err)
-	}
-
-	return &user, nil
-}
-
-func (s *PGUserStore) GetUserByUsername(ctx context.Context, username string) (*user.User, error) {
-	query := `SELECT id, username, password, phone_number FROM users WHERE username = $1`
-
-	var user user.User
-	err := s.db.QueryRow(ctx, query, username).Scan(
-		&user.Id, &user.Username, &user.Password, &user.PhoneNumber,
-	)
-
-	if err == pgx.ErrNoRows {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, fmt.Errorf("getting user by ID: %w", err)
-	}
-
-	return &user, nil
-}
-
-func (s *PGUserStore) GetAllUsers(ctx context.Context) ([]*user.User, error) {
-	query := `SELECT id, username, password, phone_number FROM users`
-
-	rows, err := s.db.Query(ctx, query)
-	if err != nil {
-		return nil, fmt.Errorf("querying all users: %w", err)
-	}
-	defer rows.Close()
-
-	var users []*user.User
-	for rows.Next() {
-		var user user.User
-		if err := rows.Scan(
-			&user.Id, &user.Username, &user.Password, &user.PhoneNumber,
-		); err != nil {
-			return nil, fmt.Errorf("scanning user row: %w", err)
-		}
-		users = append(users, &user)
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, fmt.Errorf("iterating user rows: %w", err)
-	}
-
-	return users, nil
-}
-
-func (s *PGUserStore) UserExists(ctx context.Context, username string) (bool, error) {
-	query := `SELECT EXISTS(SELECT 1 FROM users WHERE username = $1)`
-
-	var exists bool
-	err := s.db.QueryRow(ctx, query, username).Scan(&exists)
-	if err != nil {
-		return false, fmt.Errorf("checking if user exists: %w", err)
-	}
-
-	return exists, nil
-}

internal/store/mock/service_store.go

@@ -1,103 +0,0 @@
-package mock
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"sync"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-	"github.com/google/uuid"
-)
-
-type MockServiceUserStore struct {
-	ServiceUsers           map[uuid.UUID]*user.ServiceUser
-	ServiceUsersByUsername map[string]*user.ServiceUser
-	mu                     sync.RWMutex
-	Error                  error // Optional: simulate errors
-}
-
-func NewMockServiceUserStore() *MockServiceUserStore {
-	return &MockServiceUserStore{
-		ServiceUsers:           make(map[uuid.UUID]*user.ServiceUser),
-		ServiceUsersByUsername: make(map[string]*user.ServiceUser),
-	}
-}
-
-func (m *MockServiceUserStore) Create(ctx context.Context, user *user.ServiceUser) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return m.Error
-	}
-
-	if user.Id == uuid.Nil {
-		user.Id = uuid.New()
-	}
-
-	if _, exists := m.ServiceUsersByUsername[user.Username]; exists {
-		return errors.New("service User with username already exists")
-	}
-
-	m.ServiceUsers[user.Id] = user
-	m.ServiceUsersByUsername[user.Username] = user
-	return nil
-}
-
-func (m *MockServiceUserStore) CheckWithUsername(ctx context.Context, username string) (bool, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return false, m.Error
-	}
-
-	var exists bool
-
-	for _, serviceUser := range m.ServiceUsers {
-		if serviceUser.Username == username {
-			exists = true
-			break
-		}
-	}
-
-	if !exists {
-		return exists, nil
-	} else {
-		return exists, nil
-	}
-}
-
-func (m *MockServiceUserStore) GetWithUsername(ctx context.Context, username string) (*user.ServiceUser, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return nil, m.Error
-	}
-
-	serviceUser := m.ServiceUsersByUsername[username]
-	if serviceUser != nil {
-		return serviceUser, nil
-	} else {
-		return nil, fmt.Errorf("User not found")
-	}
-}
-
-func (m *MockServiceUserStore) GetWithId(ctx context.Context, id uuid.UUID) (*user.ServiceUser, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return nil, m.Error
-	}
-
-	for _, serviceUser := range m.ServiceUsers {
-		if serviceUser.Id == id {
-			return serviceUser, nil
-		}
-	}
-
-	return nil, nil
-}

internal/store/mock/store.go

@@ -1,114 +0,0 @@
-package mock
-
-import (
-	"context"
-	"errors"
-	"sync"
-
-	"github.com/google/uuid"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-)
-
-type MockUserStore struct {
-	Users           map[uuid.UUID]*user.User
-	UsersByUsername map[string]*user.User
-	mu              sync.RWMutex
-	Error           error // Optional: simulate errors
-}
-
-func NewMockUserStore() *MockUserStore {
-	return &MockUserStore{
-		Users:           make(map[uuid.UUID]*user.User),
-		UsersByUsername: make(map[string]*user.User),
-	}
-}
-
-func (m *MockUserStore) CreateUser(ctx context.Context, user *user.User) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return m.Error
-	}
-
-	if user.Id == uuid.Nil {
-		user.Id = uuid.New()
-	}
-
-	if _, exists := m.UsersByUsername[user.Username]; exists {
-		return errors.New("User with email already exists")
-	}
-
-	m.Users[user.Id] = user
-	m.UsersByUsername[user.Username] = user
-	return nil
-}
-
-func (m *MockUserStore) GetUserByID(ctx context.Context, id uuid.UUID) (*user.User, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return nil, m.Error
-	}
-
-	if m.Error != nil {
-		return nil, m.Error
-	}
-
-	user, exists := m.Users[id]
-	if !exists {
-		return nil, errors.New("User not found")
-	}
-
-	return user, nil
-}
-
-func (m *MockUserStore) GetUserByUsername(ctx context.Context, username string) (*user.User, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return nil, m.Error
-	}
-
-	user, exists := m.UsersByUsername[username]
-	if !exists {
-		return nil, errors.New("User not found")
-	}
-
-	return user, nil
-}
-
-func (m *MockUserStore) GetAllUsers(ctx context.Context) ([]*user.User, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return nil, m.Error
-	}
-
-	users := make([]*user.User, 0, len(m.Users))
-	for _, user := range m.Users {
-		users = append(users, user)
-	}
-
-	return users, nil
-}
-
-func (m *MockUserStore) UserExists(ctx context.Context, username string) (bool, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return false, m.Error
-	}
-
-	_, exists := m.UsersByUsername[username]
-	if !exists {
-		return exists, nil
-	} else {
-		return exists, nil
-	}
-}

internal/store/service.go

@@ -1,83 +0,0 @@
-package store
-
-import (
-	"context"
-	"fmt"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgxpool"
-)
-
-type ServiceStore interface {
-	CheckWithUsername(ctx context.Context, username string) (bool, error)
-	GetWithUsername(ctx context.Context, username string) (*user.ServiceUser, error)
-	GetWithId(ctx context.Context, id uuid.UUID) (*user.ServiceUser, error)
-	Create(ctx context.Context, serviceUser *user.ServiceUser) error
-}
-
-type PGServiceStore struct {
-	db *pgxpool.Pool
-}
-
-func NewServiceStore(db *pgxpool.Pool) *PGServiceStore {
-	return &PGServiceStore{db: db}
-}
-
-func (s *PGServiceStore) CheckWithUsername(ctx context.Context, username string) (bool, error) {
-	var exists bool
-	query := `SELECT EXISTS(SELECT 1 FROM service_users WHERE Username = $1)`
-
-	if err := s.db.QueryRow(ctx, query, username).Scan(&exists); err != nil {
-		if err == pgx.ErrNoRows {
-			return exists, nil
-		} else {
-			return exists, fmt.Errorf("Error querying row: %v", err)
-		}
-	} else {
-		return exists, nil
-	}
-}
-
-func (s *PGServiceStore) GetWithUsername(ctx context.Context, username string) (*user.ServiceUser, error) {
-	var serviceUser user.ServiceUser
-	query := `SELECT id, username, passphrase, created FROM service_users WHERE username = $1`
-
-	if err := s.db.QueryRow(ctx, query, username).Scan(&serviceUser.Id, &serviceUser.Username, &serviceUser.Passphrase, &serviceUser.Created); err != nil {
-		if err == pgx.ErrNoRows {
-			return nil, nil
-		} else {
-			return nil, fmt.Errorf("Error querying row: %v", err)
-		}
-	} else {
-		return &serviceUser, nil
-	}
-}
-
-func (s *PGServiceStore) GetWithId(ctx context.Context, id uuid.UUID) (*user.ServiceUser, error) {
-	var serviceUser user.ServiceUser
-	query := `SELECT id, username, passphrase, created FROM service_users WHERE id = $1`
-
-	if err := s.db.QueryRow(ctx, query, id).Scan(&serviceUser.Id, &serviceUser.Username, &serviceUser.Passphrase, &serviceUser.Created); err != nil {
-		if err == pgx.ErrNoRows {
-			return nil, nil
-		} else {
-			return nil, fmt.Errorf("Error querying row: %v", err)
-		}
-	} else {
-		return &serviceUser, nil
-	}
-}
-
-func (s *PGServiceStore) Create(ctx context.Context, serviceUser *user.ServiceUser) error {
-	query := `
-		INSERT INTO service_users (username, passphrase)
-		VALUES ($1, $2)
-		RETURNING id, created
-	`
-
-	return s.db.QueryRow(ctx, query, serviceUser.Username, serviceUser.Passphrase).Scan(
-		&serviceUser.Id, &serviceUser.Created,
-	)
-}

internal/utility/hashing.go

@@ -1,23 +0,0 @@
-package utility
-
-import (
-	"golang.org/x/crypto/bcrypt"
-)
-
-type HashMash struct {
-	Password string
-}
-
-func (h *HashMash) HashPassword() (string, error) {
-	bytes, err := bcrypt.GenerateFromPassword([]byte(h.Password), bcrypt.DefaultCost)
-	return string(bytes), err
-}
-
-func (h *HashMash) CheckPasswordHash(password string, hash string) bool {
-	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
-	return err == nil
-}
-
-func (h *HashMash) SetPassword(password string) {
-	h.Password = password
-}

internal/utility/token.go

@@ -1,140 +0,0 @@
-package utility
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/golang-jwt/jwt/v5"
-
-	"git.kundeng.us/phoenix/textsender-auth/internal/config"
-	"git.kundeng.us/phoenix/textsender-models/pkg/token"
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-)
-
-const ROLE_TYPE = "regular"
-const TOKEN_TYPE = "Bearer"
-
-type TokenGenerator struct {
-	SecretKey []byte
-	hourOffset time.Duration
-}
-
-func (t *TokenGenerator) SetSecretKey(secretKey string) {
-	t.SecretKey = []byte(secretKey)
-}
-
-func (t *TokenGenerator) SetHourOffset(offset time.Duration) error {
-	if offset < 48 {
-		t.hourOffset = offset
-		return nil
-	} else {
-		return fmt.Errorf("No change")
-	}
-}
-
-func (t *TokenGenerator) GenerateToken(usr any) (*token.Login, error) {
-	issuedAt := time.Now()
-	if t.hourOffset == 0 {
-		t.hourOffset = 4
-	}
-
-	expirationTime := time.Now().Add(t.hourOffset * time.Hour)
-
-	if claims, err := t.generateClaims(usr, TOKEN_TYPE, issuedAt, expirationTime); err != nil {
-		return nil, fmt.Errorf("Error generating claims: %v", err)
-	} else {
-		myToken := jwt.NewWithClaims(jwt.SigningMethodHS256, *claims)
-		if tokenString, err := myToken.SignedString(t.SecretKey); err != nil {
-			return nil, err
-		} else {
-			return &token.Login{AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil
-		}
-	}
-}
-
-func (t *TokenGenerator) VerifyToken(accessToken string) (bool, error) {
-	clms := &token.Claims{}
-
-	if tken, err := t.parseTokenWithClaims(accessToken, clms); err != nil {
-		return false, nil
-	} else {
-		if tken.Valid {
-			if clms != nil {
-				if clms.UserId != uuid.Nil {
-					return true, nil
-				} else {
-					return false, fmt.Errorf("User Id was not set")
-				}
-			} else {
-				return false, fmt.Errorf("Claims not parsed")
-			}
-		} else {
-			return false, fmt.Errorf("Invalid access token")
-		}
-	}
-}
-
-func (t *TokenGenerator) ExtractIdFromToken(accessToken string) (uuid.UUID, error) {
-	clms := &token.Claims{}
-
-	if tken, err := t.parseTokenWithClaims(accessToken, clms); err != nil {
-		return uuid.Nil, nil
-	} else {
-		if tken.Valid {
-			if clms != nil {
-				if clms.UserId != uuid.Nil {
-					return clms.UserId, nil
-				} else {
-					return uuid.Nil, fmt.Errorf("User Id was not set")
-				}
-			} else {
-				return uuid.Nil, fmt.Errorf("Claims not parsed")
-			}
-		} else {
-			return uuid.Nil, fmt.Errorf("Invalid access token")
-		}
-	}
-}
-
-
-func (t *TokenGenerator) parseTokenWithClaims(accessToken string, claims *token.Claims) (*jwt.Token, error) {
-	tken, err := jwt.ParseWithClaims(accessToken, claims, func(tken *jwt.Token) (any, error) {
-		if _, ok := tken.Method.(*jwt.SigningMethodHMAC); !ok {
-		    return nil, fmt.Errorf("unexpected signing method: %v", tken.Header["alg"])
-		}
-		return t.SecretKey, nil
-	}, jwt.WithValidMethods([]string{jwt.SigningMethodHS256.Alg()}))
-
-	if err != nil {
-		return nil, err
-	} else {
-		return tken, nil
-	}
-}
-
-func (t *TokenGenerator) generateClaims(usr any, role string, issuedAt time.Time, expiredAt time.Time) (*token.Claims, error) {
-	var id uuid.UUID
-	switch val := usr.(type) {
-	case user.User:
-		id = val.Id
-	case *user.User:
-		id = val.Id
-	case user.ServiceUser:
-		id = val.Id
-	case *user.ServiceUser:
-		id = val.Id
-	default:
-		return nil, fmt.Errorf("Invalid type")
-	}
-
-	return &token.Claims{
-		UserId: id,
-		Role:   role,
-		RegisteredClaims: jwt.RegisteredClaims{
-			Issuer:    config.App_Name,
-			ExpiresAt: jwt.NewNumericDate(expiredAt),
-			IssuedAt:  jwt.NewNumericDate(issuedAt),
-		},
-	}, nil
-}

internal/version/version.go

@@ -1,17 +0,0 @@
-package version
-
-import "fmt"
-
-var (
-	Version   = "dev"
-	BuildTime = "unknown"
-	Commit    = "unknown"
-	GoVersion = "unknown"
-)
-
-func String() string {
-	return fmt.Sprintf(
-		"Version: %s\nBuild Date: %s\nCommit: %s\nGo Version: %s",
-		Version, BuildTime, Commit, GoVersion,
-	)
-}

migrations/20260607214210_init.sql

@@ -0,0 +1,30 @@
+-- Add migration script here
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+
+CREATE TABLE IF NOT EXISTS "user" (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    firstname TEXT NOT NULL,
+    lastname 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,
+    salt_id UUID NOT NULL
+);

migrations/schema.sql

@@ -1,18 +0,0 @@
-CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-
-DROP TABLE IF EXISTS users CASCADE;
-DROP TABLE IF EXISTS service_users CASCADE;
-
-CREATE TABLE users (
-    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
-    phone_number TEXT NOT NULL,
-    username TEXT NOT NULL,
-    password TEXT NOT NULL
-);
-
-CREATE TABLE service_users (
-    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
-    username TEXT NOT NULL,
-    passphrase TEXT NOT NULL,
-    created timestamptz DEFAULT now()
-);

src/callers/common.rs

@@ -0,0 +1,54 @@
+pub mod response {
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct TestResult {
+        pub message: String,
+    }
+}
+
+pub mod endpoint {
+    use super::*;
+    use axum::{Extension, Json, http::StatusCode};
+
+    /// Endpoint to hit the root
+    /// basic handler that responds with a static string
+    #[utoipa::path(
+        get,
+        path = super::super::endpoints::ROOT,
+        responses(
+            (status = 200, description = "Test", body = &str),
+        )
+    )]
+    pub async fn root() -> &'static str {
+        "Hello, World!"
+    }
+
+    /// Endpoint to do a database ping
+    #[utoipa::path(
+        get,
+        path = super::super::endpoints::DBTEST,
+        responses(
+            (status = 200, description = "Successful ping of the db", body = super::response::TestResult),
+            (status = 400, description = "Failure in pinging the db", body = super::response::TestResult)
+        )
+    )]
+    pub async fn db_ping(
+        Extension(pool): Extension<sqlx::PgPool>,
+    ) -> (StatusCode, Json<response::TestResult>) {
+        match sqlx::query("SELECT 1").execute(&pool).await {
+            Ok(_) => {
+                let tr = response::TestResult {
+                    message: String::from("This works"),
+                };
+                (StatusCode::OK, Json(tr))
+            }
+            Err(e) => (
+                StatusCode::BAD_REQUEST,
+                Json(response::TestResult {
+                    message: e.to_string(),
+                }),
+            ),
+        }
+    }
+}

src/callers/login.rs

@@ -0,0 +1,830 @@
+use crate::hashing;
+use crate::repo;
+use crate::token_stuff;
+
+pub mod request {
+    use serde::Deserialize;
+    #[derive(Default, Deserialize, utoipa::ToSchema)]
+    pub struct LoginRequest {
+        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 {
+    use serde::{Deserialize, Serialize};
+    #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct LoginResponse {
+        pub message: String,
+        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> {
+        let body = axum::body::to_bytes(response.into_body(), usize::MAX)
+            .await
+            .unwrap();
+        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
+#[utoipa::path(
+    post,
+    path = super::endpoints::LOGIN,
+    request_body(
+        content = request::LoginRequest,
+        description = "Data required for a user to lgoin",
+        content_type = "application/json"
+    ),
+    responses(
+        (status = 201, description = "User login successful", body = response::LoginResponse),
+        (status = 400, description = "Bad data", body = response::LoginResponse),
+        (status = 500, description = "Something went wrong", body = response::LoginResponse)
+    )
+)]
+pub async fn user_login(
+    axum::Extension(pool): axum::Extension<sqlx::PgPool>,
+    axum::Json(payload): axum::Json<request::LoginRequest>,
+) -> (axum::http::StatusCode, axum::Json<response::LoginResponse>) {
+    if payload.username.is_empty() || payload.password.is_empty() {
+        let reason = if payload.username.is_empty() {
+            String::from("Username not provided")
+        } else {
+            String::from("Password not provided")
+        };
+
+        (
+            axum::http::StatusCode::BAD_REQUEST,
+            axum::Json(response::LoginResponse {
+                message: reason,
+                data: Vec::new(),
+            }),
+        )
+    } else {
+        match repo::user::exists(&pool, &payload.username).await {
+            Ok(exists) => {
+                if !exists {
+                    println!("User does not exists");
+                    (
+                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                        axum::Json(response::LoginResponse {
+                            message: String::from("Unable to login"),
+                            data: Vec::new(),
+                        }),
+                    )
+                } else {
+                    let user = match repo::user::get(&pool, &payload.username).await {
+                        Ok(user) => user,
+                        Err(_err) => {
+                            return (
+                                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                axum::Json(response::LoginResponse {
+                                    message: String::from("Unable to login"),
+                                    data: Vec::new(),
+                                }),
+                            );
+                        }
+                    };
+                    let hashed_password = user.password.clone();
+
+                    match hashing::verify_password(&payload.password, hashed_password) {
+                        Ok(matches) => {
+                            if matches {
+                                // Create token
+                                let key = textsender_models::envy::environment::get_secret_key()
+                                    .await
+                                    .value;
+                                let (token_literal, duration) =
+                                    token_stuff::create_token(&key, &user.id).unwrap();
+
+                                if token_stuff::verify_token(&key, &token_literal) {
+                                    let current_time = time::OffsetDateTime::now_utc();
+                                    let _ =
+                                        repo::user::update_last_login(&pool, &user, &current_time)
+                                            .await;
+
+                                    (
+                                        axum::http::StatusCode::OK,
+                                        axum::Json(response::LoginResponse {
+                                            message: String::from("Successful"),
+                                            data: vec![textsender_models::token::LoginResult {
+                                                user_id: user.id,
+                                                access_token: token_literal,
+                                                token_type: String::from(
+                                                    textsender_models::token::TOKEN_TYPE,
+                                                ),
+                                                issued_at: duration,
+                                                ..Default::default()
+                                            }],
+                                        }),
+                                    )
+                                } else {
+                                    (
+                                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                        axum::Json(response::LoginResponse {
+                                            message: String::from("Invalid attempt"),
+                                            data: Vec::new(),
+                                        }),
+                                    )
+                                }
+                            } else {
+                                (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response::LoginResponse {
+                                        message: String::from("Invalid attempt"),
+                                        data: Vec::new(),
+                                    }),
+                                )
+                            }
+                        }
+                        Err(err) => (
+                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                            axum::Json(response::LoginResponse {
+                                message: err.to_string(),
+                                data: Vec::new(),
+                            }),
+                        ),
+                    }
+                }
+            }
+            Err(err) => (
+                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                axum::Json(response::LoginResponse {
+                    message: err.to_string(),
+                    data: Vec::new(),
+                }),
+            ),
+        }
+    }
+}
+
+/// 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 (token_literal, duration) =
+                                    token_stuff::create_token(&key, &service_user.id).unwrap();
+
+                                if token_stuff::verify_token(&key, &token_literal) {
+                                    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: token_literal,
+                                                token_type: String::from(
+                                                    textsender_models::token::TOKEN_TYPE,
+                                                ),
+                                                issued_at: duration,
+                                                ..Default::default()
+                                            }],
+                                        }),
+                                    )
+                                } 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<String>, Option<i64>) {
+                        match token_stuff::create_service_refresh_token(key, id) {
+                            Ok((token, issued)) => (Some(token), Some(issued)),
+                            Err(_err) => (None, None),
+                        }
+                    };
+
+                    let mut response = response::RefreshTokenResponse {
+                        message: String::new(),
+                        data: Vec::new(),
+                    };
+
+                    match repo::user::get_with_id(&pool, &id).await {
+                        Ok(_user) => {
+                            let (refresh_token, issued) = generate_service_token(&id, &key);
+                            match refresh_token {
+                                Some(token) => match issued {
+                                    Some(issued_at) => {
+                                        response.message =
+                                            String::from(super::messages::SUCCESSFUL_MESSAGE);
+                                        let lr = textsender_models::token::LoginResult {
+                                            user_id: id,
+                                            access_token: token,
+                                            issued_at,
+                                            token_type: String::from(
+                                                textsender_models::token::TOKEN_TYPE,
+                                            ),
+                                            ..Default::default()
+                                        };
+                                        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(),
+                                        }),
+                                    ),
+                                },
+                                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) => {
+                                    let (refresh_token, issued) = generate_service_token(&id, &key);
+                                    match refresh_token {
+                                        Some(token) => match issued {
+                                            Some(issued_at) => {
+                                                response.message = String::from(
+                                                    super::messages::SUCCESSFUL_MESSAGE,
+                                                );
+                                                let lr = textsender_models::token::LoginResult {
+                                                    user_id: id,
+                                                    access_token: token,
+                                                    issued_at,
+                                                    token_type: String::from(
+                                                        textsender_models::token::TOKEN_TYPE,
+                                                    ),
+                                                    ..Default::default()
+                                                };
+                                                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(),
+                                                }),
+                                            ),
+                                        },
+                                        None => (
+                                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                            axum::Json(response::RefreshTokenResponse {
+                                                message: String::from(
+                                                    "Refresh token not generated",
+                                                ),
+                                                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/messages.rs

@@ -0,0 +1 @@
+pub const SUCCESSFUL_MESSAGE: &str = "Successful";

src/callers/mod.rs

@@ -0,0 +1,22 @@
+pub mod common;
+pub mod login;
+pub mod messages;
+pub mod register;
+
+pub mod endpoints {
+    pub const ROOT: &str = "/";
+    pub const REGISTER: &str = "/api/v1/register";
+    /// Endpoint for a user to login
+    pub const LOGIN: &str = "/api/v1/login";
+    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

@@ -0,0 +1,294 @@
+use axum::{Json, http::StatusCode};
+
+use crate::hashing;
+use crate::repo;
+
+pub mod request {
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct Request {
+        pub username: String,
+        pub password: String,
+        pub phone_number: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub email: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub firstname: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub lastname: Option<String>,
+    }
+
+    #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct RegisterServiceUserRequest {
+        pub username: String,
+        pub passphrase: String,
+    }
+
+    impl RegisterServiceUserRequest {
+        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.passphrase.is_empty() {
+                (true, Some(String::from("Passphrase is empty")))
+            } else {
+                (false, None)
+            }
+        }
+    }
+}
+
+pub mod response {
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct Response {
+        pub message: String,
+        pub data: Vec<textsender_models::user::User>,
+    }
+
+    #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
+    pub struct RegisterServiceUserResponse {
+        pub message: String,
+        pub data: Vec<textsender_models::user::ServiceUser>,
+    }
+}
+
+pub fn generate_the_salt() -> (
+    argon2::password_hash::SaltString,
+    textsender_models::user::Salt,
+) {
+    let salt_string = hashing::generate_salt().unwrap();
+    let salt = textsender_models::user::Salt::default();
+    (salt_string, salt)
+}
+
+/// Endpoint to register a user
+#[utoipa::path(
+    post,
+    path = super::endpoints::REGISTER,
+    request_body(
+        content = request::Request,
+        description = "Data required to register",
+        content_type = "application/json"
+    ),
+    responses(
+        (status = 201, description = "User created", body = response::Response),
+        (status = 404, description = "User already exists", body = response::Response),
+        (status = 400, description = "Issue creating user", body = response::Response)
+    )
+)]
+pub async fn register_user(
+    axum::Extension(pool): axum::Extension<sqlx::PgPool>,
+    Json(payload): Json<request::Request>,
+) -> (StatusCode, Json<response::Response>) {
+    let registration_enabled = match is_registration_enabled().await {
+        Ok(value) => value,
+        Err(err) => {
+            eprintln!("Error: {err:?}");
+            return (
+                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                Json(response::Response {
+                    message: String::from("Registration check failed"),
+                    data: Vec::new(),
+                }),
+            );
+        }
+    };
+
+    if registration_enabled {
+        let mut user = textsender_models::user::User {
+            username: payload.username.clone(),
+            password: payload.password.clone(),
+            // email: payload.email.clone(),
+            phone_number: payload.phone_number.clone(),
+            // email_verified: true,
+            ..Default::default()
+        };
+
+        user.firstname = payload.firstname.unwrap_or_default();
+        user.lastname = payload.lastname.unwrap_or_default();
+
+        println!("Checking if user exists");
+        match repo::user::exists(&pool, &user.username).await {
+            Ok(res) => {
+                if res {
+                    println!("Already exists");
+                    (
+                        StatusCode::BAD_REQUEST,
+                        Json(response::Response {
+                            message: String::from("Error"),
+                            data: Vec::new(),
+                        }),
+                    )
+                } else {
+                    println!("Good to create");
+                    println!("Generate salt string");
+
+                    let (generated_salt, mut salt) = generate_the_salt();
+                    println!("Creating salt");
+                    salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
+                    user.salt_id = salt.id;
+                    let hashed_password =
+                        hashing::hash_password(&user.password, &generated_salt).unwrap();
+                    user.password = hashed_password;
+
+                    println!("Creating user");
+                    match repo::user::insert(&pool, &user).await {
+                        Ok((id, date_created)) => {
+                            user.id = id;
+                            user.created = date_created;
+                            (
+                                StatusCode::CREATED,
+                                Json(response::Response {
+                                    message: String::from("User created"),
+                                    data: vec![user],
+                                }),
+                            )
+                        }
+                        Err(err) => (
+                            StatusCode::BAD_REQUEST,
+                            Json(response::Response {
+                                message: err.to_string(),
+                                data: vec![user],
+                            }),
+                        ),
+                    }
+                }
+            }
+            Err(err) => (
+                StatusCode::BAD_REQUEST,
+                Json(response::Response {
+                    message: err.to_string(),
+                    data: vec![user],
+                }),
+            ),
+        }
+    } else {
+        (
+            axum::http::StatusCode::NOT_ACCEPTABLE,
+            Json(response::Response {
+                message: String::from("Registration is not enabled"),
+                data: Vec::new(),
+            }),
+        )
+    }
+}
+
+/// Checks to see if registration is enabled
+async fn is_registration_enabled() -> Result<bool, std::io::Error> {
+    let key = String::from("ENABLE_REGISTRATION");
+    let var = textsender_models::envy::environment::get_env(&key).await;
+    let parsed_value = var.value.to_uppercase();
+
+    if parsed_value == "TRUE" {
+        Ok(true)
+    } else if parsed_value == "FALSE" {
+        Ok(false)
+    } else {
+        Err(std::io::Error::other(
+            "Could not determine value of ENABLE_REGISTRATION",
+        ))
+    }
+}
+
+/// Endpoint to register a service user
+#[utoipa::path(
+    post,
+    path = super::endpoints::REGISTER_SERVICE_USER,
+    request_body(
+        content = request::RegisterServiceUserRequest,
+        description = "Data required to register service user",
+        content_type = "application/json"
+    ),
+    responses(
+        (status = 201, description = "Service user created", body = response::RegisterServiceUserResponse),
+        (status = 400, description = "Issue creating service user", body = response::RegisterServiceUserResponse),
+        (status = 406, description = "Cannot create service user", body = response::RegisterServiceUserResponse),
+        (status = 500, description = "Issue creating service user", body = response::RegisterServiceUserResponse),
+    )
+)]
+pub async fn register_service_user(
+    axum::Extension(pool): axum::Extension<sqlx::PgPool>,
+    Json(payload): Json<request::RegisterServiceUserRequest>,
+) -> (
+    axum::http::StatusCode,
+    axum::Json<response::RegisterServiceUserResponse>,
+) {
+    let mut resp = response::RegisterServiceUserResponse {
+        ..Default::default()
+    };
+
+    let registration_enabled = match is_registration_enabled().await {
+        Ok(value) => value,
+        Err(err) => {
+            eprintln!("Error: {err:?}");
+            resp.message = String::from("Registration check failed");
+            return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, Json(resp));
+        }
+    };
+
+    let (res, msg) = payload.is_empty();
+    if res {
+        resp.message = msg.unwrap();
+        (axum::http::StatusCode::BAD_REQUEST, axum::Json(resp))
+    } else {
+        if registration_enabled {
+            match repo::service::exists(&pool, &payload.username).await {
+                Ok(exists) => {
+                    if exists {
+                        resp.message = String::from("Invalid");
+                        (
+                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                            axum::Json(resp),
+                        )
+                    } 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 {
+                            username: payload.username.clone(),
+                            passphrase: hashing::hash_password(&payload.passphrase, &generate_salt)
+                                .unwrap(),
+                            salt_id: salt.id,
+                            ..Default::default()
+                        };
+
+                        println!("Creating user");
+
+                        match repo::service::insert(&pool, &service_user).await {
+                            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))
+                            }
+                            Err(err) => {
+                                resp.message = err.to_string();
+                                (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(resp),
+                                )
+                            }
+                        }
+                    }
+                }
+                Err(err) => {
+                    resp.message = err.to_string();
+                    (
+                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                        axum::Json(resp),
+                    )
+                }
+            }
+        } else {
+            resp.message = String::from("Registration is not enabled");
+            (axum::http::StatusCode::NOT_ACCEPTABLE, Json(resp))
+        }
+    }
+}

src/config/mod.rs

@@ -0,0 +1,6 @@
+const ADDRESS: &str = "0.0.0.0";
+const PORT: &str = "9080";
+
+pub fn get_full() -> String {
+    format!("{ADDRESS}:{PORT}")
+}

src/db/init.rs

@@ -0,0 +1,22 @@
+use sqlx::postgres::PgPoolOptions;
+
+pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
+    let database_url = textsender_models::envy::environment::get_db_url()
+        .await
+        .value;
+    println!("Database url: {database_url}");
+
+    PgPoolOptions::new()
+        .max_connections(super::connection_settings::MAXCONN)
+        .connect(&database_url)
+        .await
+}
+
+pub async fn migrations(pool: &sqlx::PgPool) {
+    // Run migrations using the sqlx::migrate! macro
+    // Assumes your migrations are in a ./migrations folder relative to Cargo.toml
+    sqlx::migrate!("./migrations")
+        .run(pool)
+        .await
+        .expect("Failed to run migrations");
+}

src/db/mod.rs

@@ -0,0 +1,5 @@
+pub mod init;
+
+mod connection_settings {
+    pub const MAXCONN: u32 = 5;
+}

src/hashing/mod.rs

@@ -0,0 +1,101 @@
+use argon2::{
+    Argon2, // The Argon2 algorithm struct
+    PasswordVerifier,
+    password_hash::{
+        PasswordHasher,
+        SaltString,
+        rand_core::OsRng, // Secure random number generator
+    },
+};
+
+pub fn generate_salt() -> Result<SaltString, argon2::Error> {
+    // Generate a random salt
+    // SaltString::generate uses OsRng internally for cryptographic security
+    Ok(SaltString::generate(&mut OsRng))
+}
+
+pub fn get_salt(s: &str) -> Result<SaltString, argon2::password_hash::Error> {
+    SaltString::from_b64(s)
+}
+
+pub fn hash_password(
+    password: &String,
+    salt: &SaltString,
+) -> Result<String, argon2::password_hash::Error> {
+    let password_bytes = password.as_bytes();
+
+    // Create an Argon2 instance with default parameters (recommended)
+    // You could customize parameters here if needed, but defaults are strong
+    let argon2 = Argon2::default();
+
+    // Hash the password with the salt
+    // The output is a PasswordHash string format that includes algorithm, version,
+    // parameters, salt, and the hash itself.
+    Ok(argon2.hash_password(password_bytes, salt)?.to_string())
+}
+
+pub fn verify_password(
+    password_attempt: &String,
+    stored_hash: String,
+) -> Result<bool, argon2::password_hash::Error> {
+    let password_bytes = password_attempt.as_bytes();
+
+    // Parse the stored hash string
+    // This extracts the salt, parameters, and hash digest
+    let parsed_hash = argon2::PasswordHash::new(stored_hash.as_str())?;
+
+    // Create an Argon2 instance (it will use the parameters from the parsed hash)
+    // Verify the password against the parsed hash
+    // This automatically uses the correct salt and parameters embedded in `parsed_hash`
+    match Argon2::default().verify_password(password_bytes, &parsed_hash) {
+        Ok(()) => Ok(true),                                       // Passwords match
+        Err(argon2::password_hash::Error::Password) => Ok(false), // Passwords don't match
+        Err(e) => Err(e), // Some other error occurred (e.g., invalid hash format)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_hash_password() {
+        let some_password = String::from("somethingrandom");
+        match hash_password(&some_password, &generate_salt().unwrap()) {
+            Ok(p) => match verify_password(&some_password, p.clone()) {
+                Ok(res) => {
+                    assert_eq!(res, true);
+                }
+                Err(err) => {
+                    assert!(false, "Error: {:?}", err.to_string());
+                }
+            },
+            Err(eerr) => {
+                assert!(false, "Error: {:?}", eerr.to_string());
+            }
+        }
+    }
+
+    #[test]
+    fn test_wrong_password() {
+        let some_password = String::from("somethingrandom");
+        match hash_password(&some_password, &generate_salt().unwrap()) {
+            Ok(p) => {
+                match verify_password(&some_password, p.clone()) {
+                    Ok(res) => {
+                        assert_eq!(res, true, "Passwords are not verified");
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err.to_string());
+                    }
+                }
+                let wrong_password = String::from("Differentanotherlevel");
+                let result = verify_password(&wrong_password, p.clone()).unwrap();
+                assert_eq!(false, result, "Passwords should not match");
+            }
+            Err(err) => {
+                assert!(false, "Error: {:?}", err.to_string());
+            }
+        }
+    }
+}

src/lib.rs

@@ -0,0 +1,139 @@
+pub mod callers;
+pub mod config;
+pub mod db;
+pub mod hashing;
+pub mod repo;
+pub mod token_stuff;
+
+pub mod init {
+    use axum::{
+        Router,
+        routing::{get, patch, post},
+    };
+    use utoipa::OpenApi;
+
+    use super::callers;
+    use callers::common as common_callers;
+    use callers::login as login_caller;
+    use callers::register as register_caller;
+    use login_caller::response as login_responses;
+    use register_caller::response as register_responses;
+
+    #[derive(utoipa::OpenApi)]
+    #[openapi(
+        paths(
+            common_callers::endpoint::db_ping, common_callers::endpoint::root,
+            register_caller::register_user, login_caller::user_login,
+            ),
+        components(schemas(common_callers::response::TestResult,
+                register_responses::Response, login_responses::LoginResponse)),
+        tags(
+            (name = "TextSender Auth API", description = "Auth API for TextSender API")
+            )
+    )]
+    struct ApiDoc;
+
+    mod cors {
+        pub async fn configure_cors() -> tower_http::cors::CorsLayer {
+            // Start building the CORS layer with common settings
+            let cors = tower_http::cors::CorsLayer::new()
+                .allow_methods([
+                    axum::http::Method::GET,
+                    axum::http::Method::POST,
+                    axum::http::Method::PUT,
+                    axum::http::Method::DELETE,
+                ]) // Specify allowed methods:cite[2]
+                .allow_headers([
+                    axum::http::header::CONTENT_TYPE,
+                    axum::http::header::AUTHORIZATION,
+                ]) // Specify allowed headers:cite[2]
+                .allow_credentials(true) // If you need to send cookies or authentication headers:cite[2]
+                .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() {
+                Ok("production") => {
+                    let allowed_origins_env =
+                        textsender_models::envy::environment::get_allowed_origins().await;
+                    match textsender_models::envy::utility::delimitize(&allowed_origins_env) {
+                        Ok(alwd) => {
+                            let allowed_origins: Vec<axum::http::HeaderValue> = alwd
+                                .into_iter()
+                                .map(|s| s.parse::<axum::http::HeaderValue>().unwrap())
+                                .collect();
+                            cors.allow_origin(allowed_origins)
+                        }
+                        Err(err) => {
+                            eprintln!(
+                                "Could not parse out allowed origins from env: Error: {err:?}"
+                            );
+                            std::process::exit(-1);
+                        }
+                    }
+                }
+                _ => {
+                    // Development (default): Allow localhost origins
+                    cors.allow_origin(vec![
+                        "http://localhost:4200".parse().unwrap(),
+                        "http://127.0.0.1:4200".parse().unwrap(),
+                    ])
+                }
+            }
+        }
+    }
+
+    pub async fn routes() -> Router {
+        // build our application with a route
+        Router::new()
+            .route(
+                callers::endpoints::DBTEST,
+                get(callers::common::endpoint::db_ping),
+            )
+            .route(
+                callers::endpoints::ROOT,
+                get(callers::common::endpoint::root),
+            )
+            .route(
+                callers::endpoints::REGISTER,
+                post(callers::register::register_user),
+            )
+            .route(
+                callers::endpoints::REGISTER_SERVICE_USER,
+                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)
+    }
+
+    pub async fn app() -> Router {
+        let pool = super::db::init::create_pool()
+            .await
+            .expect("Failed to create pool");
+
+        super::db::init::migrations(&pool).await;
+
+        routes()
+            .await
+            .merge(
+                utoipa_swagger_ui::SwaggerUi::new("/swagger-ui")
+                    .url("/api-docs/openapi.json", ApiDoc::openapi()),
+            )
+            .layer(axum::Extension(pool))
+    }
+}

src/main.rs

@@ -0,0 +1,12 @@
+#[tokio::main]
+async fn main() {
+    // initialize tracing
+    tracing_subscriber::fmt::init();
+
+    let app = textsender_auth::init::app().await;
+
+    // run our app with hyper, listening globally on port 9080
+    let url = textsender_auth::config::get_full();
+    let listener = tokio::net::TcpListener::bind(url).await.unwrap();
+    axum::serve(listener, app).await.unwrap();
+}

src/repo/mod.rs

@@ -0,0 +1,291 @@
+pub mod service;
+
+pub mod user {
+    use sqlx::Row;
+
+    #[derive(Debug, serde::Serialize, sqlx::FromRow)]
+    pub struct InsertedData {
+        pub id: uuid::Uuid,
+        pub date_created: Option<time::OffsetDateTime>,
+    }
+
+    pub async fn get(
+        pool: &sqlx::PgPool,
+        username: &String,
+    ) -> Result<textsender_models::user::User, sqlx::Error> {
+        let result = sqlx::query(
+            r#"
+        SELECT id, username, password, phone_number, salt_id, firstname, lastname, created, last_login FROM "user" WHERE username = $1
+        "#,
+        )
+        .bind(username)
+        .fetch_optional(pool)
+        .await;
+
+        match result {
+            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 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,
+        time: &time::OffsetDateTime,
+    ) -> Result<time::OffsetDateTime, sqlx::Error> {
+        let result = sqlx::query(
+            r#"
+            UPDATE "user" SET last_login = $1 WHERE id = $2 RETURNING last_login
+            "#,
+        )
+        .bind(time)
+        .bind(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_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#"
+        SELECT 1 FROM "user" WHERE username = $1
+        "#,
+        )
+        .bind(username)
+        .fetch_optional(pool)
+        .await;
+
+        match result {
+            Ok(r) => match r {
+                Some(row) => {
+                    if row.is_empty() {
+                        Ok(false)
+                    } else {
+                        Ok(true)
+                    }
+                }
+                None => Ok(false),
+            },
+            Err(e) => {
+                eprintln!("What??");
+                eprintln!("Error: {e:?}");
+                Err(e)
+            }
+        }
+    }
+
+    pub async fn insert(
+        pool: &sqlx::PgPool,
+        user: &textsender_models::user::User,
+    ) -> Result<(uuid::Uuid, std::option::Option<time::OffsetDateTime>), sqlx::Error> {
+        let row = sqlx::query(
+            r#"
+                INSERT INTO "user" (username, password, phone_number, firstname, lastname, salt_id) 
+                VALUES ($1, $2, $3, $4, $5, $6)
+                RETURNING id, created;
+            "#,
+        )
+        .bind(&user.username)
+        .bind(&user.password)
+        .bind(&user.phone_number)
+        .bind(&user.firstname)
+        .bind(&user.lastname)
+        .bind(user.salt_id)
+        .fetch_one(pool)
+        .await
+        .map_err(|e| {
+            eprintln!("Error inserting item: {e}");
+            e
+        })?;
+
+        let result = InsertedData {
+            id: row.try_get("id").map_err(|_e| sqlx::Error::RowNotFound)?,
+            date_created: row
+                .try_get("created")
+                .map_err(|_e| sqlx::Error::RowNotFound)?,
+        };
+
+        if result.id.is_nil() && result.date_created.is_none() {
+            Err(sqlx::Error::RowNotFound)
+        } else {
+            Ok((result.id, result.date_created))
+        }
+    }
+}
+
+pub mod salt {
+    use sqlx::Row;
+
+    #[derive(Debug, serde::Serialize, sqlx::FromRow)]
+    pub struct InsertedData {
+        pub id: uuid::Uuid,
+    }
+
+    pub async fn get(
+        pool: &sqlx::PgPool,
+        id: &uuid::Uuid,
+    ) -> Result<textsender_models::user::Salt, sqlx::Error> {
+        let result = sqlx::query(
+            r#"
+        SELECT id, salt FROM "salt" WHERE id = $1
+        "#,
+        )
+        .bind(id)
+        .fetch_optional(pool)
+        .await;
+
+        match result {
+            Ok(r) => match r {
+                Some(r) => Ok(textsender_models::user::Salt {
+                    id: r.try_get("id")?,
+                    salt: r.try_get("salt")?,
+                }),
+                None => Err(sqlx::Error::RowNotFound),
+            },
+            Err(e) => Err(e),
+        }
+    }
+
+    pub async fn insert(
+        pool: &sqlx::PgPool,
+        salt: &textsender_models::user::Salt,
+    ) -> Result<uuid::Uuid, sqlx::Error> {
+        let row = sqlx::query(
+            r#"
+                INSERT INTO "salt" (salt) 
+                VALUES ($1)
+                RETURNING id;
+            "#,
+        )
+        .bind(&salt.salt)
+        .fetch_one(pool)
+        .await
+        .map_err(|e| {
+            eprintln!("Error inserting item: {e}");
+            e
+        })?;
+
+        let result = InsertedData {
+            id: row.try_get("id").map_err(|_e| sqlx::Error::RowNotFound)?,
+        };
+
+        if !result.id.is_nil() {
+            Ok(result.id)
+        } else {
+            Err(sqlx::Error::RowNotFound)
+        }
+    }
+}

src/repo/service.rs

@@ -0,0 +1,235 @@
+use sqlx::Row;
+
+pub async fn valid_passphrase(
+    pool: &sqlx::PgPool,
+    passphrase: &String,
+) -> Result<(uuid::Uuid, String, time::OffsetDateTime), sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        SELECT id, username, date_created FROM "passphrase" WHERE passphrase = $1
+        "#,
+    )
+    .bind(passphrase)
+    .fetch_one(pool)
+    .await;
+
+    match result {
+        Ok(row) => {
+            let id: uuid::Uuid = row.try_get("id")?;
+            let username: String = row.try_get("username")?;
+            let date_created: Option<time::OffsetDateTime> = row.try_get("date_created")?;
+
+            Ok((id, username, date_created.unwrap()))
+        }
+        Err(err) => Err(err),
+    }
+}
+
+pub async fn get_passphrase(
+    pool: &sqlx::PgPool,
+    id: &uuid::Uuid,
+) -> Result<(String, String, time::OffsetDateTime), sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        SELECT username, passphrase, date_created FROM "passphrase" WHERE id = $1;
+        "#,
+    )
+    .bind(id)
+    .fetch_one(pool)
+    .await;
+
+    match result {
+        Ok(row) => {
+            let username: String = row.try_get("username")?;
+            let passphrase: String = row.try_get("passphrase")?;
+            let date_created: time::OffsetDateTime = row.try_get("date_created")?;
+            Ok((username, passphrase, date_created))
+        }
+        Err(err) => Err(err),
+    }
+}
+
+pub async fn get(
+    pool: &sqlx::PgPool,
+    id: &uuid::Uuid,
+) -> Result<textsender_models::user::ServiceUser, sqlx::Error> {
+    match sqlx::query(
+        r#"SELECT id, username, passphrase, created, last_login, salt_id FROM "service_user" WHERE id = $1"#
+        ).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,
+                salt_id: row.try_get("salt_id")?,
+            };
+
+            Ok(service_user)
+        }
+        Err(err) => {
+            Err(err)
+        }
+    }
+}
+
+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<(uuid::Uuid, time::OffsetDateTime), sqlx::Error> {
+    match sqlx::query(
+        r#"INSERT INTO "service_user" (username, passphrase, salt_id)
+            VALUES ($1, $2, $3)
+            RETURNING id, created
+        "#,
+    )
+    .bind(&service_user.username)
+    .bind(&service_user.passphrase)
+    .bind(service_user.salt_id)
+    .fetch_one(pool)
+    .await
+    {
+        Ok(row) => {
+            let id: uuid::Uuid = row.try_get("id")?;
+            let created: time::OffsetDateTime = row.try_get("created")?;
+            Ok((id, created))
+        }
+        Err(err) => Err(err),
+    }
+}
+
+pub async fn exists(pool: &sqlx::PgPool, service_username: &String) -> Result<bool, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+    SELECT 1 FROM "service_user" WHERE username = $1
+    "#,
+    )
+    .bind(service_username)
+    .fetch_optional(pool)
+    .await;
+
+    match result {
+        Ok(r) => match r {
+            Some(row) => {
+                if row.is_empty() {
+                    Ok(false)
+                } else {
+                    Ok(true)
+                }
+            }
+            None => Ok(false),
+        },
+        Err(e) => {
+            eprintln!("What??");
+            eprintln!("Error: {e:?}");
+            Err(e)
+        }
+    }
+}

src/token_stuff/mod.rs

@@ -0,0 +1,137 @@
+use josekit::{
+    self,
+    jws::alg::hmac::HmacJwsAlgorithm::Hs256,
+    jwt::{self},
+};
+
+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 fn get_expiration(issued: &time::OffsetDateTime) -> Result<time::OffsetDateTime, time::Error> {
+    let duration_expire = time::Duration::hours(4);
+    Ok(*issued + duration_expire)
+}
+
+pub fn create_token(
+    provided_key: &String,
+    id: &uuid::Uuid,
+) -> Result<(String, i64), josekit::JoseError> {
+    let resource = textsender_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))
+}
+
+pub fn create_service_token(
+    provided: &String,
+    id: &uuid::Uuid,
+) -> Result<(String, i64), josekit::JoseError> {
+    let resource = textsender_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))
+}
+
+pub fn create_service_refresh_token(
+    key: &String,
+    id: &uuid::Uuid,
+) -> Result<(String, i64), josekit::JoseError> {
+    let resource = textsender_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))
+}
+
+pub fn verify_token(key: &String, token: &String) -> bool {
+    match get_payload(key, token) {
+        Ok((payload, _header)) => match payload.subject() {
+            Some(_sub) => true,
+            None => false,
+        },
+        Err(_err) => false,
+    }
+}
+
+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("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())),
+            },
+            None => Err(std::io::Error::other("No claim found")),
+        },
+        Err(err) => Err(std::io::Error::other(err.to_string())),
+    }
+}
+
+pub const APP_TOKEN_TYPE: &str = "Textsender_App";
+pub const APP_SUBJECT: &str = "Something random";
+pub const SERVICE_TOKEN_TYPE: &str = "Textsender_Service";
+pub const SERVICE_SUBJECT: &str = "Service random";
+
+pub fn get_token_type(key: &String, token: &String) -> Result<String, std::io::Error> {
+    match get_payload(key, token) {
+        Ok((payload, _header)) => match payload.subject() {
+            Some(subject) => {
+                if subject == APP_SUBJECT {
+                    Ok(String::from(APP_TOKEN_TYPE))
+                } else if subject == SERVICE_SUBJECT {
+                    Ok(String::from(SERVICE_TOKEN_TYPE))
+                } else {
+                    Err(std::io::Error::other(String::from("Invalid subject")))
+                }
+            }
+            None => Err(std::io::Error::other(String::from("Invalid payload"))),
+        },
+        Err(err) => Err(std::io::Error::other(err.to_string())),
+    }
+}
+
+pub fn is_token_type_valid(token_type: &String) -> bool {
+    token_type == SERVICE_TOKEN_TYPE
+}
+
+fn get_payload(
+    key: &String,
+    token: &String,
+) -> Result<(josekit::jwt::JwtPayload, josekit::jws::JwsHeader), josekit::JoseError> {
+    let ver = Hs256.verifier_from_bytes(key.as_bytes()).unwrap();
+    jwt::decode_with_verifier(token, &ver)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_tokenize() {
+        let rt = tokio::runtime::Runtime::new().unwrap();
+        let special_key = rt
+            .block_on(textsender_models::envy::environment::get_secret_key())
+            .value;
+        let id = uuid::Uuid::new_v4();
+        match create_token(&special_key, &id) {
+            Ok((token, _duration)) => {
+                let result = verify_token(&special_key, &token);
+                assert!(result, "Token not verified");
+            }
+            Err(err) => {
+                assert!(false, "Error: {:?}", err.to_string());
+            }
+        };
+    }
+}

tests/tests.rs

@@ -0,0 +1,991 @@
+use textsender_auth;
+use textsender_auth::callers;
+use textsender_auth::db;
+use textsender_auth::init;
+
+mod db_mgr {
+    use std::str::FromStr;
+
+    pub const LIMIT: usize = 6;
+
+    pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
+        let tm_db_url = textsender_models::envy::environment::get_db_url()
+            .await
+            .value;
+        let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
+        sqlx::PgPool::connect_with(tm_options).await
+    }
+
+    pub async fn generate_db_name() -> String {
+        let db_name =
+            get_database_name().await.unwrap() + &"_" + &uuid::Uuid::new_v4().to_string()[..LIMIT];
+        db_name
+    }
+
+    pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
+        let db_url = textsender_models::envy::environment::get_db_url()
+            .await
+            .value;
+        let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name);
+        sqlx::PgPool::connect_with(options).await
+    }
+
+    pub async fn create_database(
+        template_pool: &sqlx::PgPool,
+        db_name: &str,
+    ) -> Result<(), sqlx::Error> {
+        let create_query = format!("CREATE DATABASE {}", db_name);
+        match sqlx::query(&create_query).execute(template_pool).await {
+            Ok(_) => Ok(()),
+            Err(e) => Err(e),
+        }
+    }
+
+    // Function to drop a database
+    pub async fn drop_database(
+        template_pool: &sqlx::PgPool,
+        db_name: &str,
+    ) -> Result<(), sqlx::Error> {
+        let drop_query = format!("DROP DATABASE IF EXISTS {} WITH (FORCE)", db_name);
+        sqlx::query(&drop_query).execute(template_pool).await?;
+        Ok(())
+    }
+
+    pub async fn get_database_name() -> Result<String, Box<dyn std::error::Error>> {
+        let database_url = textsender_models::envy::environment::get_db_url()
+            .await
+            .value;
+
+        let parsed_url = url::Url::parse(&database_url)?;
+        if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" {
+            match parsed_url
+                .path_segments()
+                .and_then(|segments| segments.last().map(|s| s.to_string()))
+            {
+                Some(sss) => Ok(sss),
+                None => Err("Error parsing".into()),
+            }
+        } else {
+            // Handle other database types if needed
+            Err("Error parsing".into())
+        }
+    }
+}
+
+pub mod requests {
+    use tower::ServiceExt; // for `call`, `oneshot`, and `ready`
+
+    /// Function to call register user endpoint
+    pub async fn register_user(
+        app: &axum::Router,
+    ) -> Result<axum::response::Response, std::convert::Infallible> {
+        let payload = serde_json::json!({
+            "username": String::from(super::TEST_USERNAME),
+            "password": String::from(super::TEST_PASSWORD),
+            "phone_number": String::from(super::TEST_PHONE_NUMBER),
+            "firstname": String::from(super::TEST_FIRSTNAME),
+            "lastname": String::from(super::TEST_LASTNAME),
+        });
+        let req = axum::http::Request::builder()
+            .method(axum::http::Method::POST)
+            .uri(super::callers::endpoints::REGISTER)
+            .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 login user endpoint
+    pub async fn login_user(
+        app: &axum::Router,
+        username: &str,
+        password: &str,
+    ) -> Result<axum::response::Response, std::convert::Infallible> {
+        let payload = serde_json::json!({
+            "username": username,
+            "password": password,
+        });
+        let req = axum::http::Request::builder()
+            .method(axum::http::Method::POST)
+            .uri(super::callers::endpoints::LOGIN)
+            .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 register service user endpoint
+    pub async fn register_service_user(
+        app: &axum::Router,
+    ) -> Result<axum::response::Response, std::convert::Infallible> {
+        let payload = serde_json::json!({
+            "username": String::from(super::TEST_SERVICE_USERNAME),
+            "passphrase": String::from(super::TEST_SERVICE_PASSPHRASE),
+        });
+        let req = axum::http::Request::builder()
+            .method(axum::http::Method::POST)
+            .uri(super::callers::endpoints::REGISTER_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 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
+const TEST_FIRSTNAME: &str = "Billy";
+/// Test user lastname
+const TEST_LASTNAME: &str = "Bob";
+/// Test user username
+const TEST_USERNAME: &str = "BillyBob01";
+/// Test user password
+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";
+
+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 = 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())),
+        }
+    }
+}
+
+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 {
+            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::Response>(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())),
+        }
+    }
+
+    pub async fn login_user(
+        app: &axum::Router,
+        username: &str,
+        password: &str,
+    ) -> Result<textsender_models::token::LoginResult, std::io::Error> {
+        match requests::login_user(&app, username, 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::LoginResponse>(
+                        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())),
+        }
+    }
+
+    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();
+    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(returned_user) => {
+            assert_eq!(
+                TEST_USERNAME, returned_user.username,
+                "Error with returned user"
+            );
+        }
+        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_login_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_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"
+                );
+            }
+            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_register_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 requests::register_service_user(&app).await {
+        Ok(response) => {
+            match util::convert_response::<callers::register::response::RegisterServiceUserResponse>(
+                response,
+            )
+            .await
+            {
+                Ok(resp) => {
+                    assert!(resp.data.len() > 0, "No service user was created");
+                    let service_user = &resp.data[0];
+                    assert_eq!(
+                        TEST_SERVICE_USERNAME, service_user.username,
+                        "Service username does not match"
+                    );
+                }
+                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_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:?}");
+        }
+    }
+}