conditionally filter parent locations

.devcontainer/Dockerfile

@@ -1,3 +1,5 @@
-FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:22-bullseye
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
+ARG VARIANT=16-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
 
-RUN sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin
+RUN sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin

.devcontainer/devcontainer.json

@@ -3,7 +3,13 @@
 {
 	"name": "Node.js & TypeScript",
 	"build": {
-		"dockerfile": "Dockerfile"
+		"dockerfile": "Dockerfile",
+		// Update 'VARIANT' to pick a Node version: 18, 16, 14.
+		// Append -bullseye or -buster to pin to an OS version.
+		// Use -bullseye variants on local on arm64/Apple Silicon.
+		"args": {
+			"VARIANT": "18-bullseye"
+		}
 	},
 
 	// Configure tool-specific properties.
@@ -29,6 +35,6 @@
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "node",
 	"features": {
-		"ghcr.io/devcontainers/features/go:1": "1.24"
+		"golang": "1.19"
 	}
 }

.dockerignore

@@ -22,4 +22,3 @@
 **/secrets.dev.yaml
 **/values.dev.yaml
 README.md
-!Dockerfile.rootless

.gitattributes

@@ -1,3 +0,0 @@
-backend/internal/data/ent/** linguist-generated=true
-backend/internal/data/ent/schema/** linguist-generated=false
-frontend/lib/api/types/** linguist-generated=true

.github/AGENTS.md

@@ -1,40 +0,0 @@
-This is a Go based repository with a VueJS client for the frontend built with Vite and Nuxt, with ShadCN. 
-
-To make life easier, the use of a Taskfile is included for the majority of development commands.
-
-Please follow these guidelines when contributing:
-
-## Required Before Each Commit
-- Generate Swagger Files: `task swag --force`
-- Generate JS API Client: `task typescript-types --force`
-- Lint Golang: `task go:lint`
-- Lint frontend: `task ui:fix`
-
-## Repository Structure
-### Backend
-- `backend/`: Contains the backend folders
-- `backend/app`: Contains main app code including API endpoints
-- `backend/internal/core`: Contains basic services such as currencies
-- `backend/data`: Contains all information related to data, including `ent` schemas, repos, migrations, etc.
-- `backend/data/migrations`: Contains migration data, the `sqlite3` sub-folder contains sqlite migrations, `postgres` sub-folder the postgres migrations, BOTH are REQUIRED.
-- `backend/data/ent/schema`: Contains the actual `ent` data models.
-- `backend/data/repo`: Contains the data repositories
-- `backend/pkgs`: Contains general helper functions and services
-
-### Frontend
-- `frontend/`: Contains initial frontend files
-- `frontend/components`: Contains the ShadCN components
-- `frontend/locales`: Contains the i18n JSON for languages
-- `frontend/pages`: Contains VueJS pages
-- `frontend/test`: Contains Playwright setup
-- `frontend/test/e2e`: Contains actual Playwright test files
-
-### Docs
-- `docs/`: Contains VitePress based documentation
-
-## Key Guidelines
-1. Follow best practices for the various programming languages
-2. Maintain existing code structure and organization when possible
-3. Use dependency injection when reasonable
-4. Write tests for new functionality and after fixing bugs to validate they're fixed
-5. Document changes to the `docs/` folder when appropriate

.github/FUNDING.yml

@@ -1,2 +1 @@
-open_collective: homebox
-github: [tankerkiller125,katosdev,tonyaellie]
+github: [hay-kot]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,9 +1,7 @@
 ---
 name: "Bug Report"
 description: "Submit a bug report for the current release"
-labels: ["🕷️ bug"]
-projects: ["sysadminsmedia/2"]
-type: "Bug"
+labels: ["bug"]
 body:
   - type: checkboxes
     id: checks
@@ -21,8 +19,6 @@ body:
           required: true
         - label: I already read the docs and didn't find an answer.
           required: true
-        - label: I can replicate the issue inside the Demo install.
-          required: true
   - type: input
     id: homebox-version
     attributes:
@@ -58,29 +54,6 @@ body:
         - Other
     validations:
       required: true
-  - type: dropdown
-    id: database
-    attributes:
-      label: Database Type
-      description: What database backend are you using?
-      multiple: false
-      options:
-        - SQLite
-        - PostgreSQL
-    validations:
-      required: true
-  - type: dropdown
-    id: arch
-    attributes:
-      label: OS Architechture
-      description: What type of processor are you running on.
-      multiple: true
-      options:
-        - x86_64 (AMD, Intel)
-        - ARM64
-        - ARM/v7
-    validations:
-      required: true
   - type: textarea
     id: os-details
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: GitHub Community Support
-    url: https://github.com/sysadminsmedia/homebox/discussions/categories/support
-    about: Get support for issues here
-  - name: Feature Requests
-    url: https://github.com/sysadminsmedia/homebox/discussions/categories/ideas
-    about: Have an idea for Homebox? Share it in our discussions forum. If we decide to take it on we will create an issue for it.
-  - name: Translate
-    url: https://translate.sysadminsmedia.com
-    about: Help us translate Homebox! All contributions and all languages welcome!

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,4 +1,7 @@
-labels: ["⬆️ enhancement"]
+---
+name: "Feature Request"
+description: "Submit a feature request for the current release"
+labels: ["feature-request"]
 body:
   - type: textarea
     id: problem-statement
@@ -26,5 +29,9 @@ body:
       label: Contributions
       description: Please confirm the following
       options:
-        - label: I have searched through existing ideas in the discussions to check if this is a duplicate
+        - label: I have searched through existing issues and feature requests to see if my idea has already been proposed.
           required: true
+        - label: If this feature is accepted, I would be willing to help implement and maintain this feature.
+          required: false
+        - label: If this feature is accepted, I'm willing to sponsor the development of this feature.
+          required: false

.github/dependabot.yml

@@ -0,0 +1,31 @@
+version: 2
+updates:
+  # Fetch and update latest `npm` packages
+  - package-ecosystem: npm
+    directory: "/frontend"
+    schedule:
+      interval: daily
+      time: "00:00"
+    open-pull-requests-limit: 10
+    reviewers:
+      - hay-kot
+    assignees:
+      - hay-kot
+    commit-message:
+      prefix: fix
+      prefix-development: chore
+      include: scope
+  - package-ecosystem: gomod
+    directory: backend
+    schedule:
+      interval: daily
+      time: "00:00"
+    open-pull-requests-limit: 10
+    reviewers:
+      - hay-kot
+    assignees:
+      - hay-kot
+    commit-message:
+      prefix: fix
+      prefix-development: chore
+      include: scope

.github/pull_request_template.md

@@ -55,4 +55,18 @@ _(fill-in or delete this section)_
 
 <!--
   Describe how you tested this change.
--->
+-->
+
+## Release Notes
+
+_(REQUIRED)_
+<!--
+  If this PR makes user facing changes, please describe them here. This
+  description will be copied into the release notes/changelog, whenever the
+  next version is released. Keep this section short, and focus on high level
+  changes.
+  Put your text between the block. To omit notes, use NONE within the block.
+-->
+
+```release-note
+```

.github/screenshots/readme.md

@@ -1,8 +0,0 @@
-# Screenshots
-
-These screenshots are taken from our public [Demo](https://demo.homebox.software) instance.
-Note that whilst we will make every effort to ensure that these are maintained and updated, they may be outdated or missing functionality and we would always advise reviewing our demo instances:
-
-- [Demo](https://demo.homebox.software)
-- [Nightly](https://nightly.homebox.software)
-- [VNext](https://vnext.homebox.software/)

.github/scripts/update_currencies.py

@@ -1,213 +0,0 @@
-#!/usr/bin/env python3
-import csv
-import io
-import json
-import logging
-import os
-import sys
-from pathlib import Path
-
-import requests
-from requests.adapters import HTTPAdapter
-from urllib3.util.retry import Retry
-
-API_URL    = 'https://restcountries.com/v3.1/all?fields=name,common,currencies'
-# Default to a pinned commit for supply-chain security
-DEFAULT_ISO_4217_URL = 'https://raw.githubusercontent.com/datasets/currency-codes/052b3088938ba32028a14e75040c286c5e142145/data/codes-all.csv'
-ISO_4217_URL = os.environ.get('ISO_4217_URL', DEFAULT_ISO_4217_URL)
-SAVE_PATH  = Path('backend/internal/core/currencies/currencies.json')
-TIMEOUT    = 10  # seconds
-
-# Known currency decimal overrides
-CURRENCY_DECIMAL_OVERRIDES = {
-    "BTC": 8,  # Bitcoin uses 8 decimal places
-    "JPY": 0,  # Japanese Yen has no decimal places
-    "BHD": 3,  # Bahraini Dinar uses 3 decimal places
-}
-DEFAULT_DECIMALS = 2
-MIN_DECIMALS = 0
-MAX_DECIMALS = 6
-
-
-def setup_logging():
-    logging.basicConfig(
-        level=logging.INFO,
-        format='%(asctime)s %(levelname)s: %(message)s'
-    )
-
-
-def get_currency_decimals(code, iso_data):
-    """
-    Get the decimal places for a currency code.
-    Checks overrides first, then ISO data, then uses default.
-    Clamps result to safe range [MIN_DECIMALS, MAX_DECIMALS].
-    """
-    # Normalize the input code
-    normalized_code = (code or "").strip().upper()
-    
-    # First check overrides
-    if normalized_code in CURRENCY_DECIMAL_OVERRIDES:
-        decimals = CURRENCY_DECIMAL_OVERRIDES[normalized_code]
-    # Then check ISO data
-    elif normalized_code in iso_data:
-        decimals = iso_data[normalized_code]
-    # Finally use default
-    else:
-        decimals = DEFAULT_DECIMALS
-    
-    # Ensure it's an integer and clamp to safe range
-    try:
-        decimals = int(decimals)
-    except (ValueError, TypeError):
-        decimals = DEFAULT_DECIMALS
-    
-    return max(MIN_DECIMALS, min(MAX_DECIMALS, decimals))
-
-
-def fetch_iso_4217_data():
-    """
-    Fetch ISO 4217 currency data to get minor units (decimal places).
-    Returns a dict mapping currency code to minor units.
-    """
-    # Log the resolved URL for transparency
-    logging.info("Fetching ISO 4217 data from: %s", ISO_4217_URL)
-    if not ISO_4217_URL.lower().startswith("https://"):
-        logging.error("Refusing non-HTTPS ISO_4217_URL: %s", ISO_4217_URL)
-        return {}
-    
-    session = requests.Session()
-    retries = Retry(
-        total=3,
-        backoff_factor=1,
-        status_forcelist=[429, 500, 502, 503, 504],
-        allowed_methods=frozenset(['GET'])
-    )
-    session.mount('https://', HTTPAdapter(max_retries=retries))
-
-    try:
-        # Add Accept header for CSV content
-        headers = {'Accept': 'text/csv'}
-        resp = session.get(ISO_4217_URL, timeout=TIMEOUT, headers=headers)
-        resp.raise_for_status()
-    except requests.exceptions.RequestException as e:
-        logging.error("Failed to fetch ISO 4217 data: %s", e)
-        return {}
-
-    # Parse CSV data
-    iso_data = {}
-    try:
-        # Decode with utf-8-sig to strip BOM if present
-        csv_content = resp.content.decode('utf-8-sig')
-        csv_reader = csv.DictReader(io.StringIO(csv_content))
-        
-        for row in csv_reader:
-            code = row.get('AlphabeticCode', '').strip()
-            minor_unit = row.get('MinorUnit', '').strip()
-            
-            if code and minor_unit != 'N.A.':
-                try:
-                    # Convert minor unit to int (decimal places)
-                    iso_data[code] = int(minor_unit) if minor_unit.isdigit() else 2
-                except (ValueError, TypeError):
-                    iso_data[code] = 2  # Default to 2 if parsing fails
-                    
-        logging.info("Successfully loaded decimal data for %d currencies from ISO 4217", len(iso_data))
-        return iso_data
-        
-    except Exception as e:
-        logging.error("Failed to parse ISO 4217 CSV data: %s", e)
-        return {}
-
-
-def fetch_currencies():
-    # First, fetch ISO 4217 data for decimal places
-    iso_data = fetch_iso_4217_data()
-    
-    session = requests.Session()
-    retries = Retry(
-        total=3,
-        backoff_factor=1,
-        status_forcelist=[429, 500, 502, 503, 504],
-        allowed_methods=frozenset(['GET'])
-    )
-    session.mount('https://', HTTPAdapter(max_retries=retries))
-
-    try:
-        resp = session.get(API_URL, timeout=TIMEOUT)
-        resp.raise_for_status()
-    except requests.exceptions.RequestException as e:
-        logging.error("API request failed: %s", e)
-        return None  # signal fatal
-
-    try:
-        countries = resp.json()
-    except ValueError as e:
-        logging.error("Failed to parse JSON response: %s", e)
-        return None  # signal fatal
-
-    results = []
-    for country in countries:
-        country_name = country.get('name', {}).get('common') or "Unknown"
-        for code, info in country.get('currencies', {}).items():
-            # Get decimal places using the helper function
-            decimals = get_currency_decimals(code, iso_data)
-            
-            results.append({
-                'code':     code,
-                'local':    country_name,
-                'symbol':   info.get('symbol', ''),
-                'name':     info.get('name', ''),
-                'decimals': decimals
-            })
-
-    # sort by country name for consistency
-    return sorted(results, key=lambda x: x['local'].lower())
-
-
-def load_existing(path: Path):
-    if not path.exists():
-        return []
-    try:
-        with path.open('r', encoding='utf-8') as f:
-            return json.load(f)
-    except (IOError, ValueError) as e:
-        logging.warning("Could not load existing file (%s): %s", path, e)
-        return []
-
-
-def save_currencies(data, path: Path):
-    path.parent.mkdir(parents=True, exist_ok=True)
-    with path.open('w', encoding='utf-8') as f:
-        json.dump(data, f, ensure_ascii=False, indent=4)
-    logging.info("Wrote %d entries to %s", len(data), path)
-
-
-def main():
-    setup_logging()
-    logging.info("🔄 Starting currency update")
-
-    existing = load_existing(SAVE_PATH)
-    new = fetch_currencies()
-
-    # Fatal API / parse error → exit non-zero so the workflow will fail
-    if new is None:
-        logging.error("Aborting: failed to fetch or parse API data.")
-        sys.exit(1)
-
-    # Empty array → log & exit zero (no file change)
-    if not new:
-        logging.warning("API returned empty list; skipping write.")
-        sys.exit(0)
-
-    # Identical to existing → nothing to do
-    if new == existing:
-        logging.info("Up-to-date; skipping write.")
-        sys.exit(0)
-
-    # Otherwise actually overwrite
-    save_currencies(new, SAVE_PATH)
-    logging.info("✅ Currency file updated.")
-
-
-if __name__ == "__main__":
-    main()

.github/workflows/binaries-publish.yaml

@@ -1,133 +0,0 @@
-name: Publish Release Binaries
-
-on:
-  workflow_dispatch:
-  push:
-    tags: [ 'v*.*.*' ]
-
-jobs:
-  goreleaser:
-    name: goreleaser
-    runs-on: ubuntu-latest
-    outputs:
-      hashes: ${{ steps.binary.outputs.hashes }}
-    permissions:
-      contents: write
-      packages: write
-      id-token: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.24"
-          cache-dependency-path: backend/go.mod
-
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 9.15.3
-
-      - name: Build Frontend and Copy to Backend
-        working-directory: frontend
-        run: |
-          pnpm install
-          pnpm run build
-          cp -r ./.output/public ../backend/app/api/static/
-
-      - name: Install CoSign
-        working-directory: backend
-        run: |
-          go install github.com/sigstore/cosign/cmd/cosign@latest
-
-      - name: Install Syft
-        working-directory: backend
-        run: |
-          go install github.com/anchore/syft/cmd/syft@latest
-
-      - name: Run GoReleaser
-        id: releaser
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          workdir: "backend"
-          distribution: goreleaser
-          version: "~> v2"
-          args: release --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COSIGN_PWD: ${{ secrets.COSIGN_PWD }}
-          COSIGN_YES: "true"
-
-      - name: Generate binary hashes
-        if: startsWith(github.ref, 'refs/tags/')
-        id: binary
-        env:
-          ARTIFACTS: "${{ steps.releaser.outputs.artifacts }}"
-        run: |
-          set -euo pipefail
-          
-          checksum_file=$(echo "$ARTIFACTS" | jq -r '.[] | select (.type=="Checksum") | .path')
-          echo "hashes=$(cat $checksum_file | base64 -w0)" >> "$GITHUB_OUTPUT"
-
-      - name: Run GoReleaser No Release
-        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          workdir: "backend"
-          distribution: goreleaser
-          version: "~> v2"
-          args: release --clean --snapshot --skip=publish
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COSIGN_PWD: ${{ secrets.COSIGN_PWD }}
-          COSIGN_YES: "true"
-
-  binary-provenance:
-    if: startsWith(github.ref, 'refs/tags/')
-    needs: [ goreleaser ]
-    permissions:
-      actions: read # To read the workflow path.
-      id-token: write # To sign the provenance.
-      contents: write # To add assets to a release.
-    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.9.0
-    with:
-      base64-subjects: "${{ needs.goreleaser.outputs.hashes }}"
-      upload-assets: true # upload to a new release
-
-  verification-with-slsa-verifier:
-    if: startsWith(github.ref, 'refs/tags/')
-    needs: [goreleaser, binary-provenance]
-    runs-on: ubuntu-latest
-    permissions: read-all
-    steps:
-      - name: Install the verifier
-        uses: slsa-framework/slsa-verifier/actions/installer@v2.4.0
-
-      - name: Download assets
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PROVENANCE: "${{ needs.binary-provenance.outputs.provenance-name }}"
-        run: |
-          set -euo pipefail
-          gh -R "$GITHUB_REPOSITORY" release download "$GITHUB_REF_NAME" -p "*.tar.gz"
-          gh -R "$GITHUB_REPOSITORY" release download "$GITHUB_REF_NAME" -p "*.zip"
-          gh -R "$GITHUB_REPOSITORY" release download "$GITHUB_REF_NAME" -p "$PROVENANCE"
-      - name: Verify assets
-        env:
-          CHECKSUMS: ${{ needs.goreleaser.outputs.hashes }}
-          PROVENANCE: "${{ needs.binary-provenance.outputs.provenance-name }}"
-        run: |
-          set -euo pipefail
-          checksums=$(echo "$CHECKSUMS" | base64 -d)
-          while read -r line; do
-              fn=$(echo $line | cut -d ' ' -f2)
-              echo "Verifying $fn"
-              slsa-verifier verify-artifact --provenance-path "$PROVENANCE" \
-                                            --source-uri "github.com/$GITHUB_REPOSITORY" \
-                                            --source-tag "$GITHUB_REF_NAME" \
-                                            "$fn"
-          done <<<"$checksums"

.github/workflows/clear-stale-docker-images.yml

@@ -1,41 +0,0 @@
-name: Docker Cleanup
-
-on:
-  schedule:
-    - cron: '00 0 * * *'
-  workflow_dispatch:
-
-jobs:
-  delete-old-images-main:
-    name: Delete Old Images for Main Repo
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    steps:
-      - uses: dataaxiom/ghcr-cleanup-action@v1
-        with:
-          dry-run: true
-          delete-ghost-images: true
-          delete-partial-images: true
-          delete-orphaned-images: true
-          delete-untagged: true
-          validate: true
-          token: '${{ github.token }}'
-          package: homebox
-          use-regex: true
-          exclude-tags: latest,latest-rootless,main,main-rootless,nightly,nightly-rootless,*.*.*,0.*,0,*.*.*-rootless,0.*-rootless,0-rootless
-          older-than: 180 days
-
-  delete-old-images-devcache:
-    name: Delete Old Devcache Images
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    steps:
-      - uses: dataaxiom/ghcr-cleanup-action@v1
-        with:
-          dry-run: false
-          delete-untagged: true
-          token: '${{ github.token }}'
-          package: devcache
-          older-than: 90 days

.github/workflows/copilot-setup-steps.yml

@@ -1,52 +0,0 @@
-name: "Copilot Setup Steps"
-
-# Automatically run the setup steps when they are changed to allow for easy validation, and
-# allow manual testing through the repository's "Actions" tab
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - .github/workflows/copilot-setup-steps.yml
-  pull_request:
-    paths:
-      - .github/workflows/copilot-setup-steps.yml
-
-jobs:
-  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
-  copilot-setup-steps:
-    runs-on: ubuntu-latest
-
-    # Set the permissions to the lowest permissions possible needed for your steps.
-    # Copilot will be given its own token for its operations.
-    permissions:
-      # If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
-      contents: read
-
-    # You can define any steps you want, and they will run before the agent starts.
-    # If you do not check out your code, Copilot will do this for you.
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-
-      - uses: pnpm/action-setup@v3.0.0
-        with:
-          version: 9.12.2
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.24"
-          cache-dependency-path: backend/go.mod
-
-      - name: Install Task
-        uses: arduino/setup-task@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Perform setup
-        run: task setup

.github/workflows/docker-publish-hardened.yaml

@@ -1,248 +0,0 @@
-name: Docker publish hardened
-
-on:
-  schedule:
-    - cron: '00 0 * * *'
-  push:
-    branches: [ "main" ]
-    paths:
-      - 'backend/**'
-      - 'frontend/**'
-      - 'Dockerfile.hardened'
-      - '.dockerignore'
-      - '.github/workflows/docker-publish-hardened.yaml'
-    tags: [ 'v*.*.*' ]
-  pull_request:
-    branches: [ "main" ]
-    paths:
-      - 'backend/**'
-      - 'frontend/**'
-      - 'Dockerfile.hardened'
-      - '.dockerignore'
-      - '.github/workflows/docker-publish-hardened.yaml'
-
-permissions:
-  contents: read        # Access to repository contents
-  packages: write       # Write access for pushing to GHCR
-  id-token: write       # Required for OIDC authentication (if used)
-  attestations: write   # Required for signing and attestation (if needed)
-
-env:
-  DOCKERHUB_REPO: sysadminsmedia/homebox
-  GHCR_REPO: ghcr.io/${{ github.repository }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-      attestations: write
-      
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
-          - linux/arm/v7
-
-    steps:
-      - name: Enable Debug Logs
-        run: echo "##[debug]Enabling debug logging"
-        env:
-          ACTIONS_RUNNER_DEBUG: true
-          ACTIONS_STEP_DEBUG: true
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Prepare
-        run: |
-          echo "BUILD_TIME=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_ENV
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-          branch=${{ github.event.pull_request.number || github.ref_name }}
-          echo "BRANCH=${branch//\//-}" >> $GITHUB_ENV
-          echo "DOCKERNAMES=${{ env.DOCKERHUB_REPO }},${{ env.GHCR_REPO }}" >> $GITHUB_ENV
-          if [[ "${{ github.event_name }}" != "schedule" ]] || [[ "${{ github.ref }}" != refs/tags/* ]]; then
-            echo "DOCKERNAMES=${{ env.GHCR_REPO }}" >> $GITHUB_ENV
-          fi
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f
-        with:
-          images: |
-            name=${{ env.DOCKERHUB_REPO }},enable=${{ github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/') }}
-            name=${{ env.GHCR_REPO }}
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
-        with:
-          image: ghcr.io/sysadminsmedia/binfmt:latest
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435
-        with:
-          driver-opts: |
-            image=ghcr.io/sysadminsmedia/buildkit:master
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
-        with:
-          context: . # Explicitly specify the build context
-          file: ./Dockerfile.hardened # Explicitly specify the Dockerfile
-          platforms: ${{ matrix.platform }}
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.DOCKERNAMES }}",push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
-          cache-from: type=registry,ref=ghcr.io/sysadminsmedia/devcache:${{ env.PLATFORM_PAIR }}-${{ env.BRANCH }}-hardened
-          cache-to: type=registry,ref=ghcr.io/sysadminsmedia/devcache:${{ env.PLATFORM_PAIR }}-${{ env.BRANCH }}-hardened,mode=max,ignore-error=true
-          build-args: |
-            VERSION=${{ github.ref_name }}
-            COMMIT=${{ github.sha }}
-            BUILD_TIME=${{ env.BUILD_TIME }}
-          provenance: mode=max
-          sbom: true
-          annotations: ${{ steps.meta.outputs.annotations }}
-
-      - name: Attest platform-specific images
-        uses: actions/attest-build-provenance@v1
-        if: github.event_name != 'pull_request'
-        with:
-          subject-name: ${{ env.GHCR_REPO }}
-          subject-digest: ${{ steps.build.outputs.digest }}
-          push-to-registry: true
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
-    if: github.event_name != 'pull_request'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-      attestations: write
-    needs:
-      - build
-
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435
-        with:
-          driver-opts: |
-            image=ghcr.io/sysadminsmedia/buildkit:master
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f
-        with:
-          images: |
-            name=${{ env.DOCKERHUB_REPO }},enable=${{ github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/') }}
-            name=${{ env.GHCR_REPO }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=schedule,pattern=nightly
-          flavor: |
-            suffix=-hardened,onlatest=true
-
-      - name: Create manifest list and push GHCR
-        id: push-ghcr
-        working-directory: /tmp/digests
-        run: |
-          set -euo pipefail
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-ghcr.out
-          digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-ghcr.out | head -n1 || true)
-          if [ -z "$digest" ]; then
-            echo "No digest found in imagetools output:"
-            cat /tmp/push-ghcr.out
-            exit 1
-          fi
-          echo "digest=$digest" >> $GITHUB_OUTPUT
-
-      - name: Attest GHCR images
-        uses: actions/attest-build-provenance@v1
-        if: github.event_name != 'pull_request'
-        with:
-          subject-name: ${{ env.GHCR_REPO }}
-          subject-digest: ${{ steps.push-ghcr.outputs.digest }}
-          push-to-registry: true
-
-      - name: Create manifest list and push Dockerhub
-        id: push-dockerhub
-        working-directory: /tmp/digests
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        run: |
-          set -euo pipefail
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-dockerhub.out
-          digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-dockerhub.out | head -n1 || true)
-          if [ -z "$digest" ]; then
-            echo "No digest found in imagetools output:"
-            cat /tmp/push-dockerhub.out
-            exit 1
-          fi
-          echo "digest=$digest" >> $GITHUB_OUTPUT
-
-      - name: Attest Dockerhub images
-        uses: actions/attest-build-provenance@v1
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        with:
-          subject-name: docker.io/${{ env.DOCKERHUB_REPO }}
-          subject-digest: ${{ steps.push-dockerhub.outputs.digest }}
-          push-to-registry: true

.github/workflows/docker-publish-rootless.yaml

@@ -1,250 +0,0 @@
-name: Docker publish rootless
-
-on:
-  schedule:
-    - cron: '00 0 * * *'
-  push:
-    branches: [ "main" ]
-    paths:
-      - 'backend/**'
-      - 'frontend/**'
-      - 'Dockerfile.rootless'
-      - '.dockerignore'
-      - '.github/workflows/docker-publish-rootless.yaml'
-    ignore:
-      - 'docs/**'
-    tags: [ 'v*.*.*' ]
-  pull_request:
-    branches: [ "main" ]
-    paths:
-      - 'backend/**'
-      - 'frontend/**'
-      - 'Dockerfile.rootless'
-      - '.dockerignore'
-      - '.github/workflows/docker-publish-rootless.yaml'
-    ignore:
-      - 'docs/**'
-
-permissions:
-  contents: read        # Access to repository contents
-  packages: write       # Write access for pushing to GHCR
-  id-token: write       # Required for OIDC authentication (if used)
-  attestations: write   # Required for signing and attestation (if needed)
-
-env:
-  DOCKERHUB_REPO: sysadminsmedia/homebox
-  GHCR_REPO: ghcr.io/${{ github.repository }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-      attestations: write
-      
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
-          - linux/arm/v7
-
-    steps:
-      - name: Enable Debug Logs
-        run: echo "##[debug]Enabling debug logging"
-        env:
-          ACTIONS_RUNNER_DEBUG: true
-          ACTIONS_STEP_DEBUG: true
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-          branch=${{ github.event.pull_request.number || github.ref_name }}
-          echo "BRANCH=${branch//\//-}" >> $GITHUB_ENV
-          echo "DOCKERNAMES=${{ env.DOCKERHUB_REPO }},${{ env.GHCR_REPO }}" >> $GITHUB_ENV
-          if [[ "${{ github.event_name }}" != "schedule" ]] || [[ "${{ github.ref }}" != refs/tags/* ]]; then
-            echo "DOCKERNAMES=${{ env.GHCR_REPO }}" >> $GITHUB_ENV
-          fi
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            name=${{ env.DOCKERHUB_REPO }},enable=${{ github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/') }}
-            name=${{ env.GHCR_REPO }}
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: ghcr.io/sysadminsmedia/binfmt:latest
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: |
-            image=ghcr.io/sysadminsmedia/buildkit:master
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: . # Explicitly specify the build context
-          file: ./Dockerfile.rootless # Explicitly specify the Dockerfile
-          platforms: ${{ matrix.platform }}
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.DOCKERNAMES }}",push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
-          cache-from: type=registry,ref=ghcr.io/sysadminsmedia/devcache:${{ env.PLATFORM_PAIR }}-${{ env.BRANCH }}-rootless
-          cache-to: type=registry,ref=ghcr.io/sysadminsmedia/devcache:${{ env.PLATFORM_PAIR }}-${{ env.BRANCH }}-rootless,mode=max,ignore-error=true
-          build-args: |
-            VERSION=${{ github.ref_name }}
-            COMMIT=${{ github.sha }}
-          provenance: mode=max
-          sbom: true
-          annotations: ${{ steps.meta.outputs.annotations }}
-
-      - name: Attest platform-specific images
-        uses: actions/attest-build-provenance@v1
-        if: github.event_name != 'pull_request'
-        with:
-          subject-name: ${{ env.GHCR_REPO }}
-          subject-digest: ${{ steps.build.outputs.digest }}
-          push-to-registry: true
-                              
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
-    if: github.event_name != 'pull_request'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-      attestations: write
-    needs:
-      - build
-
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: |
-            image=ghcr.io/sysadminsmedia/buildkit:master
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            name=${{ env.DOCKERHUB_REPO }},enable=${{ github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/') }}
-            name=${{ env.GHCR_REPO }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=schedule,pattern=nightly
-          flavor: |
-            suffix=-rootless,onlatest=true
-
-      - name: Create manifest list and push GHCR
-        id: push-ghcr
-        working-directory: /tmp/digests
-        run: |
-          set -euo pipefail
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-ghcr.out
-          digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-ghcr.out | head -n1 || true)
-          if [ -z "$digest" ]; then
-            echo "No digest found in imagetools output:"
-            cat /tmp/push-ghcr.out
-            exit 1
-          fi
-          echo "digest=$digest" >> $GITHUB_OUTPUT
-
-      - name: Attest GHCR images
-        uses: actions/attest-build-provenance@v1
-        if: github.event_name != 'pull_request'
-        with:
-          subject-name: ${{ env.GHCR_REPO }}
-          subject-digest: ${{ steps.push-ghcr.outputs.digest }}
-          push-to-registry: true
-
-      - name: Create manifest list and push Dockerhub
-        id: push-dockerhub
-        working-directory: /tmp/digests
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        run: |
-          set -euo pipefail
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-dockerhub.out
-          digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-dockerhub.out | head -n1 || true)
-          if [ -z "$digest" ]; then
-            echo "No digest found in imagetools output:"
-            cat /tmp/push-dockerhub.out
-            exit 1
-          fi
-          echo "digest=$digest" >> $GITHUB_OUTPUT
-
-      - name: Attest Dockerhub images
-        uses: actions/attest-build-provenance@v1
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        with:
-          subject-name: docker.io/${{ env.DOCKERHUB_REPO }}
-          subject-digest: ${{ steps.push-dockerhub.outputs.digest }}
-          push-to-registry: true

.github/workflows/docker-publish.yaml

@@ -1,241 +0,0 @@
-name: Docker publish
-
-on:
-  schedule:
-    - cron: '00 0 * * *'
-  push:
-    branches: [ "main" ]
-    paths:
-      - 'backend/**'
-      - 'frontend/**'
-      - 'Dockerfile'
-      - '.dockerignore'
-      - '.github/workflows/docker-publish.yaml'
-    ignore:
-      - 'docs/**'
-    tags: [ 'v*.*.*' ]
-  pull_request:
-    branches: [ "main" ]
-    paths:
-      - 'backend/**'
-      - 'frontend/**'
-      - 'Dockerfile'
-      - '.dockerignore'
-      - '.github/workflows/docker-publish.yaml'
-    ignore:
-      - 'docs/**'
-
-env:
-  DOCKERHUB_REPO: sysadminsmedia/homebox
-  GHCR_REPO: ghcr.io/${{ github.repository }}
-
-permissions:
-  contents: read        # Access to repository contents
-  packages: write       # Write access for pushing to GHCR
-  id-token: write       # Required for OIDC authentication (if used)
-  attestations: write   # Required for signing and attestation (if needed)
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read     # Allows access to repository contents (read-only)
-      packages: write    # Allows pushing to GHCR
-      id-token: write    # Allows identity token write access for authentication
-      attestations: write  # Needed for signing and attestation (if required)
-
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
-          - linux/arm/v7
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-          branch=${{ github.event.pull_request.number || github.ref_name }}
-          echo "BRANCH=${branch//\//-}" >> $GITHUB_ENV
-          echo "DOCKERNAMES=${{ env.DOCKERHUB_REPO }},${{ env.GHCR_REPO }}" >> $GITHUB_ENV
-          if [[ "${{ github.event_name }}" != "schedule" ]] || [[ "${{ github.ref }}" != refs/tags/* ]]; then
-            echo "DOCKERNAMES=${{ env.GHCR_REPO }}" >> $GITHUB_ENV
-          fi
-              
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            name=${{ env.DOCKERHUB_REPO }},enable=${{ github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/') }}
-            name=${{ env.GHCR_REPO }}
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: ghcr.io/sysadminsmedia/binfmt:latest
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: |
-            image=ghcr.io/sysadminsmedia/buildkit:latest
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          platforms: ${{ matrix.platform }}
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.DOCKERNAMES }}",push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
-          cache-from: type=registry,ref=ghcr.io/sysadminsmedia/devcache:${{ env.PLATFORM_PAIR }}-${{ env.BRANCH }}
-          cache-to: type=registry,ref=ghcr.io/sysadminsmedia/devcache:${{ env.PLATFORM_PAIR}}-${{ env.BRANCH }},mode=max,ignore-error=true
-          build-args: |
-            VERSION=${{ github.ref_name }}
-            COMMIT=${{ github.sha	}}
-          provenance: mode=max
-          sbom: true
-          annotations: ${{ steps.meta.outputs.annotations }}
-
-      - name: Attest platform-specific images
-        uses: actions/attest-build-provenance@v1
-        if: github.event_name != 'pull_request'
-        with:
-          subject-name: ${{ env.GHCR_REPO }}
-          subject-digest: ${{ steps.build.outputs.digest }}
-          push-to-registry: true
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
-    if: github.event_name != 'pull_request'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read     # Allows access to repository contents (read-only)
-      packages: write    # Allows pushing to GHCR
-      id-token: write    # Allows identity token write access for authentication
-      attestations: write  # Needed for signing and attestation (if required)
-    needs:
-      - build
-
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: |
-            image=ghcr.io/sysadminsmedia/buildkit:master
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            name=${{ env.DOCKERHUB_REPO }},enable=${{ github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/') }}
-            name=${{ env.GHCR_REPO }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=schedule,pattern=nightly
-
-      - name: Create manifest list and push GHCR
-        id: push-ghcr
-        working-directory: /tmp/digests
-        run: |
-          set -euo pipefail
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-ghcr.out
-          digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-ghcr.out | head -n1 || true)
-          if [ -z "$digest" ]; then
-            echo "No digest found in imagetools output:"
-            cat /tmp/push-ghcr.out
-            exit 1
-          fi
-          echo "digest=$digest" >> $GITHUB_OUTPUT
-
-      - name: Attest GHCR images
-        uses: actions/attest-build-provenance@v1
-        if: github.event_name != 'pull_request'
-        with:
-          subject-name: ${{ env.GHCR_REPO }}
-          subject-digest: ${{ steps.push-ghcr.outputs.digest }}
-          push-to-registry: true
-
-      - name: Create manifest list and push Dockerhub
-        id: push-dockerhub
-        working-directory: /tmp/digests
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        run: |
-          set -euo pipefail
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *) 2>&1 | tee /tmp/push-dockerhub.out
-          digest=$(grep -oE 'sha256:[a-f0-9]{64}' /tmp/push-dockerhub.out | head -n1 || true)
-          if [ -z "$digest" ]; then
-            echo "No digest found in imagetools output:"
-            cat /tmp/push-dockerhub.out
-            exit 1
-          fi
-          echo "digest=$digest" >> $GITHUB_OUTPUT
-
-      - name: Attest Dockerhub images
-        uses: actions/attest-build-provenance@v1
-        if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/'))
-        with:
-          subject-name: docker.io/${{ env.DOCKERHUB_REPO }}
-          subject-digest: ${{ steps.push-dockerhub.outputs.digest }}
-          push-to-registry: true

.github/workflows/e2e-partial.yaml

@@ -1,95 +0,0 @@
-name: E2E (Playwright)
-
-on:
-  workflow_call:
-
-
-jobs:
-  playwright-tests:
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        shardIndex: [1,2,3,4]
-        shardTotal: [4]
-    name: E2E Playwright Testing ${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install Task
-        uses: arduino/setup-task@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.23"
-          cache-dependency-path: backend/go.mod
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
-      - uses: pnpm/action-setup@v3.0.0
-        with:
-          version: 9.12.2
-
-      - name: Install dependencies
-        run: pnpm install
-        working-directory: frontend
-
-      - name: Install Go Dependencies
-        run: go mod download
-        working-directory: backend
-
-      - name: Run E2E Tests
-        run: task test:e2e -- --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
-
-      - uses: actions/upload-artifact@v4
-        name: Upload partial Playwright report
-        if: ${{ !cancelled() }}
-        with:
-          name: blob-report-${{ matrix.shardIndex }}
-          path: frontend/blob-report/
-          retention-days: 2
-
-  merge-reports:
-    # Merge reports after playwright-tests, even if some shards have failed
-    if: ${{ !cancelled() }}
-    needs: [playwright-tests]
-    name: Merge Playwright Reports
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-      - uses: pnpm/action-setup@v3.0.0
-        with:
-          version: 9.12.2
-
-      - name: Install dependencies
-        run: pnpm install
-        working-directory: frontend
-
-      - name: Download blob reports from GitHub Actions Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: frontend/all-blob-reports
-          pattern: blob-report-*
-          merge-multiple: true
-
-      - name: Merge into HTML Report
-        run: pnpm exec playwright merge-reports --reporter html,github ./all-blob-reports
-        working-directory: frontend
-
-      - name: Upload HTML report
-        uses: actions/upload-artifact@v4
-        with:
-          name: html-report--attempt-${{ github.run_attempt }}
-          path: frontend/playwright-report
-          retention-days: 30

.github/workflows/partial-backend.yaml

@@ -7,13 +7,12 @@ jobs:
   Go:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version: "1.24"
-          cache-dependency-path: backend/go.mod
+          go-version: 1.19
 
       - name: Install Task
         uses: arduino/setup-task@v1
@@ -21,7 +20,7 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v7
+        uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: latest

.github/workflows/partial-frontend.yaml

@@ -1,54 +1,14 @@
-name: Frontend
+name: Frontend / E2E
 
 on:
   workflow_call:
 
 jobs:
-  lint:
-    name: Lint
+  Frontend:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: pnpm/action-setup@v3.0.0
-        with:
-          version: 9.12.2
-
-      - name: Install dependencies
-        run: pnpm install
-        working-directory: frontend
-
-      - name: Run Lint
-        run: pnpm run lint:ci
-        working-directory: frontend
-
-      - name: Run Typecheck
-        run: pnpm run typecheck
-        working-directory: frontend
-
-  integration-tests:
-    name: Integration Tests
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:17
-        env:
-          POSTGRES_USER: homebox
-          POSTGRES_PASSWORD: homebox
-          POSTGRES_DB: homebox
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
@@ -58,73 +18,25 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version: "1.23"
-          cache-dependency-path: backend/go.mod
+          go-version: 1.19
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
           node-version: 18
 
-      - uses: pnpm/action-setup@v3.0.0
+      - uses: pnpm/action-setup@v2.2.2
         with:
-          version: 9.12.2
+          version: 6.0.2
 
       - name: Install dependencies
         run: pnpm install
         working-directory: frontend
 
+      - name: Run linter 👀
+        run: pnpm lint
+        working-directory: "frontend"
+
       - name: Run Integration Tests
         run: task test:ci
-  integration-tests-pgsql:
-    strategy:
-        matrix:
-            database_version: [17,16,15]
-    name: Integration Tests PGSQL ${{ matrix.database_version }}
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:${{ matrix.database_version }}
-        env:
-          POSTGRES_USER: homebox
-          POSTGRES_PASSWORD: homebox
-          POSTGRES_DB: homebox
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install Task
-        uses: arduino/setup-task@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.23"
-          cache-dependency-path: backend/go.mod
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
-      - uses: pnpm/action-setup@v3.0.0
-        with:
-          version: 9.12.2
-
-      - name: Install dependencies
-        run: pnpm install
-        working-directory: frontend
-
-      - name: Run Integration Tests
-        run: task test:ci:postgresql

.github/workflows/partial-publish.yaml

@@ -0,0 +1,66 @@
+name: Frontend / E2E
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        required: true
+        type: string
+      release:
+        required: false
+        type: boolean
+        default: false
+
+    secrets:
+      GH_TOKEN:
+        required: true
+
+jobs:
+  publish:
+    name: "Publish Homebox"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.19
+
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+
+      - name: install buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          install: true
+
+      - name: login to container registry
+        run: docker login ghcr.io --username hay-kot --password $CR_PAT
+        env:
+          CR_PAT: ${{ secrets.GH_TOKEN }}
+
+      - name: build nightly the image
+        if: ${{ inputs.release == false }}
+        run: |
+          docker build --push --no-cache \
+            --tag=ghcr.io/hay-kot/homebox:${{ inputs.tag }} \
+            --build-arg=COMMIT=$(git rev-parse HEAD) \
+            --build-arg=BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
+            --platform=linux/amd64,linux/arm64,linux/arm/v7 .
+
+      - name: build release tagged the image
+        if: ${{ inputs.release == true }}
+        run: |
+          docker build --push --no-cache \
+            --tag ghcr.io/hay-kot/homebox:nightly \
+            --tag ghcr.io/hay-kot/homebox:latest \
+            --tag ghcr.io/hay-kot/homebox:${{ inputs.tag }} \
+            --build-arg VERSION=${{ inputs.tag }} \
+            --build-arg COMMIT=$(git rev-parse HEAD) \
+            --build-arg BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
+            --platform linux/amd64,linux/arm64,linux/arm/v7 .

.github/workflows/publish.yaml

@@ -0,0 +1,73 @@
+name: Build Nightly
+
+on:
+  push:
+    branches:
+      - main
+  release:
+    types:
+      - published
+
+env:
+  FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+
+jobs:
+  backend-tests:
+    name: "Backend Server Tests"
+    uses: hay-kot/homebox/.github/workflows/partial-backend.yaml@main
+
+  frontend-tests:
+    name: "Frontend and End-to-End Tests"
+    uses: hay-kot/homebox/.github/workflows/partial-frontend.yaml@main
+
+  deploy:
+    name: "Deploy Nightly to Fly.io"
+    runs-on: ubuntu-latest
+    needs:
+      - backend-tests
+      - frontend-tests
+    steps:
+      - uses: actions/checkout@v2
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --remote-only
+
+  publish-nightly:
+    name: "Publish Nightly"
+    if: github.event_name != 'release'
+    needs:
+      - backend-tests
+      - frontend-tests
+    uses: hay-kot/homebox/.github/workflows/partial-publish.yaml@main
+    with:
+      tag: nightly
+    secrets:
+      GH_TOKEN: ${{ secrets.CR_PAT }}
+
+  publish-tag:
+    name: "Publish Tag"
+    if: github.event_name == 'release'
+    needs:
+      - backend-tests
+      - frontend-tests
+    uses: hay-kot/homebox/.github/workflows/partial-publish.yaml@main
+    with:
+      release: true
+      tag: ${{ github.event.release.tag_name }}
+    secrets:
+      GH_TOKEN: ${{ secrets.CR_PAT }}
+
+  deploy-docs:
+    name: Deploy docs
+    needs:
+      - publish-tag
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v2
+
+      - name: Deploy docs
+        uses: mhausenblas/mkdocs-deploy-gh-pages@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CONFIG_FILE: docs/mkdocs.yml
+          EXTRA_PACKAGES: build-base

.github/workflows/pull-requests.yaml

@@ -4,15 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - vnext
-
-    paths:
-      - 'backend/**'
-      - 'frontend/**'
-      - '.github/workflows/partial-backend.yaml'
-      - '.github/workflows/partial-frontend.yaml'
-      - '.github/workflows/e2e-partial.yaml'
-      - '.github/workflows/pull-requests.yaml'
 
 jobs:
   backend-tests:
@@ -20,9 +11,5 @@ jobs:
     uses: ./.github/workflows/partial-backend.yaml
 
   frontend-tests:
-    name: "Frontend Tests"
+    name: "Frontend and End-to-End Tests"
     uses: ./.github/workflows/partial-frontend.yaml
-
-  e2e-tests:
-    name: "End-to-End Playwright Tests"
-    uses: ./.github/workflows/e2e-partial.yaml

.github/workflows/update-currencies.yml

@@ -1,60 +0,0 @@
-name: Update Currencies
-
-on:
-  push:
-    branches: [ main ]
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  update-currencies:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.8'
-          cache: 'pip'
-          cache-dependency-path: .github/workflows/update-currencies/requirements.txt
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r .github/workflows/update-currencies/requirements.txt
-
-      - name: Run currency update script
-        run: python .github/scripts/update_currencies.py
-
-      - name: Check for currencies.json changes
-        run: |
-          if git diff --quiet -- backend/internal/core/currencies/currencies.json; then
-            echo "changed=false" >> $GITHUB_ENV
-          else
-            echo "changed=true"  >> $GITHUB_ENV
-          fi
-
-      - name: Create Pull Request
-        if: env.changed == 'true'
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: update-currencies
-          base: main
-          title: "Update currencies.json"
-          commit-message: "chore: update currencies.json"
-          path: .  
-          add-paths: |
-            backend/internal/core/currencies/currencies.json
-
-      - name: No updates needed
-        if: env.changed == 'false'
-        run: echo "✅ currencies.json is already up-to-date"

.github/workflows/update-currencies/requirements.txt

@@ -1 +0,0 @@
-requests

.gitignore

@@ -2,9 +2,6 @@
 backend/.data/*
 config.yml
 homebox.db
-homebox.db-journal
-homebox.db-shm
-homebox.db-wal
 .idea
 .DS_Store
 test-mailer.json
@@ -36,7 +33,7 @@ go.work
 backend/.env
 build/*
 
-# Output Directory for Nuxt/Frontend during build steps
+# Output Directory for Nuxt/Frontend during build step
 backend/app/api/public/*
 !backend/app/api/public/.gitkeep
 
@@ -48,22 +45,3 @@ node_modules
 .output
 .env
 dist
-
-.pnpm-store
-backend/app/api/app
-backend/app/api/__debug_bin*
-dist/
-
-# Nuxt Publish Dir
-backend/app/api/static/public/*
-!backend/app/api/static/public/.gitkeep
-backend/api
-
-docs/.vitepress/cache/
-.data/
-
-# Playwright
-frontend/test-results/
-frontend/playwright-report/
-frontend/blob-report/
-frontend/playwright/.cache/

.gitlab-ci.yml

@@ -1,603 +0,0 @@
-include:
-  - template: Jobs/SAST.gitlab-ci.yml
-  - component: $CI_SERVER_FQDN/components/code-quality-oss/codequality-os-scanners-integration/codequality-oss@1.1.4
-  - component: $CI_SERVER_FQDN/components/code-intelligence/golang-code-intel@v0.3.1
-  - component: $CI_SERVER_FQDN/components/code-intelligence/typescript-code-intel@v0.3.1
-    inputs:
-      node_version: 24
-  - component: $CI_SERVER_FQDN/components/secret-detection/secret-detection@2.1.0
-
-variables:
-  GITLAB_ADVANCED_SAST_ENABLED: 'true'
-  ADVANCED_SAST_PARTIAL_SCAN: 'differential'
-  DOCKER_DRIVER: overlay2
-  DOCKER_TLS_CERTDIR: "/certs"
-  # Registry configuration - adjust as needed
-  CI_REGISTRY_IMAGE: $CI_REGISTRY/$CI_PROJECT_PATH
-
-stages:
-  - test
-  - build-binaries
-  - build-docker
-  - release
-
-# ==========================================
-# Test Jobs
-# ==========================================
-
-# Backend Tests (Go)
-test:backend:
-  stage: test
-  image: golang:1.24
-  cache:
-    key:
-      files:
-        - backend/go.sum
-    paths:
-      - backend/.go-pkg-cache/
-    policy: pull-push
-  before_script:
-    - export GOMODCACHE=$(pwd)/backend/.go-pkg-cache
-    # Install Task
-    - sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
-  script:
-    - cd backend
-    - task go:lint
-    - task go:build
-    - task go:coverage
-  coverage: '/coverage: \d+.\d+% of statements/'
-  artifacts:
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: backend/coverage.out
-    paths:
-      - backend/coverage.out
-    expire_in: 7 days
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-# Frontend Lint and Typecheck
-test:frontend:lint:
-  stage: test
-  image: node:22-alpine
-  cache:
-    key:
-      files:
-        - frontend/pnpm-lock.yaml
-    paths:
-      - frontend/node_modules/
-      - .pnpm-store/
-    policy: pull-push
-  before_script:
-    - npm install -g pnpm@9.15.3
-    - pnpm config set store-dir $(pwd)/.pnpm-store
-  script:
-    - cd frontend
-    - pnpm install --frozen-lockfile
-    - pnpm run lint:ci
-    - pnpm run typecheck
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-# Frontend Integration Tests (SQLite)
-test:frontend:integration:
-  stage: test
-  image: node:22
-  cache:
-    - key:
-        files:
-          - frontend/pnpm-lock.yaml
-      paths:
-        - frontend/node_modules/
-        - .pnpm-store/
-      policy: pull-push
-    - key:
-        files:
-          - backend/go.sum
-      paths:
-        - backend/.go-pkg-cache/
-      policy: pull-push
-  before_script:
-    - npm install -g pnpm@9.15.3
-    - pnpm config set store-dir $(pwd)/.pnpm-store
-    # Install Task
-    - sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
-    # Install Go
-    - wget -q https://go.dev/dl/go1.24.0.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.24.0.linux-amd64.tar.gz
-    - export PATH=$PATH:/usr/local/go/bin
-    - export GOMODCACHE=$(pwd)/backend/.go-pkg-cache
-  script:
-    - cd frontend
-    - pnpm install --frozen-lockfile
-    - cd ..
-    - task test:ci
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-# Frontend Integration Tests (PostgreSQL Matrix)
-test:frontend:integration:postgresql:
-  stage: test
-  image: node:22
-  services:
-    - name: postgres:${POSTGRES_VERSION}
-      alias: postgres
-  variables:
-    POSTGRES_USER: homebox
-    POSTGRES_PASSWORD: homebox
-    POSTGRES_DB: homebox
-    POSTGRES_HOST_AUTH_METHOD: trust
-  parallel:
-    matrix:
-      - POSTGRES_VERSION: ["17", "16", "15"]
-  cache:
-    - key:
-        files:
-          - frontend/pnpm-lock.yaml
-      paths:
-        - frontend/node_modules/
-        - .pnpm-store/
-      policy: pull-push
-    - key:
-        files:
-          - backend/go.sum
-      paths:
-        - backend/.go-pkg-cache/
-      policy: pull-push
-  before_script:
-    - npm install -g pnpm@9.15.3
-    - pnpm config set store-dir $(pwd)/.pnpm-store
-    # Install Task
-    - sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
-    # Install Go
-    - wget -q https://go.dev/dl/go1.24.0.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.24.0.linux-amd64.tar.gz
-    - export PATH=$PATH:/usr/local/go/bin
-    - export GOMODCACHE=$(pwd)/backend/.go-pkg-cache
-  script:
-    - cd frontend
-    - pnpm install --frozen-lockfile
-    - cd ..
-    - task test:ci:postgresql
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-# E2E Tests (Playwright) - Sharded
-test:e2e:playwright:
-  stage: test
-  image: mcr.microsoft.com/playwright:v1.48.2-jammy
-  timeout: 1h
-  parallel:
-    matrix:
-      - SHARD_INDEX: ["1", "2", "3", "4"]
-        SHARD_TOTAL: "4"
-  cache:
-    - key:
-        files:
-          - frontend/pnpm-lock.yaml
-      paths:
-        - frontend/node_modules/
-        - .pnpm-store/
-      policy: pull-push
-    - key:
-        files:
-          - backend/go.sum
-      paths:
-        - backend/.go-pkg-cache/
-      policy: pull-push
-  before_script:
-    - npm install -g pnpm@9.15.3
-    - pnpm config set store-dir $(pwd)/.pnpm-store
-    # Install Task
-    - sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
-    # Install Go
-    - wget -q https://go.dev/dl/go1.24.0.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.24.0.linux-amd64.tar.gz
-    - export PATH=$PATH:/usr/local/go/bin
-    - export GOMODCACHE=$(pwd)/backend/.go-pkg-cache
-  script:
-    - cd frontend
-    - pnpm install --frozen-lockfile
-    - cd ..
-    - cd backend && go mod download
-    - task test:e2e -- --shard=$SHARD_INDEX/$SHARD_TOTAL
-  artifacts:
-    when: always
-    paths:
-      - frontend/blob-report/
-    expire_in: 2 days
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-# E2E Reports Merge
-test:e2e:merge-reports:
-  stage: test
-  image: mcr.microsoft.com/playwright:v1.48.2-jammy
-  needs:
-    - test:e2e:playwright
-  cache:
-    key:
-      files:
-        - frontend/pnpm-lock.yaml
-    paths:
-      - frontend/node_modules/
-      - .pnpm-store/
-    policy: pull
-  before_script:
-    - npm install -g pnpm@9.15.3
-    - pnpm config set store-dir $(pwd)/.pnpm-store
-  script:
-    - cd frontend
-    - pnpm install --frozen-lockfile
-    # Download all blob reports
-    - mkdir -p all-blob-reports
-    # GitLab automatically downloads artifacts from dependencies
-    - cp -r ../frontend/blob-report/* all-blob-reports/ || true
-    - pnpm exec playwright merge-reports --reporter html,github ./all-blob-reports || true
-  artifacts:
-    when: always
-    paths:
-      - frontend/playwright-report/
-    expire_in: 30 days
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      when: always
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      when: always
-
-# Update Currencies (Scheduled Job)
-update:currencies:
-  stage: test
-  image: python:3.11
-  cache:
-    key: python-currencies
-    paths:
-      - .pip-cache/
-  before_script:
-    - pip install --cache-dir .pip-cache -r .github/workflows/update-currencies/requirements.txt
-  script:
-    - python .github/scripts/update_currencies.py
-    - |
-      if git diff --quiet -- backend/internal/core/currencies/currencies.json; then
-        echo "✅ currencies.json is already up-to-date"
-        exit 0
-      else
-        echo "Changes detected in currencies.json"
-        git config user.name "GitLab CI"
-        git config user.email "ci@gitlab.com"
-        git checkout -b update-currencies-$CI_COMMIT_SHORT_SHA
-        git add backend/internal/core/currencies/currencies.json
-        git commit -m "chore: update currencies.json"
-        git push -o merge_request.create -o merge_request.target=$CI_DEFAULT_BRANCH -o merge_request.title="Update currencies.json" origin update-currencies-$CI_COMMIT_SHORT_SHA
-      fi
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $UPDATE_CURRENCIES == "true"
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $UPDATE_CURRENCIES == "true"
-
-# ==========================================
-# Binary Build with GoReleaser
-# ==========================================
-build:binaries:
-  stage: build-binaries
-  image: golang:1.24
-  cache:
-    - key:
-        files:
-          - frontend/pnpm-lock.yaml
-      paths:
-        - frontend/node_modules/
-        - .pnpm-store/
-      policy: pull-push
-    - key:
-        files:
-          - backend/go.sum
-      paths:
-        - backend/.go-pkg-cache/
-      policy: pull-push
-  before_script:
-    # Install Node.js and pnpm for frontend build
-    - curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
-    - apt-get install -y nodejs
-    - npm install -g pnpm@9.15.3
-    # Configure pnpm store
-    - pnpm config set store-dir $(pwd)/.pnpm-store
-    # Install GoReleaser
-    - curl -sfL https://goreleaser.com/static/run | bash -s -- check
-    - curl -sfL https://goreleaser.com/static/run | bash -s -- --version
-    # Configure Go cache
-    - export GOMODCACHE=$(pwd)/backend/.go-pkg-cache
-  script:
-    # Build frontend
-    - cd frontend
-    - pnpm install --frozen-lockfile
-    - pnpm run build
-    - cp -r ./.output/public ../backend/app/api/static/
-    - cd ..
-    # Run GoReleaser
-    - cd backend
-    - |
-      if [ -n "$CI_COMMIT_TAG" ]; then
-        echo "Building release for tag: $CI_COMMIT_TAG"
-        curl -sfL https://goreleaser.com/static/run | bash -s -- release --clean --skip=publish
-      else
-        echo "Building snapshot"
-        curl -sfL https://goreleaser.com/static/run | bash -s -- release --clean --snapshot --skip=publish
-      fi
-  artifacts:
-    name: "homebox-binaries-$CI_COMMIT_REF_SLUG"
-    paths:
-      - backend/dist/
-    expire_in: 30 days
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-
-# ==========================================
-# Docker Build Jobs - Regular
-# ==========================================
-.docker_build_template:
-  stage: build-docker
-  image: docker:latest
-  services:
-    - docker:dind
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-  variables:
-    DOCKER_BUILDKIT: 1
-    DOCKERFILE: Dockerfile
-    IMAGE_SUFFIX: ""
-  script:
-    - export VERSION=${CI_COMMIT_TAG:-$CI_COMMIT_REF_NAME}
-    - export COMMIT=$CI_COMMIT_SHA
-    - export BUILD_TIME=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-    - export CACHE_TAG=${IMAGE_SUFFIX:-regular}
-    # Build and push for the specific platform with layer caching
-    - |
-      docker buildx create --use --name builder-${CI_JOB_ID} || true
-      docker buildx build \
-        --platform $PLATFORM \
-        --build-arg VERSION=$VERSION \
-        --build-arg COMMIT=$COMMIT \
-        --build-arg BUILD_TIME=$BUILD_TIME \
-        --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/cache:${PLATFORM_PAIR}-${CACHE_TAG}-$CI_COMMIT_REF_SLUG \
-        --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/cache:${PLATFORM_PAIR}-${CACHE_TAG}-$CI_DEFAULT_BRANCH \
-        --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/cache:${PLATFORM_PAIR}-${CACHE_TAG}-$CI_COMMIT_REF_SLUG,mode=max \
-        --file ./$DOCKERFILE \
-        --tag $CI_REGISTRY_IMAGE${IMAGE_SUFFIX}:${CI_COMMIT_REF_SLUG}-${PLATFORM_PAIR} \
-        --push \
-        .
-      docker buildx rm builder-${CI_JOB_ID} || true
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-
-docker:build:amd64:
-  extends: .docker_build_template
-  variables:
-    PLATFORM: linux/amd64
-    PLATFORM_PAIR: linux-amd64
-
-docker:build:arm64:
-  extends: .docker_build_template
-  variables:
-    PLATFORM: linux/arm64
-    PLATFORM_PAIR: linux-arm64
-
-docker:build:armv7:
-  extends: .docker_build_template
-  variables:
-    PLATFORM: linux/arm/v7
-    PLATFORM_PAIR: linux-arm-v7
-
-# ==========================================
-# Docker Build Jobs - Rootless
-# ==========================================
-docker:build:rootless:amd64:
-  extends: .docker_build_template
-  variables:
-    PLATFORM: linux/amd64
-    PLATFORM_PAIR: linux-amd64
-    DOCKERFILE: Dockerfile.rootless
-    IMAGE_SUFFIX: -rootless
-
-docker:build:rootless:arm64:
-  extends: .docker_build_template
-  variables:
-    PLATFORM: linux/arm64
-    PLATFORM_PAIR: linux-arm64
-    DOCKERFILE: Dockerfile.rootless
-    IMAGE_SUFFIX: -rootless
-
-docker:build:rootless:armv7:
-  extends: .docker_build_template
-  variables:
-    PLATFORM: linux/arm/v7
-    PLATFORM_PAIR: linux-arm-v7
-    DOCKERFILE: Dockerfile.rootless
-    IMAGE_SUFFIX: -rootless
-
-# ==========================================
-# Docker Build Jobs - Hardened
-# ==========================================
-docker:build:hardened:amd64:
-  extends: .docker_build_template
-  variables:
-    PLATFORM: linux/amd64
-    PLATFORM_PAIR: linux-amd64
-    DOCKERFILE: Dockerfile.hardened
-    IMAGE_SUFFIX: -hardened
-
-docker:build:hardened:arm64:
-  extends: .docker_build_template
-  variables:
-    PLATFORM: linux/arm64
-    PLATFORM_PAIR: linux-arm64
-    DOCKERFILE: Dockerfile.hardened
-    IMAGE_SUFFIX: -hardened
-
-docker:build:hardened:armv7:
-  extends: .docker_build_template
-  variables:
-    PLATFORM: linux/arm/v7
-    PLATFORM_PAIR: linux-arm-v7
-    DOCKERFILE: Dockerfile.hardened
-    IMAGE_SUFFIX: -hardened
-
-# ==========================================
-# Docker Manifest Creation - Regular
-# ==========================================
-docker:manifest:
-  stage: release
-  image: docker:latest
-  services:
-    - docker:dind
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-  script:
-    - export VERSION=${CI_COMMIT_TAG:-$CI_COMMIT_REF_NAME}
-    # Create manifest for regular image
-    - |
-      docker manifest create $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG \
-        $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-        $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-arm64 \
-        $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-arm-v7
-      docker manifest push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-    # Tag as latest on main branch or create version tags
-    - |
-      if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
-        docker manifest create $CI_REGISTRY_IMAGE:latest \
-          $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-          $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-arm64 \
-          $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-arm-v7
-        docker manifest push $CI_REGISTRY_IMAGE:latest
-      fi
-    - |
-      if [ -n "$CI_COMMIT_TAG" ]; then
-        # Create version tag
-        docker manifest create $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG \
-          $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-          $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-arm64 \
-          $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-arm-v7
-        docker manifest push $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
-      
-        # Create major.minor tag if semantic version
-        MAJOR_MINOR=$(echo $CI_COMMIT_TAG | sed -E 's/^v?([0-9]+\.[0-9]+)\..*/\1/')
-        if [ -n "$MAJOR_MINOR" ]; then
-          docker manifest create $CI_REGISTRY_IMAGE:$MAJOR_MINOR \
-            $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-            $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-arm64 \
-            $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}-linux-arm-v7
-          docker manifest push $CI_REGISTRY_IMAGE:$MAJOR_MINOR
-        fi
-      fi
-  needs:
-    - docker:build:amd64
-    - docker:build:arm64
-    - docker:build:armv7
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-# ==========================================
-# Docker Manifest Creation - Rootless
-# ==========================================
-docker:manifest:rootless:
-  stage: release
-  image: docker:latest
-  services:
-    - docker:dind
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-  script:
-    - export VERSION=${CI_COMMIT_TAG:-$CI_COMMIT_REF_NAME}
-    # Create manifest for rootless image
-    - |
-      docker manifest create $CI_REGISTRY_IMAGE-rootless:$CI_COMMIT_REF_SLUG \
-        $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-        $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64
-      docker manifest push $CI_REGISTRY_IMAGE-rootless:$CI_COMMIT_REF_SLUG
-    # Tag as latest on main branch or create version tags
-    - |
-      if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
-        docker manifest create $CI_REGISTRY_IMAGE-rootless:latest \
-          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64
-        docker manifest push $CI_REGISTRY_IMAGE-rootless:latest
-      fi
-    - |
-      if [ -n "$CI_COMMIT_TAG" ]; then
-        docker manifest create $CI_REGISTRY_IMAGE-rootless:$CI_COMMIT_TAG \
-          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64
-        docker manifest push $CI_REGISTRY_IMAGE-rootless:$CI_COMMIT_TAG
-      
-        MAJOR_MINOR=$(echo $CI_COMMIT_TAG | sed -E 's/^v?([0-9]+\.[0-9]+)\..*/\1/')
-        if [ -n "$MAJOR_MINOR" ]; then
-          docker manifest create $CI_REGISTRY_IMAGE-rootless:$MAJOR_MINOR \
-            $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-            $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64
-          docker manifest push $CI_REGISTRY_IMAGE-rootless:$MAJOR_MINOR
-        fi
-      fi
-  needs:
-    - docker:build:rootless:amd64
-    - docker:build:rootless:arm64
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-# ==========================================
-# Docker Manifest Creation - Hardened
-# ==========================================
-docker:manifest:hardened:
-  stage: release
-  image: docker:latest
-  services:
-    - docker:dind
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-  script:
-    - export VERSION=${CI_COMMIT_TAG:-$CI_COMMIT_REF_NAME}
-    # Create manifest for hardened image
-    - |
-      docker manifest create $CI_REGISTRY_IMAGE-hardened:$CI_COMMIT_REF_SLUG \
-        $CI_REGISTRY_IMAGE-hardened:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-        $CI_REGISTRY_IMAGE-hardened:${CI_COMMIT_REF_SLUG}-linux-arm64
-      docker manifest push $CI_REGISTRY_IMAGE-hardened:$CI_COMMIT_REF_SLUG
-    # Tag as latest on main branch or create version tags
-    - |
-      if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
-        docker manifest create $CI_REGISTRY_IMAGE-hardened:latest \
-          $CI_REGISTRY_IMAGE-hardened:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-          $CI_REGISTRY_IMAGE-hardened:${CI_COMMIT_REF_SLUG}-linux-arm64
-        docker manifest push $CI_REGISTRY_IMAGE-hardened:latest
-      fi
-    - |
-      if [ -n "$CI_COMMIT_TAG" ]; then
-        docker manifest create $CI_REGISTRY_IMAGE-hardened:$CI_COMMIT_TAG \
-          $CI_REGISTRY_IMAGE-hardened:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-          $CI_REGISTRY_IMAGE-hardened:${CI_COMMIT_REF_SLUG}-linux-arm64
-        docker manifest push $CI_REGISTRY_IMAGE-hardened:$CI_COMMIT_TAG
-      
-        MAJOR_MINOR=$(echo $CI_COMMIT_TAG | sed -E 's/^v?([0-9]+\.[0-9]+)\..*/\1/')
-        if [ -n "$MAJOR_MINOR" ]; then
-          docker manifest create $CI_REGISTRY_IMAGE-hardened:$MAJOR_MINOR \
-            $CI_REGISTRY_IMAGE-hardened:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-            $CI_REGISTRY_IMAGE-hardened:${CI_COMMIT_REF_SLUG}-linux-arm64
-          docker manifest push $CI_REGISTRY_IMAGE-hardened:$MAJOR_MINOR
-        fi
-      fi
-  needs:
-    - docker:build:hardened:amd64
-    - docker:build:hardened:arm64
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

.scaffold/go.sum

@@ -1,14 +0,0 @@
-entgo.io/ent v0.14.5 h1:Rj2WOYJtCkWyFo6a+5wB3EfBRP0rnx1fMk6gGA0UUe4=
-entgo.io/ent v0.14.5/go.mod h1:zTzLmWtPvGpmSwtkaayM2cm5m819NdM7z7tYPq3vN0U=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-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/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-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/sysadminsmedia/homebox/backend v0.0.0-20251212183312-2d1d3d927bfd h1:QULUJSgHc4rSlTjb2qYT6FIgwDWFCqEpnYqc/ltsrkk=
-github.com/sysadminsmedia/homebox/backend v0.0.0-20251212183312-2d1d3d927bfd/go.mod h1:jB+tPmHtPDM1VnAjah0gvcRfP/s7c+rtQwpA8cvZD/U=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

.scaffold/model/scaffold.yaml

@@ -1,33 +0,0 @@
----
-# yaml-language-server: $schema=https://hay-kot.github.io/scaffold/schema.json
-messages:
-  pre: |
-    # Ent Model Generation
-
-    With Boilerplate!
-  post: |
-    Complete!
-
-questions:
-  - name: "model"
-    prompt:
-      message: "What is the name of the model? (PascalCase)"
-    required: true
-
-  - name: "by_group"
-    prompt:
-      confirm: "Include a Group Edge? (group_id -> id)"
-    required: true
-
-rewrites:
-  - from: 'templates/model.go'
-    to: 'backend/internal/data/ent/schema/{{ lower .Scaffold.model }}.go'
-
-inject:
-  - name: "Insert Groups Edge"
-    path: 'backend/internal/data/ent/schema/group.go'
-    at: // $scaffold_edge
-    template: |
-      {{- if .Scaffold.by_group -}}
-      owned("{{ lower .Scaffold.model }}s", {{ .Scaffold.model }}.Type),
-      {{- end -}}

.scaffold/model/templates/model.go

@@ -1,40 +0,0 @@
-package schema
-
-import (
-	"entgo.io/ent"
-
-	"github.com/sysadminsmedia/homebox/backend/internal/data/ent/schema/mixins"
-)
-
-type {{ .Scaffold.model }} struct {
-	ent.Schema
-}
-
-func ({{ .Scaffold.model }}) Mixin() []ent.Mixin {
-	return []ent.Mixin{
-		mixins.BaseMixin{},
-		{{- if .Scaffold.by_group }}
-		GroupMixin{ref: "{{ snakecase .Scaffold.model  }}s"},
-		{{- end }}
-	}
-}
-
-// Fields of the {{ .Scaffold.model }}.
-func ({{ .Scaffold.model }}) Fields() []ent.Field {
-	return []ent.Field{
-		// field.String("name").
-	}
-}
-
-// Edges of the {{ .Scaffold.model }}.
-func ({{ .Scaffold.model }}) Edges() []ent.Edge {
-	return []ent.Edge{
-		// edge.From("group", Group.Type).
-	}
-}
-
-func ({{ .Scaffold.model }}) Indexes() []ent.Index {
-	return []ent.Index{
-		// index.Fields("token"),
-	}
-}

.vscode/launch.json

@@ -1,47 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "compounds": [
-        {
-            "name": "Full Stack",
-            "configurations": ["Launch Backend", "Launch Frontend"],
-            "stopAll": true
-        }
-    ],
-    "configurations": [
-        {
-            "name": "Launch Backend",
-            "type": "go",
-            "request": "launch",
-            "mode": "debug",
-            "program": "${workspaceFolder}/backend/app/api/",
-            "args": [],
-            "env": {
-                "HBOX_DEMO": "true",
-                "HBOX_LOG_LEVEL": "debug",
-                "HBOX_DEBUG_ENABLED": "true"
-            },
-            "console": "integratedTerminal",
-        },
-        {
-            "name": "Launch Frontend",
-            "type": "node",
-            "request": "launch",
-            "runtimeExecutable": "pnpm",
-            "runtimeArgs": [
-                "run",
-                "dev"
-            ],
-            "cwd": "${workspaceFolder}/frontend",
-            "serverReadyAction": {
-                "action": "debugWithChrome",
-                "pattern": "Local: +http://localhost:([0-9]+)",
-                "uriFormat": "http://localhost:%s",
-                "webRoot": "${workspaceFolder}/frontend"
-            },
-            "console": "integratedTerminal",
-        }
-    ]
-}

.vscode/settings.json

@@ -1,39 +1,17 @@
 {
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
   "yaml.schemas": {
     "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yml"
   },
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
-    "package.json": "package-lock.json, yarn.lock, eslint.config.mjs, tsconfig.json, .prettierrc, .editorconfig, pnpm-lock.yaml, postcss.config.js, tailwind.config.js",
+    "package.json": "package-lock.json, yarn.lock, .eslintrc.js, tsconfig.json, .prettierrc, .editorconfig, pnpm-lock.yaml, postcss.config.js, tailwind.config.js",
     "docker-compose.yml": "Dockerfile, .dockerignore, docker-compose.dev.yml, docker-compose.yml",
     "README.md": "LICENSE, SECURITY.md"
   },
   "cSpell.words": [
-    "debughandlers",
-    "Homebox"
-  ],
-  // use ESLint to format code on save
-  "editor.formatOnSave": false,
-  "editor.defaultFormatter": "dbaeumer.vscode-eslint",
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-  },
-  "[typescript]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
-  },
-  "eslint.format.enable": true,
-  "eslint.validate": ["javascript", "typescript", "vue"],
-  "eslint.useFlatConfig": true,
-  "css.validate": false,
-	"tailwindCSS.includeLanguages": {
-		"vue": "html",
-		"vue-html": "html"
-	},
-	"editor.quickSuggestions": {
-		"strings": true
-	},
-  "tailwindCSS.experimental.configFile": "./frontend/tailwind.config.js",
-  "[go]": {
-    "editor.defaultFormatter": "golang.go"
-  },
+    "debughandlers"
+  ]
 }

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[support@sysadminsmedia.com](mailto:support@sysadminsmedia.com).
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-[Contributor Covenant Code of Conduct](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html).
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-[FAQ](https://www.contributor-covenant.org/faq). Translations are available at
-[Translations](https://www.contributor-covenant.org/translations).

CONTRIBUTING.md

@@ -1,16 +1,16 @@
 # Contributing
 
-## We Develop with GitHub
+## We Develop with Github
 
-We use GitHub to host code, to track issues and feature requests, as well as accept pull requests.
+We use github to host code, to track issues and feature requests, as well as accept pull requests.
 
 ## Branch Flow
 
-We use the `main` branch as the development branch. All PRs should be made to the `main` branch from a feature branch. To create a pull request, you can use the following steps:
+We use the `main` branch as the development branch. All PRs should be made to the `main` branch from a feature branch. To create a pull request you can use the following steps:
 
 1. Fork the repository and create a new branch from `main`.
 2. If you've added code that should be tested, add tests.
-3. If you've changed APIs, update the documentation.
+3. If you've changed API's, update the documentation.
 4. Ensure that the test suite and linters pass
 5. Issue your pull request
 
@@ -18,7 +18,7 @@ We use the `main` branch as the development branch. All PRs should be made to th
 
 ### Prerequisites
 
-There is a devcontainer available for this project. If you are using VSCode, you can use the devcontainer to get started. If you are not using VSCode, you need to ensure that you have the following tools installed:
+There is a devcontainer available for this project. If you are using VSCode, you can use the devcontainer to get started. If you are not using VSCode, you can need to ensure that you have the following tools installed:
 
 - [Go 1.19+](https://golang.org/doc/install)
 - [Swaggo](https://github.com/swaggo/swag)
@@ -31,25 +31,21 @@ If you're using `taskfile` you can run `task --list-all` for a list of all comma
 
 ### Setup
 
-If you're using the taskfile, you can use the `task setup` command to run the required setup commands. Otherwise, you can review the commands required in the `Taskfile.yml` file.
+If you're using the taskfile you can use the `task setup` command to run the required setup commands. Otherwise you can review the commands required in the `Taskfile.yml` file.
+
+Note that when installing dependencies with pnpm you must use the `--shamefully-hoist` flag. If you don't use this flag you will get an error when running the the frontend server.
 
 ### API Development Notes
 
 start command `task go:run`
 
 1. API Server does not auto reload. You'll need to restart the server after making changes.
-2. Unit tests should be written in Go, however, end-to-end or user story tests should be written in TypeScript using the client library in the frontend directory.
+2. Unit tests should be written in Go, however end-to-end or user story tests should be written in TypeScript using the client library in the frontend directory.
 
 ### Frontend Development Notes
 
-start command `task ui:dev`
+start command `task: ui:dev`
 
-1. The frontend is a Vue 3 app with Nuxt.js that uses Tailwind and Shadcn-vue for styling.
-2. We're using Vitest for our automated testing. You can run these with `task ui:watch`.
-3. Tests require the API server to be running, and in some cases the first run will fail due to a race condition. If this happens, just run the tests again and they should pass.
-
-## Publishing Release
-
-Create a new tag in GitHub with the version number vX.X.X. This will trigger a new release to be created.
-
-Test -> Goreleaser -> Publish Release -> Trigger Docker Builds -> Deploy Docs + Fly.io Demo
+1. The frontend is a Vue 3 app with Nuxt.js that uses Tailwind and DaisyUI for styling.
+2. We're using Vitest for our automated testing. you can run these with `task ui:watch`.
+3. Tests require the API server to be running and in some cases the first run will fail due to a race condition. If this happens just run the tests again and they should pass.

Dockerfile

@@ -1,101 +1,49 @@
-# Node dependencies stage
-FROM public.ecr.aws/docker/library/node:22-alpine AS frontend-dependencies
-WORKDIR /app
 
-# Install pnpm globally (caching layer)
+# Build Nuxt
+FROM node:17-alpine as frontend-builder
+WORKDIR  /app
 RUN npm install -g pnpm
-
-# Copy package.json and lockfile to leverage caching
 COPY frontend/package.json frontend/pnpm-lock.yaml ./
-RUN pnpm install --frozen-lockfile
-
-# Build Nuxt (frontend) stage
-FROM public.ecr.aws/docker/library/node:22-alpine AS frontend-builder
-WORKDIR /app
-
-# Install pnpm globally again (it can reuse the cache if not changed)
-RUN npm install -g pnpm
-
-# Copy over source files and node_modules from dependencies stage
-COPY frontend . 
-COPY --from=frontend-dependencies /app/node_modules ./node_modules
+RUN pnpm install --frozen-lockfile --shamefully-hoist
+COPY frontend .
 RUN pnpm build
 
-# Go dependencies stage
-FROM public.ecr.aws/docker/library/golang:alpine AS builder-dependencies
-WORKDIR /go/src/app
-
-# Copy go.mod and go.sum for better caching
-COPY ./backend/go.mod ./backend/go.sum ./
-RUN go mod download
-
-# Build API stage
-FROM public.ecr.aws/docker/library/golang:alpine AS builder
-ARG TARGETOS
-ARG TARGETARCH
+# Build API
+FROM golang:alpine AS builder
 ARG BUILD_TIME
 ARG COMMIT
 ARG VERSION
-
-# Install necessary build tools
 RUN apk update && \
     apk upgrade && \
-    apk add --no-cache git build-base gcc g++ && \
-    if [ "$TARGETARCH" != "arm" ] || [ "$TARGETARCH" != "riscv64" ]; then apk --no-cache add libwebp libavif libheif libjxl; fi
+    apk add --update git build-base gcc g++
 
 WORKDIR /go/src/app
-
-# Copy Go modules (from dependencies stage) and source code
-COPY --from=builder-dependencies /go/pkg/mod /go/pkg/mod
 COPY ./backend .
-
-# Clear old public files and copy new ones from frontend build
+RUN go get -d -v ./...
 RUN rm -rf ./app/api/public
 COPY --from=frontend-builder /app/.output/public ./app/api/static/public
+RUN CGO_ENABLED=1 GOOS=linux go build \
+    -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION"  \
+    -o /go/bin/api \
+    -v ./app/api/*.go
 
-# Use cache for Go build artifacts
-RUN --mount=type=cache,target=/root/.cache/go-build \
-    if [ "$TARGETARCH" = "arm" ] || [ "$TARGETARCH" = "riscv64" ];  \
-    then echo "nodynamic" $TARGETOS $TARGETARCH; CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
-        -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION" \
-        -tags nodynamic -o /go/bin/api -v ./app/api/*.go; \
-    else \
-         echo $TARGETOS $TARGETARCH; CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
-        -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION" \
-        -o /go/bin/api -v ./app/api/*.go; \
-    fi
+# Production Stage
+FROM alpine:latest
 
-# Production stage
-FROM public.ecr.aws/docker/library/alpine:latest
 ENV HBOX_MODE=production
-ENV HBOX_STORAGE_CONN_STRING=file:///?no_tmp_dir=true
-ENV HBOX_STORAGE_PREFIX_PATH=data
-ENV HBOX_DATABASE_SQLITE_PATH=/data/homebox.db?_pragma=busy_timeout=2000&_pragma=journal_mode=WAL&_fk=1&_time_format=sqlite
+ENV HBOX_STORAGE_DATA=/data/
+ENV HBOX_STORAGE_SQLITE_URL=/data/homebox.db?_fk=1
 
-# Install necessary runtime dependencies
-RUN apk --no-cache add ca-certificates wget && \
-    if [ "$TARGETARCH" != "arm" ] || [ "$TARGETARCH" != "riscv64" ]; then apk --no-cache add libwebp libavif libheif libjxl; fi
-
-# Create application directory and copy over built Go binary
+RUN apk --no-cache add ca-certificates
 RUN mkdir /app
 COPY --from=builder /go/bin/api /app
+
 RUN chmod +x /app/api
 
-# Labels and configuration for the final image
 LABEL Name=homebox Version=0.0.1
-LABEL org.opencontainers.image.source="https://github.com/sysadminsmedia/homebox"
-
-# Expose necessary ports for Homebox
 EXPOSE 7745
 WORKDIR /app
-
-# Healthcheck configuration
-HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
-    CMD [ "wget", "--no-verbose", "--tries=1", "-O", "-", "http://localhost:7745/api/v1/status" ]
-
-# Persist volume
 VOLUME [ "/data" ]
 
-# Entrypoint and CMD
 ENTRYPOINT [ "/app/api" ]
-CMD [ "/data/config.yml" ]
+CMD [ "/data/config.yml" ]

Dockerfile.hardened

@@ -1,136 +0,0 @@
-# ---------------------------------------
-# Node dependencies stage
-# ---------------------------------------
-FROM public.ecr.aws/docker/library/node:22-alpine AS frontend-dependencies
-WORKDIR /app
-
-# Install pnpm globally (caching layer)
-RUN npm install -g pnpm
-
-# Copy package.json and lockfile to leverage caching
-COPY frontend/package.json frontend/pnpm-lock.yaml ./
-RUN pnpm install --frozen-lockfile
-
-# ---------------------------------------
-# Build Nuxt (frontend) stage
-# ---------------------------------------
-FROM public.ecr.aws/docker/library/node:22-alpine AS frontend-builder
-WORKDIR /app
-
-# Install pnpm globally again (it can reuse the cache if not changed)
-RUN npm install -g pnpm
-
-# Copy over source files and node_modules from dependencies stage
-COPY frontend .
-COPY --from=frontend-dependencies /app/node_modules ./node_modules
-RUN pnpm build
-
-# ---------------------------------------
-# Go dependencies stage
-# ---------------------------------------
-FROM public.ecr.aws/docker/library/golang:alpine AS builder-dependencies
-WORKDIR /go/src/app
-
-# Copy go.mod and go.sum for better caching
-COPY ./backend/go.mod ./backend/go.sum ./
-RUN go mod download
-
-# ---------------------------------------
-# Build API + healthcheck stage
-# ---------------------------------------
-FROM public.ecr.aws/docker/library/golang:alpine AS builder
-ARG TARGETOS
-ARG TARGETARCH
-ARG BUILD_TIME
-ARG COMMIT
-ARG VERSION
-
-# Install necessary build tools
-RUN apk update && \
-    apk upgrade && \
-    apk add --no-cache git build-base gcc g++
-
-WORKDIR /go/src/app
-
-# Copy Go modules (from dependencies stage) and source code
-COPY --from=builder-dependencies /go/pkg/mod /go/pkg/mod
-COPY ./backend .
-
-# Clear old public files and copy new ones from frontend build
-RUN rm -rf ./app/api/public
-COPY --from=frontend-builder /app/.output/public ./app/api/static/public
-
-# Use cache for Go build artifacts to build Homebox API
-RUN --mount=type=cache,target=/root/.cache/go-build \
-     CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
-        -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION" \
-        -tags nodynamic -o /go/bin/api -v ./app/api/*.go
-
-RUN chmod +x /go/bin/api
-RUN mkdir /app
-RUN mkdir /data
-
-# ---------- Build static healthcheck helper ----------
-# A small Go program that GETs the status URL and exits 0 on 2xx.
-RUN cat > /tmp/healthcheck.go <<'EOF'
-package main
-import (
-  "fmt"
-  "net/http"
-  "os"
-  "time"
-)
-func main() {
-  url := "http://127.0.0.1:7745/api/v1/status"
-  if len(os.Args) > 1 { url = os.Args[1] }
-  c := &http.Client{ Timeout: 3 * time.Second }
-  resp, err := c.Get(url)
-  if err != nil { fmt.Fprintln(os.Stderr, err); os.Exit(1) }
-  resp.Body.Close()
-  if resp.StatusCode/100 != 2 {
-    fmt.Fprintln(os.Stderr, "unexpected status:", resp.StatusCode)
-    os.Exit(1)
-  }
-}
-EOF
-
-RUN --mount=type=cache,target=/root/.cache/go-build \
-    CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \
-    go build -ldflags "-s -w" -o /go/bin/hc /tmp/healthcheck.go
-
-# ---------------------------------------
-# Production stage
-# ---------------------------------------
-FROM gcr.io/distroless/static:nonroot
-ENV HBOX_MODE=production
-ENV HBOX_STORAGE_CONN_STRING=file:///?no_tmp_dir=true
-ENV HBOX_STORAGE_PREFIX_PATH=data
-ENV HBOX_DATABASE_SQLITE_PATH=/data/homebox.db?_pragma=busy_timeout=2000&_pragma=journal_mode=WAL&_fk=1&_time_format=sqlite
-
-# Create application directory and copy over built Go binary and assets
-COPY --from=builder --chown=65532:65532 /app /app
-COPY --from=builder --chown=65532:65532 --chmod=755 /go/bin/api /app
-COPY --from=builder --chown=65532:65532 /data /data
-
-# Copy the healthcheck helper
-COPY --from=builder --chown=65532:65532 --chmod=755 /go/bin/hc /app/healthcheck
-
-# Labels and configuration for the final image
-LABEL Name=homebox Version=0.0.1
-LABEL org.opencontainers.image.source="https://github.com/sysadminsmedia/homebox"
-
-# Expose necessary ports for Homebox
-EXPOSE 7745
-WORKDIR /app
-
-# Persist volume for data
-VOLUME [ "/data" ]
-
-# Entrypoint and CMD
-USER 65532
-ENTRYPOINT [ "/app/api" ]
-CMD [ "/data/config.yml" ]
-
-# JSON exec-form healthcheck (no shell, no wget)
-HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
-  CMD ["/app/healthcheck", "http://127.0.0.1:7745/api/v1/status"]

Dockerfile.rootless

@@ -1,108 +0,0 @@
-# Node dependencies stage
-FROM public.ecr.aws/docker/library/node:22-alpine AS frontend-dependencies
-WORKDIR /app
-
-# Install pnpm globally (caching layer)
-RUN npm install -g pnpm
-
-# Copy package.json and lockfile to leverage caching
-COPY frontend/package.json frontend/pnpm-lock.yaml ./
-RUN pnpm install --frozen-lockfile
-
-# Build Nuxt (frontend) stage
-FROM public.ecr.aws/docker/library/node:22-alpine AS frontend-builder
-WORKDIR /app
-
-# Install pnpm globally again (it can reuse the cache if not changed)
-RUN npm install -g pnpm
-
-# Copy over source files and node_modules from dependencies stage
-COPY frontend .
-COPY --from=frontend-dependencies /app/node_modules ./node_modules
-RUN pnpm build
-
-# Go dependencies stage
-FROM public.ecr.aws/docker/library/golang:alpine AS builder-dependencies
-WORKDIR /go/src/app
-
-# Copy go.mod and go.sum for better caching
-COPY ./backend/go.mod ./backend/go.sum ./
-RUN go mod download
-
-# Build API stage
-FROM public.ecr.aws/docker/library/golang:alpine AS builder
-ARG TARGETOS
-ARG TARGETARCH
-ARG BUILD_TIME
-ARG COMMIT
-ARG VERSION
-
-# Install necessary build tools
-RUN apk update && \
-    apk upgrade && \
-    apk add --no-cache git build-base gcc g++ && \
-    if [ "$TARGETARCH" != "arm" ] || [ "$TARGETARCH" != "riscv64" ]; then apk --no-cache add libwebp libavif libheif libjxl; fi
-
-WORKDIR /go/src/app
-
-# Copy Go modules (from dependencies stage) and source code
-COPY --from=builder-dependencies /go/pkg/mod /go/pkg/mod
-COPY ./backend .
-
-# Clear old public files and copy new ones from frontend build
-RUN rm -rf ./app/api/public
-COPY --from=frontend-builder /app/.output/public ./app/api/static/public
-
-# Use cache for Go build artifacts
-RUN --mount=type=cache,target=/root/.cache/go-build \
-    if [ "$TARGETARCH" = "arm" ] || [ "$TARGETARCH" = "riscv64" ];  \
-    then echo "nodynamic" $TARGETOS $TARGETARCH; CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
-        -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION" \
-        -tags nodynamic -o /go/bin/api -v ./app/api/*.go; \
-    else \
-         echo $TARGETOS $TARGETARCH; CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
-        -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION" \
-        -o /go/bin/api -v ./app/api/*.go; \
-    fi
-
-RUN mkdir /data
-
-# Production stage
-FROM public.ecr.aws/docker/library/alpine:latest
-ENV HBOX_MODE=production
-ENV HBOX_STORAGE_CONN_STRING=file:///?no_tmp_dir=true
-ENV HBOX_STORAGE_PREFIX_PATH=data
-ENV HBOX_DATABASE_SQLITE_PATH=/data/homebox.db?_pragma=busy_timeout=2000&_pragma=journal_mode=WAL&_fk=1&_time_format=sqlite
-
-# Install necessary runtime dependencies
-RUN apk --no-cache add ca-certificates wget && \
-    if [ "$TARGETARCH" != "arm" ] || [ "$TARGETARCH" != "riscv64" ]; then apk --no-cache add libwebp libavif libheif libjxl; fi
-
-# Create a nonroot user with UID/GID 65532
-RUN addgroup -g 65532 nonroot && adduser -u 65532 -G nonroot -S nonroot
-
-# Create application directory and copy over built Go binary
-RUN mkdir /app
-COPY --from=builder --chown=nonroot /go/bin/api /app
-COPY --from=builder --chown=nonroot /data /data
-RUN chmod +x /app/api
-
-# Labels and configuration for the final image
-LABEL Name=homebox Version=0.0.1
-LABEL org.opencontainers.image.source="https://github.com/sysadminsmedia/homebox"
-
-# Expose necessary ports for Homebox
-EXPOSE 7745
-WORKDIR /app
-
-# Healthcheck configuration
-HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
-    CMD [ "wget", "--no-verbose", "--tries=1", "-O", "-", "http://localhost:7745/api/v1/status" ]
-
-# Persist volume for data
-VOLUME [ "/data" ]
-
-# Entrypoint and CMD
-USER nonroot
-ENTRYPOINT [ "/app/api" ]
-CMD [ "/data/config.yml" ]

README.md

@@ -1,94 +1,27 @@
 <div align="center">
-  <img src="/docs/public/lilbox.svg" height="200"/>
+  <img src="/docs/docs/assets/img/lilbox.svg" height="200"/>
 </div>
 
-<h1 align="center" style="margin-top: -10px;"> HomeBox </h1>
-<p align="center" style="width: 100%;">
-   <a href="https://homebox.software/en/">Docs</a>
+<h1 align="center" style="margin-top: -10px"> HomeBox </h1>
+<p align="center" style="width: 100;">
+   <a href="https://hay-kot.github.io/homebox/">Docs</a>
    |
-   <a href="https://demo.homebox.software">Demo</a>
+   <a href="https://homebox.fly.dev">Demo</a>
    |
-   <a href="https://discord.gg/aY4DCkpNA9">Discord</a>
+   <a href="https://discord.gg/tuncmNrE4z">Discord</a>
 </p>
-<p align="center" style="width: 100%;">
-    <img src="https://img.shields.io/github/check-runs/sysadminsmedia/homebox/main" alt="Github Checks"/>
-    <img src="https://img.shields.io/github/license/sysadminsmedia/homebox"/>
-    <img src="https://img.shields.io/github/v/release/sysadminsmedia/homebox?sort=semver&display_name=release"/>
-    <img src="https://img.shields.io/weblate/progress/homebox?server=https%3A%2F%2Ftranslate.sysadminsmedia.com"/>
-</p>
-<p align="center" style="width: 100%;">
-    <img src="https://img.shields.io/reddit/subreddit-subscribers/homebox"/>
-    <img src="https://img.shields.io/mastodon/follow/110749314839831923?domain=infosec.exchange"/>
-    <img src="https://img.shields.io/lemmy/homebox%40lemmy.world?label=lemmy"/>
-</p>
-
-## What is HomeBox
-
-HomeBox is the inventory and organization system built for the Home User! With a focus on simplicity and ease of use, Homebox is the perfect solution for your home inventory, organization, and management needs. While developing this project, We've tried to keep the following principles in mind:
-
-- 🧘 _Simple but Expandable_ - Homebox is designed to be simple and easy to use. No complicated setup or configuration required. But expandable to whatever level of infrastructure you want to put into it.
-- 🚀 _Blazingly Fast_ - Homebox is written in Go, which makes it extremely fast and requires minimal resources to deploy. In general, idle memory usage is less than 50MB for the whole container.
-- 📦 _Portable_ - Homebox is designed to be portable and run on anywhere. We use SQLite and an embedded Web UI to make it easy to deploy, use, and backup.
-
-### Key Features
-- 📇 Rich Organization - Organize your items into categories, locations, and tags. You can also create custom fields to store additional information about your items.
-- 🔍 Powerful Search - Quickly find items in your inventory using the powerful search feature.
-- 📸 Image Upload - Upload images of your items to make it easy to identify them.
-- 📄 Document and Warranty Tracking - Keep track of important documents and warranties for your items.
-- 💰 Purchase & Maintenance Tracking - Track purchase dates, prices, and maintenance schedules for your items.
-- 📱 Responsive Design - Homebox is designed to work on any device, including desktops, tablets, and smartphones.
-
-## Screenshots
-![Login Screen](.github/screenshots/1.png)
-![Dashboard](.github/screenshots/2.png)
-![Item View](.github/screenshots/3.png)
-![Create Item](.github/screenshots/9.png)
-![Search](.github/screenshots/8.png)
-
-You can also try the demo instances of Homebox:
-- [Demo](https://demo.homebox.software)
-- [Nightly](https://nightly.homebox.software)
 
 ## Quick Start
 
-[Configuration & Docker Compose](https://homebox.software/en/quick-start.html)
+[Configuration & Docker Compose](https://hay-kot.github.io/homebox/quick-start)
 
 ```bash
-# If using the rootless or hardened image, ensure data 
-# folder has correct permissions
-mkdir -p /path/to/data/folder
-chown 65532:65532 -R /path/to/data/folder
-docker run -d \
-  --name homebox \
-  --restart unless-stopped \
-  --publish 3100:7745 \
-  --env TZ=Europe/Bucharest \
-  --volume /path/to/data/folder/:/data \
-  ghcr.io/sysadminsmedia/homebox:latest
-# ghcr.io/sysadminsmedia/homebox:latest-rootless
-# ghcr.io/sysadminsmedia/homebox:latest-hardened
+docker run --name=homebox \
+    --restart=always \
+    --publish=3100:7745 \
+    ghcr.io/hay-kot/homebox:latest
 ```
 
-<!-- CONTRIBUTING -->
-
-## Contributing
-
-Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
-
-To get started with code based contributions, please see our [contributing guide](https://homebox.software/en/contribute/get-started.html).
-
-If you are not a coder and can't help translate, you can still contribute financially. Financial contributions help us maintain the project and keep demos running.
-
-## Help us Translate
-We want to make sure that Homebox is available in as many languages as possible. If you are interested in helping us translate Homebox, please help us via our [Weblate instance](https://translate.sysadminsmedia.com/projects/homebox/).
-
-[![Translation status](https://translate.sysadminsmedia.com/widget/homebox/multi-auto.svg)](https://translate.sysadminsmedia.com/engage/homebox/)
-
 ## Credits
-- Original project by [@hay-kot](https://github.com/hay-kot)
-- Logo by [@lakotelman](https://github.com/lakotelman)
 
-### Contributors
-<a href="https://github.com/sysadminsmedia/homebox/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=sysadminsmedia/homebox" />
-</a>
+- Logo by [@lakotelman](https://github.com/lakotelman)

SECURITY.md

@@ -6,6 +6,4 @@ Since this software is still considered beta/WIP support is always only given fo
 
 ## Reporting a Vulnerability
 
-Please open a normal public issue for minor security issues or general security inquires.
-
-For major or critical security issues, please open a private github security issue.
+Please open a normal public issue if you have any security related concerns.

Taskfile.yml

@@ -1,135 +1,71 @@
 version: "3"
 
 env:
-  HBOX_LOG_LEVEL: debug
-  HBOX_DATABASE_DRIVER: sqlite3
-  HBOX_DATABASE_SQLITE_PATH: .data/homebox.db?_pragma=busy_timeout=1000&_pragma=journal_mode=WAL&_fk=1&_time_format=sqlite
-  HBOX_OPTIONS_ALLOW_REGISTRATION: true
+  HBOX_STORAGE_SQLITE_URL: .data/homebox.db?_fk=1
   UNSAFE_DISABLE_PASSWORD_PROJECTION: "yes_i_am_sure"
 tasks:
   setup:
     desc: Install development dependencies
     cmds:
       - go install github.com/swaggo/swag/cmd/swag@latest
-      - go install github.com/pressly/goose/v3/cmd/goose@v3.8.0
       - cd backend && go mod tidy
-      - cd frontend && pnpm install
+      - cd frontend && pnpm install --shamefully-hoist
 
-  swag:
-    desc: Generate swagger docs
-    dir: backend/app/api/static/
-    vars:
-      API: "../"
-      INTERNAL: "../../../internal"
-      PKGS: "../../../pkgs"
-    cmds:
-      - swag init --dir={{ .API }},{{ .INTERNAL }}/core/services,{{ .INTERNAL }}/data/repo --parseDependency
-      - npx -y -p swagger2openapi swagger2openapi --outfile ./docs/openapi-3.json ./docs/swagger.json
-      - npx -y -p swagger2openapi swagger2openapi --yaml --outfile ./docs/openapi-3.yaml ./docs/swagger.json
-      - cp -r ./docs/swagger.json ../../../../docs/en/api/swagger-2.0.json
-      - cp -r ./docs/swagger.yaml ../../../../docs/en/api/swagger-2.0.yaml
-      - cp -r ./docs/openapi-3.json ../../../../docs/en/api/openapi-3.0.json
-      - cp -r ./docs/openapi-3.yaml ../../../../docs/en/api/openapi-3.0.yaml
-    sources:
-      - "./backend/app/api/**/*"
-      - "./backend/internal/data/**"
-      - "./backend/internal/core/services/**/*"
-      - "./backend/app/tools/typegen/main.go"
-  typescript-types:
-    desc: Generates typescript types from swagger definition
+  generate:
+    desc: |
+      Generates collateral files from the backend project
+      including swagger docs and typescripts type for the frontend
+    deps:
+      - db:generate
     cmds:
+      - cd backend/app/api/static && swag fmt --dir=../
+      - cd backend/app/api/static && swag init --dir=../,../../../internal,../../../pkgs
       - |
-        pnpm dlx swagger-typescript-api generate \
+        npx swagger-typescript-api \
           --no-client \
           --modular \
           --path ./backend/app/api/static/docs/swagger.json \
           --output ./frontend/lib/api/types
-      - go run ./backend/app/tools/typegen/main.go ./frontend/lib/api/types/data-contracts.ts
+      - python3 ./scripts/process-types.py ./frontend/lib/api/types/data-contracts.ts
     sources:
-      - ./backend/app/tools/typegen/main.go
-      - ./backend/app/api/static/docs/swagger.json
-
-  generate:
-    deps:
-      - db:generate
-    cmds:
-      - task: swag
-      - task: typescript-types
-      - cp ./backend/app/api/static/docs/swagger.json docs/en/api/openapi-2.0.json
-      - cp ./backend/app/api/static/docs/swagger.yaml docs/en/api/openapi-2.0.yaml
+      - "./backend/app/api/**/*"
+      - "./backend/internal/data/**"
+      - "./backend/internal/services/**/*"
+      - "./scripts/process-types.py"
+    generates:
+      - "./frontend/lib/api/types/data-contracts.ts"
+      - "./backend/internal/data/ent/schema"
+      - "./backend/app/api/static/docs/swagger.json"
+      - "./backend/app/api/static/docs/swagger.yaml"
 
   go:run:
-    env:
-      HBOX_DEMO: true
     desc: Starts the backend api server (depends on generate task)
-    dir: backend
     deps:
       - generate
     cmds:
-      - go run ./app/api/ {{ .CLI_ARGS }}
+      - cd backend && go run ./app/api/ {{ .CLI_ARGS }}
     silent: false
 
-  go:run:postgresql:
-    env:
-      HBOX_DEMO: true
-      HBOX_DATABASE_DRIVER: postgres
-      HBOX_DATABASE_USERNAME: homebox
-      HBOX_DATABASE_PASSWORD: homebox
-      HBOX_DATABASE_DATABASE: homebox
-      HBOX_DATABASE_HOST: localhost
-      HBOX_DATABASE_PORT: 5432
-      HBOX_DATABASE_SSL_MODE: disable
-    desc: Starts the backend api server with postgresql (depends on generate task)
-    dir: backend
-    deps:
-      - generate
-    cmds:
-      - go run ./app/api/ {{ .CLI_ARGS }}
-    silent: false
-
-  go:ci:
-    env:
-      HBOX_DEMO: true
-    desc: Runs all go test and lint related tasks
-    dir: backend
-    cmds:
-      - go run ./app/api/ {{ .CLI_ARGS }} &
-    silent: true
-
-  go:ci:with-frontend:
-      desc: Run backend with frontend in CI mode
-      dir: frontend
-      cmds:
-        - pnpm install
-        - pnpm run build
-        - cp -r ./.output/public ../backend/app/api/static/
-        - task: go:ci
-      silent: true
-
   go:test:
     desc: Runs all go tests using gotestsum - supports passing gotestsum args
-    dir: backend
     cmds:
-      - go test {{ .CLI_ARGS }} ./...
+      - cd backend && gotestsum {{ .CLI_ARGS }} ./...
 
   go:coverage:
     desc: Runs all go tests with -race flag and generates a coverage report
-    dir: backend
     cmds:
-      - go test -race -coverprofile=coverage.out -covermode=atomic ./app/... ./internal/... ./pkgs/... -v -cover
+      - cd backend && go test -race -coverprofile=coverage.out -covermode=atomic ./app/... ./internal/... ./pkgs/... -v -cover
     silent: true
 
   go:tidy:
     desc: Runs go mod tidy on the backend
-    dir: backend
     cmds:
-      - go mod tidy
+      - cd backend && go mod tidy
 
   go:lint:
     desc: Runs golangci-lint
-    dir: backend
     cmds:
-      - golangci-lint run ./...
+      - cd backend && golangci-lint run ./...
 
   go:all:
     desc: Runs all go test and lint related tasks
@@ -140,91 +76,42 @@ tasks:
 
   go:build:
     desc: Builds the backend binary
-    dir: backend
     cmds:
-      - go build -o ../build/backend ./app/api
+      - cd backend && go build -o ../build/backend ./app/api
 
   db:generate:
     desc: Run Entgo.io Code Generation
-    dir: backend/internal/
     cmds:
       - |
-        go generate ./...
+        cd backend/internal/ && go generate ./... \
+        --template=./data/ent/schema/templates/has_id.tmpl
     sources:
       - "./backend/internal/data/ent/schema/**/*"
+    generates:
+      - "./backend/internal/ent/"
+
+  db:migration:
+    desc: Runs the database diff engine to generate a SQL migration files
+    deps:
+      - db:generate
+    cmds:
+      - cd backend && go run app/tools/migrations/main.go {{ .CLI_ARGS }}
 
   ui:watch:
     desc: Starts the vitest test runner in watch mode
-    dir: frontend
     cmds:
-      - pnpm run test:watch
+      - cd frontend && pnpm run test:watch
 
   ui:dev:
     desc: Run frontend development server
-    dir: frontend
     cmds:
-      - pnpm dev --no-fork
-
-  ui:ci:
-    desc: Run frontend build in CI mode
-    dir: frontend
-    cmds:
-      - pnpm dev &
-    silent: true
-
-  ui:fix:
-    desc: Runs prettier and eslint on the frontend
-    dir: frontend
-    cmds:
-      - pnpm run lint:fix
-
-  ui:check:
-    desc: Runs type checking
-    dir: frontend
-    cmds:
-      - pnpm run typecheck
+      - cd frontend && pnpm dev
 
   test:ci:
     desc: Runs end-to-end test on a live server (only for use in CI)
     cmds:
       - cd backend && go build ./app/api
       - backend/api &
-      - sleep 15
+      - sleep 5
       - cd frontend && pnpm run test:ci
     silent: true
-
-  test:ci:postgresql:
-    env:
-      HBOX_DATABASE_DRIVER: postgres
-      HBOX_DATABASE_USERNAME: homebox
-      HBOX_DATABASE_PASSWORD: homebox
-      HBOX_DATABASE_DATABASE: homebox
-      HBOX_DATABASE_HOST: 127.0.0.1
-      HBOX_DATABASE_PORT: 5432
-      HBOX_DATABASE_SSL_MODE: disable
-    desc: Runs end-to-end test on a live server with postgresql (only for use in CI)
-    cmds:
-      - cd backend && go build ./app/api
-      - backend/api &
-      - sleep 15
-      - cd frontend && pnpm run test:ci
-    silent: true
-
-  test:e2e:
-    desc: Runs end-to-end test on a live server
-    dir: frontend
-    cmds:
-      - task: go:ci:with-frontend
-      - pnpm exec playwright install-deps
-      - pnpm exec playwright install
-      - sleep 30
-      - TEST_SHUTDOWN_API_SERVER=true E2E_BASE_URL=http://localhost:7745 pnpm exec playwright test -c ./test/playwright.config.ts {{ .CLI_ARGS }}
-
-  pr:
-    desc: Runs all tasks required for a PR
-    cmds:
-      - task: generate
-      - task: go:all
-      - task: ui:check
-      - task: ui:fix
-      - task: test:ci

backend/.gitignore

@@ -1,2 +0,0 @@
-
-dist/

backend/.golangci.yml

@@ -1,81 +0,0 @@
-version: "2"
-linters:
-  default: none
-  enable:
-    - asciicheck
-    - bodyclose
-    - copyloopvar
-    - depguard
-    - dogsled
-    - errcheck
-    - errorlint
-    - exhaustive
-    - gochecknoinits
-    - goconst
-    - gocritic
-    - gocyclo
-    - goprintffuncname
-    - govet
-    - ineffassign
-    - misspell
-    - nakedret
-    - revive
-    - sqlclosecheck
-    - staticcheck
-    - tagalign
-    - testifylint
-    - unconvert
-    - unused
-    - whitespace
-    - zerologlint
-  settings:
-    depguard:
-      rules:
-        main:
-          deny:
-            - pkg: io/util
-              desc: |
-                Deprecated: As of Go 1.16, the same functionality is now provided by
-                package io or package os, and those implementations should be
-                preferred in new code. See the specific function documentation for
-                details.
-    exhaustive:
-      default-signifies-exhaustive: true
-    goconst:
-      min-len: 5
-      min-occurrences: 5
-    gocritic:
-      enabled-checks:
-        - ruleguard
-    revive:
-      confidence: 3
-      severity: warning
-    tagalign:
-      order:
-        - json
-        - schema
-        - yaml
-        - yml
-        - toml
-        - validate
-    testifylint:
-      enable-all: true
-  exclusions:
-    generated: lax
-    paths:
-      - internal/data/ent.*
-      - third_party$
-      - builtin$
-      - examples$
-issues:
-  fix: true
-formatters:
-  enable:
-    - gofmt
-  exclusions:
-    generated: lax
-    paths:
-      - internal/data/ent.*
-      - third_party$
-      - builtin$
-      - examples$

backend/.goreleaser.yaml

@@ -1,91 +0,0 @@
-version: 2
-
-# This is an example .goreleaser.yml file with some sensible defaults.
-# Make sure to check the documentation at https://goreleaser.com
-before:
-  hooks:
-    # you may remove this if you don't need go generate
-    - go generate ./...
-builds:
-  - main: ./app/api
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - windows
-      - darwin
-      - freebsd
-    goarch:
-      - amd64
-      - "386"
-      - arm
-      - arm64
-      - riscv64
-    flags:
-      - -trimpath
-    ldflags:
-      - -s -w
-      - -X main.version={{.Version}}
-      - -X main.commit={{.Commit}}
-      - -X main.date={{.Date}}
-    ignore:
-      - goos: windows
-        goarch: arm
-      - goos: windows
-        goarch: "386"
-      - goos: freebsd
-        goarch: arm
-      - goos: freebsd
-        goarch: "386"
-    tags:
-      - >-
-        {{- if eq .Arch "riscv64" }}nodynamic
-        {{- else if eq .Arch "arm" }}nodynamic
-        {{- else if eq .Arch "386" }}nodynamic
-        {{- else if eq .Os "freebsd" }}nodynamic
-        {{ end }}
-
-signs:
-  - cmd: cosign
-    signature: "${artifact}.sigstore.json"
-    args:
-      - sign-blob
-      - "--bundle=${signature}"
-      - "${artifact}"
-      - "--yes"
-    artifacts: checksum
-    output: true
-archives:
-  - formats: [ 'tar.gz' ]
-    # this name template makes the OS and Arch compatible with the results of uname.
-    name_template: >-
-      {{ .ProjectName }}_
-      {{- title .Os }}_
-      {{- if eq .Arch "amd64" }}x86_64
-      {{- else if eq .Arch "386" }}i386
-      {{- else }}{{ .Arch }}{{ end }}
-      {{- if .Arm }}v{{ .Arm }}{{ end }}
-    # use zip for windows archives
-    format_overrides:
-    - goos: windows
-      formats: [ 'zip' ]
-sboms:
-  - artifacts: archive
-release:
-  extra_files:
-    - glob: dist/*.sig
-checksum:
-  name_template: 'checksums.txt'
-snapshot:
-  version_template: "{{ incpatch .Version }}-next"
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'
-
-# The lines beneath this are called `modelines`. See `:help modeline`
-# Feel free to remove those if you don't want/use them.
-# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj

backend/app/api/app.go

@@ -1,21 +1,23 @@
 package main
 
 import (
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services/reporting/eventbus"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/ent"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
-	"github.com/sysadminsmedia/homebox/backend/pkgs/mailer"
+	"time"
+
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/data/ent"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/internal/sys/config"
+	"github.com/hay-kot/homebox/backend/pkgs/mailer"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
 )
 
 type app struct {
 	conf     *config.Config
 	mailer   mailer.Mailer
 	db       *ent.Client
+	server   *server.Server
 	repos    *repo.AllRepos
 	services *services.AllServices
-	bus      *eventbus.EventBus
 }
 
 func new(conf *config.Config) *app {
@@ -33,3 +35,10 @@ func new(conf *config.Config) *app {
 
 	return s
 }
+
+func (a *app) startBgTask(t time.Duration, fn func()) {
+	for {
+		a.server.Background(fn)
+		time.Sleep(t)
+	}
+}

backend/app/api/bgrunner.go

@@ -1,38 +0,0 @@
-package main
-
-import (
-	"context"
-	"time"
-)
-
-type BackgroundTask struct {
-	name     string
-	Interval time.Duration
-	Fn       func(context.Context)
-}
-
-func (tsk *BackgroundTask) Name() string {
-	return tsk.name
-}
-
-func NewTask(name string, interval time.Duration, fn func(context.Context)) *BackgroundTask {
-	return &BackgroundTask{
-		Interval: interval,
-		Fn:       fn,
-	}
-}
-
-func (tsk *BackgroundTask) Start(ctx context.Context) error {
-	tsk.Fn(ctx)
-
-	timer := time.NewTimer(tsk.Interval)
-	for {
-		select {
-		case <-ctx.Done():
-			return nil
-		case <-timer.C:
-			timer.Reset(tsk.Interval)
-			tsk.Fn(ctx)
-		}
-	}
-}

backend/app/api/demo.go

@@ -2,66 +2,61 @@ package main
 
 import (
 	"context"
-	"errors"
+	"encoding/csv"
 	"strings"
-	"time"
 
+	"github.com/hay-kot/homebox/backend/internal/core/services"
 	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
 )
 
-func (a *app) SetupDemo() error {
-	csvText := `HB.import_ref,HB.location,HB.labels,HB.quantity,HB.name,HB.description,HB.insured,HB.serial_number,HB.model_number,HB.manufacturer,HB.notes,HB.purchase_from,HB.purchase_price,HB.purchase_time,HB.lifetime_warranty,HB.warranty_expires,HB.warranty_details,HB.sold_to,HB.sold_price,HB.sold_time,HB.sold_notes
+func (a *app) SetupDemo() {
+	csvText := `Import Ref,Location,Labels,Quantity,Name,Description,Insured,Serial Number,Model Number,Manufacturer,Notes,Purchase From,Purchased Price,Purchased Time,Lifetime Warranty,Warranty Expires,Warranty Details,Sold To,Sold Price,Sold Time,Sold Notes
 ,Garage,IOT;Home Assistant; Z-Wave,1,Zooz Universal Relay ZEN17,"Zooz 700 Series Z-Wave Universal Relay ZEN17 for Awnings, Garage Doors, Sprinklers, and More | 2 NO-C-NC Relays (20A, 10A) | Signal Repeater | Hub Required (Compatible with SmartThings and Hubitat)",,,ZEN17,Zooz,,Amazon,39.95,10/13/2021,,,,,,,
 ,Living Room,IOT;Home Assistant; Z-Wave,1,Zooz Motion Sensor,"Zooz Z-Wave Plus S2 Motion Sensor ZSE18 with Magnetic Mount, Works with Vera and SmartThings",,,ZSE18,Zooz,,Amazon,29.95,10/15/2021,,,,,,,
 ,Office,IOT;Home Assistant; Z-Wave,1,Zooz 110v Power Switch,"Zooz Z-Wave Plus Power Switch ZEN15 for 110V AC Units, Sump Pumps, Humidifiers, and More",,,ZEN15,Zooz,,Amazon,39.95,10/13/2021,,,,,,,
 ,Downstairs,IOT;Home Assistant; Z-Wave,1,Ecolink Z-Wave PIR Motion Sensor,"Ecolink Z-Wave PIR Motion Detector Pet Immune, White (PIRZWAVE2.5-ECO)",,,PIRZWAVE2.5-ECO,Ecolink,,Amazon,35.58,10/21/2020,,,,,,,
 ,Entry,IOT;Home Assistant; Z-Wave,1,Yale Security Touchscreen Deadbolt,"Yale Security YRD226-ZW2-619 YRD226ZW2619 Touchscreen Deadbolt, Satin Nickel",,,YRD226ZW2619,Yale,,Amazon,120.39,10/14/2020,,,,,,,
-,Kitchen,IOT;Home Assistant; Z-Wave,1,Smart Rocker Light Dimmer,"UltraPro Z-Wave Smart Rocker Light Dimmer with QuickFit and SimpleWire, 3-Way Ready, Compatible with Alexa, Google Assistant, ZWave Hub Required, Repeater/Range Extender, White Paddle Only, 39351",,,39351,Honeywell,,Amazon,65.98,09/30/0202,,,,,,,
+,Kitchen,IOT;Home Assistant; Z-Wave,1,Smart Rocker Light Dimmer,"UltraPro Z-Wave Smart Rocker Light Dimmer with QuickFit and SimpleWire, 3-Way Ready, Compatible with Alexa, Google Assistant, ZWave Hub Required, Repeater/Range Extender, White Paddle Only, 39351",,,‎39351,Honeywell,,Amazon,65.98,09/30/0202,,,,,,,
 `
 
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	registration := services.UserRegistration{
-		Email:    "demo@example.com",
-		Name:     "Demo",
-		Password: "demo",
-	}
+	var (
+		registration = services.UserRegistration{
+			Email:    "demo@example.com",
+			Name:     "Demo",
+			Password: "demo",
+		}
+	)
 
 	// First check if we've already setup a demo user and skip if so
-	log.Debug().Msg("Checking if demo user already exists")
-	_, err := a.services.User.Login(ctx, registration.Email, registration.Password, false)
+	_, err := a.services.User.Login(context.Background(), registration.Email, registration.Password)
 	if err == nil {
-		log.Info().Msg("Demo user already exists, skipping setup")
-		return nil
+		return
 	}
 
-	log.Debug().Msg("Demo user does not exist, setting up demo")
-	_, err = a.services.User.RegisterUser(ctx, registration)
+	_, err = a.services.User.RegisterUser(context.Background(), registration)
 	if err != nil {
 		log.Err(err).Msg("Failed to register demo user")
-		return errors.New("failed to setup demo")
+		log.Fatal().Msg("Failed to setup demo")
 	}
 
-	token, err := a.services.User.Login(ctx, registration.Email, registration.Password, false)
+	token, _ := a.services.User.Login(context.Background(), registration.Email, registration.Password)
+	self, _ := a.services.User.GetSelf(context.Background(), token.Raw)
+
+	// Read CSV Text
+	reader := csv.NewReader(strings.NewReader(csvText))
+	reader.Comma = ','
+
+	records, err := reader.ReadAll()
 	if err != nil {
-		log.Err(err).Msg("Failed to login demo user")
-		return errors.New("failed to setup demo")
-	}
-	self, err := a.services.User.GetSelf(ctx, token.Raw)
-	if err != nil {
-		log.Err(err).Msg("Failed to get self")
-		return errors.New("failed to setup demo")
+		log.Err(err).Msg("Failed to read CSV")
+		log.Fatal().Msg("Failed to setup demo")
 	}
 
-	_, err = a.services.Items.CsvImport(ctx, self.GroupID, strings.NewReader(csvText))
+	_, err = a.services.Items.CsvImport(context.Background(), self.GroupID, records)
 	if err != nil {
 		log.Err(err).Msg("Failed to import CSV")
-		return errors.New("failed to setup demo")
+		log.Fatal().Msg("Failed to setup demo")
 	}
 
 	log.Info().Msg("Demo setup complete")
-
-	return nil
 }

backend/app/api/handlers/debughandlers/debug.go

@@ -1,4 +1,3 @@
-// Package debughandlers provides handlers for debugging.
 package debughandlers
 
 import (

backend/app/api/handlers/v1/controller.go

@@ -1,40 +1,13 @@
-// Package v1 provides the API handlers for version 1 of the API.
 package v1
 
 import (
-	"encoding/json"
 	"net/http"
-	"time"
 
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/server"
-	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/app/api/providers"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services/reporting/eventbus"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
-
-	"github.com/olahol/melody"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
 )
 
-type Results[T any] struct {
-	Items []T `json:"items"`
-}
-
-func WrapResults[T any](items []T) Results[T] {
-	return Results[T]{Items: items}
-}
-
-type Wrapped struct {
-	Item interface{} `json:"item"`
-}
-
-func Wrap(v any) Wrapped {
-	return Wrapped{Item: v}
-}
-
 func WithMaxUploadSize(maxUploadSize int64) func(*V1Controller) {
 	return func(ctrl *V1Controller) {
 		ctrl.maxUploadSize = maxUploadSize
@@ -53,29 +26,12 @@ func WithRegistration(allowRegistration bool) func(*V1Controller) {
 	}
 }
 
-func WithSecureCookies(secure bool) func(*V1Controller) {
-	return func(ctrl *V1Controller) {
-		ctrl.cookieSecure = secure
-	}
-}
-
-func WithURL(url string) func(*V1Controller) {
-	return func(ctrl *V1Controller) {
-		ctrl.url = url
-	}
-}
-
 type V1Controller struct {
-	cookieSecure      bool
 	repo              *repo.AllRepos
 	svc               *services.AllServices
 	maxUploadSize     int64
 	isDemo            bool
 	allowRegistration bool
-	bus               *eventbus.EventBus
-	url               string
-	config            *config.Config
-	oidcProvider      *providers.OIDCProvider
 }
 
 type (
@@ -87,165 +43,50 @@ type (
 		BuildTime string `json:"buildTime"`
 	}
 
-	APISummary struct {
-		Healthy           bool            `json:"health"`
-		Versions          []string        `json:"versions"`
-		Title             string          `json:"title"`
-		Message           string          `json:"message"`
-		Build             Build           `json:"build"`
-		Latest            services.Latest `json:"latest"`
-		Demo              bool            `json:"demo"`
-		AllowRegistration bool            `json:"allowRegistration"`
-		LabelPrinting     bool            `json:"labelPrinting"`
-		OIDC              OIDCStatus      `json:"oidc"`
-	}
-
-	OIDCStatus struct {
-		Enabled      bool   `json:"enabled"`
-		ButtonText   string `json:"buttonText,omitempty"`
-		AutoRedirect bool   `json:"autoRedirect,omitempty"`
-		AllowLocal   bool   `json:"allowLocal"`
+	ApiSummary struct {
+		Healthy  bool     `json:"health"`
+		Versions []string `json:"versions"`
+		Title    string   `json:"title"`
+		Message  string   `json:"message"`
+		Build    Build    `json:"build"`
+		Demo     bool     `json:"demo"`
 	}
 )
 
-func NewControllerV1(svc *services.AllServices, repos *repo.AllRepos, bus *eventbus.EventBus, config *config.Config, options ...func(*V1Controller)) *V1Controller {
+func BaseUrlFunc(prefix string) func(s string) string {
+	return func(s string) string {
+		return prefix + "/v1" + s
+	}
+}
+
+func NewControllerV1(svc *services.AllServices, repos *repo.AllRepos, options ...func(*V1Controller)) *V1Controller {
 	ctrl := &V1Controller{
 		repo:              repos,
 		svc:               svc,
 		allowRegistration: true,
-		bus:               bus,
-		config:            config,
 	}
 
 	for _, opt := range options {
 		opt(ctrl)
 	}
 
-	ctrl.initOIDCProvider()
-
 	return ctrl
 }
 
-func (ctrl *V1Controller) initOIDCProvider() {
-	if ctrl.config.OIDC.Enabled {
-		oidcProvider, err := providers.NewOIDCProvider(ctrl.svc.User, &ctrl.config.OIDC, &ctrl.config.Options, ctrl.cookieSecure)
-		if err != nil {
-			log.Err(err).Msg("failed to initialize OIDC provider at startup")
-		} else {
-			ctrl.oidcProvider = oidcProvider
-			log.Info().Msg("OIDC provider initialized successfully at startup")
-		}
-	}
-}
-
 // HandleBase godoc
-//
-//	@Summary	Application Info
-//	@Tags		Base
-//	@Produce	json
-//	@Success	200	{object}	APISummary
-//	@Router		/v1/status [GET]
-func (ctrl *V1Controller) HandleBase(ready ReadyFunc, build Build) errchain.HandlerFunc {
+// @Summary Retrieves the basic information about the API
+// @Tags    Base
+// @Produce json
+// @Success 200 {object} ApiSummary
+// @Router  /v1/status [GET]
+func (ctrl *V1Controller) HandleBase(ready ReadyFunc, build Build) server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
-		return server.JSON(w, http.StatusOK, APISummary{
-			Healthy:           ready(),
-			Title:             "Homebox",
-			Message:           "Track, Manage, and Organize your Things",
-			Build:             build,
-			Latest:            ctrl.svc.BackgroundService.GetLatestVersion(),
-			Demo:              ctrl.isDemo,
-			AllowRegistration: ctrl.allowRegistration,
-			LabelPrinting:     ctrl.config.LabelMaker.PrintCommand != nil,
-			OIDC: OIDCStatus{
-				Enabled:      ctrl.config.OIDC.Enabled,
-				ButtonText:   ctrl.config.OIDC.ButtonText,
-				AutoRedirect: ctrl.config.OIDC.AutoRedirect,
-				AllowLocal:   ctrl.config.Options.AllowLocalLogin,
-			},
+		return server.Respond(w, http.StatusOK, ApiSummary{
+			Healthy: ready(),
+			Title:   "Go API Template",
+			Message: "Welcome to the Go API Template Application!",
+			Build:   build,
+			Demo:    ctrl.isDemo,
 		})
 	}
 }
-
-// HandleCurrency godoc
-//
-//	@Summary	Currency
-//	@Tags		Base
-//	@Produce	json
-//	@Success	200	{object}	currencies.Currency
-//	@Router		/v1/currency [GET]
-func (ctrl *V1Controller) HandleCurrency() errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		// Set Cache for 10 Minutes
-		w.Header().Set("Cache-Control", "max-age=600")
-
-		return server.JSON(w, http.StatusOK, ctrl.svc.Currencies.Slice())
-	}
-}
-
-func (ctrl *V1Controller) HandleCacheWS() errchain.HandlerFunc {
-	type eventMsg struct {
-		Event string `json:"event"`
-	}
-
-	m := melody.New()
-
-	m.HandleConnect(func(s *melody.Session) {
-		auth := services.NewContext(s.Request.Context())
-		s.Set("gid", auth.GID)
-	})
-
-	factory := func(e string) func(data any) {
-		return func(data any) {
-			eventData, ok := data.(eventbus.GroupMutationEvent)
-			if !ok {
-				log.Log().Msgf("invalid event data: %v", data)
-				return
-			}
-
-			msg := &eventMsg{Event: e}
-
-			jsonBytes, err := json.Marshal(msg)
-			if err != nil {
-				log.Log().Msgf("error marshling event data %v: %v", data, err)
-				return
-			}
-
-			_ = m.BroadcastFilter(jsonBytes, func(s *melody.Session) bool {
-				groupIDStr, ok := s.Get("gid")
-				if !ok {
-					return false
-				}
-
-				GID := groupIDStr.(uuid.UUID)
-				return GID == eventData.GID
-			})
-		}
-	}
-
-	ctrl.bus.Subscribe(eventbus.EventLabelMutation, factory("label.mutation"))
-	ctrl.bus.Subscribe(eventbus.EventLocationMutation, factory("location.mutation"))
-	ctrl.bus.Subscribe(eventbus.EventItemMutation, factory("item.mutation"))
-
-	// Persistent asynchronous ticker that keeps all websocket connections alive with periodic pings.
-	go func() {
-		const interval = 10 * time.Second
-
-		ping := time.NewTicker(interval)
-		defer ping.Stop()
-
-		for range ping.C {
-			msg := &eventMsg{Event: "ping"}
-
-			pingBytes, err := json.Marshal(msg)
-			if err != nil {
-				log.Log().Msgf("error marshaling ping: %v", err)
-			} else {
-				_ = m.Broadcast(pingBytes)
-			}
-		}
-	}()
-
-	return func(w http.ResponseWriter, r *http.Request) error {
-		return m.HandleRequest(w, r)
-	}
-}

backend/app/api/handlers/v1/helpers.go

@@ -1,30 +0,0 @@
-package v1
-
-import (
-	"net/url"
-
-	"github.com/rs/zerolog/log"
-)
-
-func GetHBURL(refererHeader, fallback string) (hbURL string) {
-	hbURL = refererHeader
-	if hbURL == "" {
-		hbURL = fallback
-	}
-
-	return stripPathFromURL(hbURL)
-}
-
-// stripPathFromURL removes the path from a URL.
-// ex. https://example.com/tools -> https://example.com
-func stripPathFromURL(rawURL string) string {
-	parsedURL, err := url.Parse(rawURL)
-	if err != nil {
-		log.Err(err).Msg("failed to parse URL")
-		return ""
-	}
-
-	strippedURL := url.URL{Scheme: parsedURL.Scheme, Host: parsedURL.Host}
-
-	return strippedURL.String()
-}

backend/app/api/handlers/v1/partials.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/internal/sys/validate"
 )
 
 // routeID extracts the ID from the request URL. If the ID is not in a valid
@@ -21,7 +21,7 @@ func (ctrl *V1Controller) routeID(r *http.Request) (uuid.UUID, error) {
 func (ctrl *V1Controller) routeUUID(r *http.Request, key string) (uuid.UUID, error) {
 	ID, err := uuid.Parse(chi.URLParam(r, key))
 	if err != nil {
-		return uuid.Nil, validate.NewRouteKeyError(key)
+		return uuid.Nil, validate.NewInvalidRouteKeyError(key)
 	}
 	return ID, nil
 }

backend/app/api/handlers/v1/v1_ctrl_actions.go

@@ -1,96 +0,0 @@
-package v1
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/server"
-	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
-)
-
-type ActionAmountResult struct {
-	Completed int `json:"completed"`
-}
-
-func actionHandlerFactory(ref string, fn func(context.Context, uuid.UUID) (int, error)) errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		ctx := services.NewContext(r.Context())
-
-		totalCompleted, err := fn(ctx, ctx.GID)
-		if err != nil {
-			log.Err(err).Str("action_ref", ref).Msg("failed to run action")
-			return validate.NewRequestError(err, http.StatusInternalServerError)
-		}
-
-		return server.JSON(w, http.StatusOK, ActionAmountResult{Completed: totalCompleted})
-	}
-}
-
-// HandleEnsureAssetID godoc
-//
-//	@Summary		Ensure Asset IDs
-//	@Description	Ensures all items in the database have an asset ID
-//	@Tags			Actions
-//	@Produce		json
-//	@Success		200	{object}	ActionAmountResult
-//	@Router			/v1/actions/ensure-asset-ids [Post]
-//	@Security		Bearer
-func (ctrl *V1Controller) HandleEnsureAssetID() errchain.HandlerFunc {
-	return actionHandlerFactory("ensure asset IDs", ctrl.svc.Items.EnsureAssetID)
-}
-
-// HandleEnsureImportRefs godoc
-//
-//	@Summary		Ensures Import Refs
-//	@Description	Ensures all items in the database have an import ref
-//	@Tags			Actions
-//	@Produce		json
-//	@Success		200	{object}	ActionAmountResult
-//	@Router			/v1/actions/ensure-import-refs [Post]
-//	@Security		Bearer
-func (ctrl *V1Controller) HandleEnsureImportRefs() errchain.HandlerFunc {
-	return actionHandlerFactory("ensure import refs", ctrl.svc.Items.EnsureImportRef)
-}
-
-// HandleItemDateZeroOut godoc
-//
-//	@Summary		Zero Out Time Fields
-//	@Description	Resets all item date fields to the beginning of the day
-//	@Tags			Actions
-//	@Produce		json
-//	@Success		200	{object}	ActionAmountResult
-//	@Router			/v1/actions/zero-item-time-fields [Post]
-//	@Security		Bearer
-func (ctrl *V1Controller) HandleItemDateZeroOut() errchain.HandlerFunc {
-	return actionHandlerFactory("zero out date time", ctrl.repo.Items.ZeroOutTimeFields)
-}
-
-// HandleSetPrimaryPhotos godoc
-//
-//	@Summary		Set Primary Photos
-//	@Description	Sets the first photo of each item as the primary photo
-//	@Tags			Actions
-//	@Produce		json
-//	@Success		200	{object}	ActionAmountResult
-//	@Router			/v1/actions/set-primary-photos [Post]
-//	@Security		Bearer
-func (ctrl *V1Controller) HandleSetPrimaryPhotos() errchain.HandlerFunc {
-	return actionHandlerFactory("ensure asset IDs", ctrl.repo.Items.SetPrimaryPhotos)
-}
-
-// HandleCreateMissingThumbnails godoc
-//
-//	@Summary		Create Missing Thumbnails
-//	@Description	Creates thumbnails for items that are missing them
-//	@Tags			Actions
-//	@Produce		json
-//	@Success		200	{object}	ActionAmountResult
-//	@Router			/v1/actions/create-missing-thumbnails [Post]
-//	@Security		Bearer
-func (ctrl *V1Controller) HandleCreateMissingThumbnails() errchain.HandlerFunc {
-	return actionHandlerFactory("create missing thumbnails", ctrl.repo.Attachments.CreateMissingThumbnails)
-}

backend/app/api/handlers/v1/v1_ctrl_assets.go

@@ -1,62 +0,0 @@
-package v1
-
-import (
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/go-chi/chi/v5"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/server"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
-
-	"github.com/rs/zerolog/log"
-)
-
-// HandleAssetGet godocs
-//
-//	@Summary	Get Item by Asset ID
-//	@Tags		Items
-//	@Produce	json
-//	@Param		id	path		string	true	"Asset ID"
-//	@Success	200	{object}	repo.PaginationResult[repo.ItemSummary]{}
-//	@Router		/v1/assets/{id} [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleAssetGet() errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		ctx := services.NewContext(r.Context())
-		assetIDParam := chi.URLParam(r, "id")
-		assetIDParam = strings.ReplaceAll(assetIDParam, "-", "") // Remove dashes
-		// Convert the asset ID to an int64
-		assetID, err := strconv.ParseInt(assetIDParam, 10, 64)
-		if err != nil {
-			return err
-		}
-		pageParam := r.URL.Query().Get("page")
-		var page int64 = -1
-		if pageParam != "" {
-			page, err = strconv.ParseInt(pageParam, 10, 32)
-			if err != nil {
-				return server.JSON(w, http.StatusBadRequest, "Invalid page number")
-			}
-		}
-
-		pageSizeParam := r.URL.Query().Get("pageSize")
-		var pageSize int64 = -1
-		if pageSizeParam != "" {
-			pageSize, err = strconv.ParseInt(pageSizeParam, 10, 32)
-			if err != nil {
-				return server.JSON(w, http.StatusBadRequest, "Invalid page size")
-			}
-		}
-
-		items, err := ctrl.repo.Items.QueryByAssetID(r.Context(), ctx.GID, repo.AssetID(assetID), int(page), int(pageSize))
-		if err != nil {
-			log.Err(err).Msg("failed to get item")
-			return validate.NewRequestError(err, http.StatusInternalServerError)
-		}
-		return server.JSON(w, http.StatusOK, items)
-	}
-}

backend/app/api/handlers/v1/v1_ctrl_auth.go

@@ -2,145 +2,93 @@ package v1
 
 import (
 	"errors"
-	"fmt"
 	"net/http"
-	"strconv"
-	"strings"
 	"time"
 
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/server"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
 	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
-)
-
-const (
-	cookieNameToken    = "hb.auth.token"
-	cookieNameRemember = "hb.auth.remember"
-	cookieNameSession  = "hb.auth.session"
 )
 
 type (
 	TokenResponse struct {
-		Token           string    `json:"token"`
-		ExpiresAt       time.Time `json:"expiresAt"`
-		AttachmentToken string    `json:"attachmentToken"`
+		Token     string    `json:"token"`
+		ExpiresAt time.Time `json:"expiresAt"`
 	}
 
 	LoginForm struct {
-		Username     string `json:"username"     example:"admin@admin.com"`
-		Password     string `json:"password"     example:"admin"`
-		StayLoggedIn bool   `json:"stayLoggedIn"`
+		Username string `json:"username"`
+		Password string `json:"password"`
 	}
 )
 
-type CookieContents struct {
-	Token     string
-	ExpiresAt time.Time
-	Remember  bool
-}
-
-func GetCookies(r *http.Request) (*CookieContents, error) {
-	cookie, err := r.Cookie(cookieNameToken)
-	if err != nil {
-		return nil, errors.New("authorization cookie is required")
-	}
-
-	rememberCookie, err := r.Cookie(cookieNameRemember)
-	if err != nil {
-		return nil, errors.New("remember cookie is required")
-	}
-
-	return &CookieContents{
-		Token:     cookie.Value,
-		ExpiresAt: cookie.Expires,
-		Remember:  rememberCookie.Value == "true",
-	}, nil
-}
-
-// AuthProvider is an interface that can be implemented by any authentication provider.
-// to extend authentication methods for the API.
-type AuthProvider interface {
-	// Name returns the name of the authentication provider. This should be a unique name.
-	// that is URL friendly.
-	//
-	// Example: "local", "ldap"
-	Name() string
-	// Authenticate is called when a user attempts to login to the API. The implementation
-	// should return an error if the user cannot be authenticated. If an error is returned
-	// the API controller will return a vague error message to the user.
-	//
-	// Authenticate should do the following:
-	//
-	// 1. Ensure that the user exists within the database (either create, or get)
-	// 2. On successful authentication, they must set the user cookies.
-	Authenticate(w http.ResponseWriter, r *http.Request) (services.UserAuthTokenDetail, error)
-}
-
 // HandleAuthLogin godoc
-//
-//	@Summary	User Login
-//	@Tags		Authentication
-//	@Accept		x-www-form-urlencoded
-//	@Accept		application/json
-//	@Param		payload		body	LoginForm	true	"Login Data"
-//	@Param		provider	query	string		false	"auth provider"
-//	@Produce	json
-//	@Success	200	{object}	TokenResponse
-//	@Router		/v1/users/login [POST]
-func (ctrl *V1Controller) HandleAuthLogin(ps ...AuthProvider) errchain.HandlerFunc {
-	if len(ps) == 0 {
-		panic("no auth providers provided")
-	}
-
-	providers := make(map[string]AuthProvider)
-	for _, p := range ps {
-		log.Info().Str("name", p.Name()).Msg("registering auth provider")
-		providers[p.Name()] = p
-	}
-
+// @Summary User Login
+// @Tags    Authentication
+// @Accept  x-www-form-urlencoded
+// @Accept  application/json
+// @Param   username formData string false "string" example(admin@admin.com)
+// @Param   password formData string false "string" example(admin)
+// @Produce json
+// @Success 200 {object} TokenResponse
+// @Router  /v1/users/login [POST]
+func (ctrl *V1Controller) HandleAuthLogin() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
-		// Extract provider query
-		provider := r.URL.Query().Get("provider")
-		if provider == "" {
-			provider = "local"
+		loginForm := &LoginForm{}
+
+		switch r.Header.Get("Content-Type") {
+		case server.ContentFormUrlEncoded:
+			err := r.ParseForm()
+			if err != nil {
+				return server.Respond(w, http.StatusBadRequest, server.Wrap(err))
+			}
+
+			loginForm.Username = r.PostFormValue("username")
+			loginForm.Password = r.PostFormValue("password")
+		case server.ContentJSON:
+			err := server.Decode(r, loginForm)
+
+			if err != nil {
+				log.Err(err).Msg("failed to decode login form")
+			}
+		default:
+			return server.Respond(w, http.StatusBadRequest, errors.New("invalid content type"))
 		}
 
-		// Block local only when disabled
-		if provider == "local" && !ctrl.config.Options.AllowLocalLogin {
-			return validate.NewRequestError(fmt.Errorf("local login is not enabled"), http.StatusForbidden)
+		if loginForm.Username == "" || loginForm.Password == "" {
+			return validate.NewFieldErrors(
+				validate.FieldError{
+					Field: "username",
+					Error: "username or password is empty",
+				},
+				validate.FieldError{
+					Field: "password",
+					Error: "username or password is empty",
+				},
+			)
 		}
 
-		// Get the provider
-		p, ok := providers[provider]
-		if !ok {
-			return validate.NewRequestError(errors.New("invalid auth provider"), http.StatusBadRequest)
-		}
+		newToken, err := ctrl.svc.User.Login(r.Context(), loginForm.Username, loginForm.Password)
 
-		newToken, err := p.Authenticate(w, r)
 		if err != nil {
-			log.Warn().Err(err).Msg("authentication failed")
-			return validate.NewUnauthorizedError()
+			return validate.NewRequestError(errors.New("authentication failed"), http.StatusInternalServerError)
 		}
 
-		ctrl.setCookies(w, noPort(r.Host), newToken.Raw, newToken.ExpiresAt, true)
-		return server.JSON(w, http.StatusOK, TokenResponse{
-			Token:           "Bearer " + newToken.Raw,
-			ExpiresAt:       newToken.ExpiresAt,
-			AttachmentToken: newToken.AttachmentToken,
+		return server.Respond(w, http.StatusOK, TokenResponse{
+			Token:     "Bearer " + newToken.Raw,
+			ExpiresAt: newToken.ExpiresAt,
 		})
 	}
 }
 
 // HandleAuthLogout godoc
-//
-//	@Summary	User Logout
-//	@Tags		Authentication
-//	@Success	204
-//	@Router		/v1/users/logout [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleAuthLogout() errchain.HandlerFunc {
+// @Summary  User Logout
+// @Tags     Authentication
+// @Success  204
+// @Router   /v1/users/logout [POST]
+// @Security Bearer
+func (ctrl *V1Controller) HandleAuthLogout() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
 		token := services.UseTokenCtx(r.Context())
 		if token == "" {
@@ -152,21 +100,19 @@ func (ctrl *V1Controller) HandleAuthLogout() errchain.HandlerFunc {
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		ctrl.unsetCookies(w, noPort(r.Host))
-		return server.JSON(w, http.StatusNoContent, nil)
+		return server.Respond(w, http.StatusNoContent, nil)
 	}
 }
 
-// HandleAuthRefresh godoc
-//
-//	@Summary		User Token Refresh
-//	@Description	handleAuthRefresh returns a handler that will issue a new token from an existing token.
-//	@Description	This does not validate that the user still exists within the database.
-//	@Tags			Authentication
-//	@Success		200
-//	@Router			/v1/users/refresh [GET]
-//	@Security		Bearer
-func (ctrl *V1Controller) HandleAuthRefresh() errchain.HandlerFunc {
+// HandleAuthLogout godoc
+// @Summary     User Token Refresh
+// @Description handleAuthRefresh returns a handler that will issue a new token from an existing token.
+// @Description This does not validate that the user still exists within the database.
+// @Tags        Authentication
+// @Success     200
+// @Router      /v1/users/refresh [GET]
+// @Security    Bearer
+func (ctrl *V1Controller) HandleAuthRefresh() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
 		requestToken := services.UseTokenCtx(r.Context())
 		if requestToken == "" {
@@ -178,140 +124,6 @@ func (ctrl *V1Controller) HandleAuthRefresh() errchain.HandlerFunc {
 			return validate.NewUnauthorizedError()
 		}
 
-		ctrl.setCookies(w, noPort(r.Host), newToken.Raw, newToken.ExpiresAt, false)
-		return server.JSON(w, http.StatusOK, newToken)
-	}
-}
-
-func noPort(host string) string {
-	return strings.Split(host, ":")[0]
-}
-
-func (ctrl *V1Controller) setCookies(w http.ResponseWriter, domain, token string, expires time.Time, remember bool) {
-	http.SetCookie(w, &http.Cookie{
-		Name:     cookieNameRemember,
-		Value:    strconv.FormatBool(remember),
-		Expires:  expires,
-		Domain:   domain,
-		Secure:   ctrl.cookieSecure,
-		HttpOnly: true,
-		Path:     "/",
-	})
-
-	// Set HTTP only cookie
-	http.SetCookie(w, &http.Cookie{
-		Name:     cookieNameToken,
-		Value:    token,
-		Expires:  expires,
-		Domain:   domain,
-		Secure:   ctrl.cookieSecure,
-		HttpOnly: true,
-		Path:     "/",
-	})
-
-	// Set Fake Session cookie
-	http.SetCookie(w, &http.Cookie{
-		Name:     cookieNameSession,
-		Value:    "true",
-		Expires:  expires,
-		Domain:   domain,
-		Secure:   ctrl.cookieSecure,
-		HttpOnly: false,
-		Path:     "/",
-	})
-}
-
-func (ctrl *V1Controller) unsetCookies(w http.ResponseWriter, domain string) {
-	http.SetCookie(w, &http.Cookie{
-		Name:     cookieNameToken,
-		Value:    "",
-		Expires:  time.Unix(0, 0),
-		Domain:   domain,
-		Secure:   ctrl.cookieSecure,
-		HttpOnly: true,
-		Path:     "/",
-	})
-
-	http.SetCookie(w, &http.Cookie{
-		Name:     cookieNameRemember,
-		Value:    "false",
-		Expires:  time.Unix(0, 0),
-		Domain:   domain,
-		Secure:   ctrl.cookieSecure,
-		HttpOnly: true,
-		Path:     "/",
-	})
-
-	// Set Fake Session cookie
-	http.SetCookie(w, &http.Cookie{
-		Name:     cookieNameSession,
-		Value:    "false",
-		Expires:  time.Unix(0, 0),
-		Domain:   domain,
-		Secure:   ctrl.cookieSecure,
-		HttpOnly: false,
-		Path:     "/",
-	})
-}
-
-// HandleOIDCLogin godoc
-//
-//	@Summary	OIDC Login Initiation
-//	@Tags		Authentication
-//	@Produce	json
-//	@Success	302
-//	@Router		/v1/users/login/oidc [GET]
-func (ctrl *V1Controller) HandleOIDCLogin() errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		// Forbidden if OIDC is not enabled
-		if !ctrl.config.OIDC.Enabled {
-			return validate.NewRequestError(fmt.Errorf("OIDC is not enabled"), http.StatusForbidden)
-		}
-
-		// Check if OIDC provider is available
-		if ctrl.oidcProvider == nil {
-			log.Error().Msg("OIDC provider not initialized")
-			return validate.NewRequestError(errors.New("OIDC provider not available"), http.StatusInternalServerError)
-		}
-
-		// Initiate OIDC flow
-		_, err := ctrl.oidcProvider.InitiateOIDCFlow(w, r)
-		return err
-	}
-}
-
-// HandleOIDCCallback godoc
-//
-//	@Summary	OIDC Callback Handler
-//	@Tags		Authentication
-//	@Param		code	query	string	true	"Authorization code"
-//	@Param		state	query	string	true	"State parameter"
-//	@Success	302
-//	@Router		/v1/users/login/oidc/callback [GET]
-func (ctrl *V1Controller) HandleOIDCCallback() errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		// Forbidden if OIDC is not enabled
-		if !ctrl.config.OIDC.Enabled {
-			return validate.NewRequestError(fmt.Errorf("OIDC is not enabled"), http.StatusForbidden)
-		}
-
-		// Check if OIDC provider is available
-		if ctrl.oidcProvider == nil {
-			log.Error().Msg("OIDC provider not initialized")
-			return validate.NewRequestError(errors.New("OIDC provider not available"), http.StatusInternalServerError)
-		}
-
-		// Handle callback
-		newToken, err := ctrl.oidcProvider.HandleCallback(w, r)
-		if err != nil {
-			log.Err(err).Msg("OIDC callback failed")
-			http.Redirect(w, r, "/?oidc_error=oidc_auth_failed", http.StatusFound)
-			return nil
-		}
-
-		// Set cookies and redirect to home
-		ctrl.setCookies(w, noPort(r.Host), newToken.Raw, newToken.ExpiresAt, true)
-		http.Redirect(w, r, "/home", http.StatusFound)
-		return nil
+		return server.Respond(w, http.StatusOK, newToken)
 	}
 }

backend/app/api/handlers/v1/v1_ctrl_group.go

@@ -4,16 +4,16 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
+	"github.com/rs/zerolog/log"
 )
 
 type (
 	GroupInvitationCreate struct {
-		Uses      int       `json:"uses"      validate:"required,min=1,max=100"`
+		Uses      int       `json:"uses"`
 		ExpiresAt time.Time `json:"expiresAt"`
 	}
 
@@ -25,73 +25,113 @@ type (
 )
 
 // HandleGroupGet godoc
-//
-//	@Summary	Get Group
-//	@Tags		Group
-//	@Produce	json
-//	@Success	200	{object}	repo.Group
-//	@Router		/v1/groups [Get]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGroupGet() errchain.HandlerFunc {
-	fn := func(r *http.Request) (repo.Group, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Groups.GroupByID(auth, auth.GID)
-	}
+// @Summary  Get the current user's group
+// @Tags     Group
+// @Produce  json
+// @Success  200 {object} repo.GroupStatistics
+// @Router   /v1/groups/statistics [Get]
+// @Security Bearer
+func (ctrl *V1Controller) HandleGroupStatistics() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		ctx := services.NewContext(r.Context())
 
-	return adapters.Command(fn, http.StatusOK)
+		stats, err := ctrl.repo.Groups.GroupStatistics(ctx, ctx.GID)
+		if err != nil {
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
+
+		return server.Respond(w, http.StatusOK, stats)
+	}
+}
+
+// HandleGroupGet godoc
+// @Summary  Get the current user's group
+// @Tags     Group
+// @Produce  json
+// @Success  200 {object} repo.Group
+// @Router   /v1/groups [Get]
+// @Security Bearer
+func (ctrl *V1Controller) HandleGroupGet() server.HandlerFunc {
+	return ctrl.handleGroupGeneral()
 }
 
 // HandleGroupUpdate godoc
-//
-//	@Summary	Update Group
-//	@Tags		Group
-//	@Produce	json
-//	@Param		payload	body		repo.GroupUpdate	true	"User Data"
-//	@Success	200		{object}	repo.Group
-//	@Router		/v1/groups [Put]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGroupUpdate() errchain.HandlerFunc {
-	fn := func(r *http.Request, body repo.GroupUpdate) (repo.Group, error) {
-		auth := services.NewContext(r.Context())
+// @Summary  Updates some fields of the current users group
+// @Tags     Group
+// @Produce  json
+// @Param    payload body     repo.GroupUpdate true "User Data"
+// @Success  200     {object} repo.Group
+// @Router   /v1/groups [Put]
+// @Security Bearer
+func (ctrl *V1Controller) HandleGroupUpdate() server.HandlerFunc {
+	return ctrl.handleGroupGeneral()
+}
 
-		ok := ctrl.svc.Currencies.IsSupported(body.Currency)
-		if !ok {
-			return repo.Group{}, validate.NewFieldErrors(
-				validate.NewFieldError("currency", "currency '"+body.Currency+"' is not supported"),
-			)
+func (ctrl *V1Controller) handleGroupGeneral() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		ctx := services.NewContext(r.Context())
+
+		switch r.Method {
+		case http.MethodGet:
+			group, err := ctrl.repo.Groups.GroupByID(ctx, ctx.GID)
+			if err != nil {
+				log.Err(err).Msg("failed to get group")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+
+			return server.Respond(w, http.StatusOK, group)
+
+		case http.MethodPut:
+			data := repo.GroupUpdate{}
+			if err := server.Decode(r, &data); err != nil {
+				return validate.NewRequestError(err, http.StatusBadRequest)
+			}
+
+			group, err := ctrl.svc.Group.UpdateGroup(ctx, data)
+			if err != nil {
+				log.Err(err).Msg("failed to update group")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+
+			return server.Respond(w, http.StatusOK, group)
 		}
 
-		return ctrl.svc.Group.UpdateGroup(auth, body)
+		return nil
 	}
-
-	return adapters.Action(fn, http.StatusOK)
 }
 
 // HandleGroupInvitationsCreate godoc
-//
-//	@Summary	Create Group Invitation
-//	@Tags		Group
-//	@Produce	json
-//	@Param		payload	body		GroupInvitationCreate	true	"User Data"
-//	@Success	200		{object}	GroupInvitation
-//	@Router		/v1/groups/invitations [Post]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGroupInvitationsCreate() errchain.HandlerFunc {
-	fn := func(r *http.Request, body GroupInvitationCreate) (GroupInvitation, error) {
-		if body.ExpiresAt.IsZero() {
-			body.ExpiresAt = time.Now().Add(time.Hour * 24)
+// @Summary  Get the current user
+// @Tags     Group
+// @Produce  json
+// @Param    payload body     GroupInvitationCreate true "User Data"
+// @Success  200     {object} GroupInvitation
+// @Router   /v1/groups/invitations [Post]
+// @Security Bearer
+func (ctrl *V1Controller) HandleGroupInvitationsCreate() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		data := GroupInvitationCreate{}
+		if err := server.Decode(r, &data); err != nil {
+			log.Err(err).Msg("failed to decode user registration data")
+			return validate.NewRequestError(err, http.StatusBadRequest)
 		}
 
-		auth := services.NewContext(r.Context())
+		if data.ExpiresAt.IsZero() {
+			data.ExpiresAt = time.Now().Add(time.Hour * 24)
+		}
 
-		token, err := ctrl.svc.Group.NewInvitation(auth, body.Uses, body.ExpiresAt)
+		ctx := services.NewContext(r.Context())
 
-		return GroupInvitation{
+		token, err := ctrl.svc.Group.NewInvitation(ctx, data.Uses, data.ExpiresAt)
+		if err != nil {
+			log.Err(err).Msg("failed to create new token")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
+
+		return server.Respond(w, http.StatusCreated, GroupInvitation{
 			Token:     token,
-			ExpiresAt: body.ExpiresAt,
-			Uses:      body.Uses,
-		}, err
+			ExpiresAt: data.ExpiresAt,
+			Uses:      data.Uses,
+		})
 	}
-
-	return adapters.Action(fn, http.StatusCreated)
 }

backend/app/api/handlers/v1/v1_ctrl_item_templates.go

@@ -1,164 +0,0 @@
-package v1
-
-import (
-	"net/http"
-
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
-)
-
-// HandleItemTemplatesGetAll godoc
-//
-//	@Summary	Get All Item Templates
-//	@Tags		Item Templates
-//	@Produce	json
-//	@Success	200	{object}	[]repo.ItemTemplateSummary
-//	@Router		/v1/templates [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemTemplatesGetAll() errchain.HandlerFunc {
-	fn := func(r *http.Request) ([]repo.ItemTemplateSummary, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.ItemTemplates.GetAll(r.Context(), auth.GID)
-	}
-
-	return adapters.Command(fn, http.StatusOK)
-}
-
-// HandleItemTemplatesGet godoc
-//
-//	@Summary	Get Item Template
-//	@Tags		Item Templates
-//	@Produce	json
-//	@Param		id	path		string	true	"Template ID"
-//	@Success	200	{object}	repo.ItemTemplateOut
-//	@Router		/v1/templates/{id} [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemTemplatesGet() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) (repo.ItemTemplateOut, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.ItemTemplates.GetOne(r.Context(), auth.GID, ID)
-	}
-
-	return adapters.CommandID("id", fn, http.StatusOK)
-}
-
-// HandleItemTemplatesCreate godoc
-//
-//	@Summary	Create Item Template
-//	@Tags		Item Templates
-//	@Produce	json
-//	@Param		payload	body		repo.ItemTemplateCreate	true	"Template Data"
-//	@Success	201		{object}	repo.ItemTemplateOut
-//	@Router		/v1/templates [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemTemplatesCreate() errchain.HandlerFunc {
-	fn := func(r *http.Request, body repo.ItemTemplateCreate) (repo.ItemTemplateOut, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.ItemTemplates.Create(r.Context(), auth.GID, body)
-	}
-
-	return adapters.Action(fn, http.StatusCreated)
-}
-
-// HandleItemTemplatesUpdate godoc
-//
-//	@Summary	Update Item Template
-//	@Tags		Item Templates
-//	@Produce	json
-//	@Param		id		path		string					true	"Template ID"
-//	@Param		payload	body		repo.ItemTemplateUpdate	true	"Template Data"
-//	@Success	200		{object}	repo.ItemTemplateOut
-//	@Router		/v1/templates/{id} [PUT]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemTemplatesUpdate() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID, body repo.ItemTemplateUpdate) (repo.ItemTemplateOut, error) {
-		auth := services.NewContext(r.Context())
-		body.ID = ID
-		return ctrl.repo.ItemTemplates.Update(r.Context(), auth.GID, body)
-	}
-
-	return adapters.ActionID("id", fn, http.StatusOK)
-}
-
-// HandleItemTemplatesDelete godoc
-//
-//	@Summary	Delete Item Template
-//	@Tags		Item Templates
-//	@Produce	json
-//	@Param		id	path	string	true	"Template ID"
-//	@Success	204
-//	@Router		/v1/templates/{id} [DELETE]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemTemplatesDelete() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) (any, error) {
-		auth := services.NewContext(r.Context())
-		err := ctrl.repo.ItemTemplates.Delete(r.Context(), auth.GID, ID)
-		return nil, err
-	}
-
-	return adapters.CommandID("id", fn, http.StatusNoContent)
-}
-
-type ItemTemplateCreateItemRequest struct {
-	Name        string      `json:"name"        validate:"required,min=1,max=255"`
-	Description string      `json:"description" validate:"max=1000"`
-	LocationID  uuid.UUID   `json:"locationId"  validate:"required"`
-	LabelIDs    []uuid.UUID `json:"labelIds"`
-	Quantity    *int        `json:"quantity"`
-}
-
-// HandleItemTemplatesCreateItem godoc
-//
-//	@Summary	Create Item from Template
-//	@Tags		Item Templates
-//	@Produce	json
-//	@Param		id		path		string							true	"Template ID"
-//	@Param		payload	body		ItemTemplateCreateItemRequest	true	"Item Data"
-//	@Success	201		{object}	repo.ItemOut
-//	@Router		/v1/templates/{id}/create-item [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemTemplatesCreateItem() errchain.HandlerFunc {
-	fn := func(r *http.Request, templateID uuid.UUID, body ItemTemplateCreateItemRequest) (repo.ItemOut, error) {
-		auth := services.NewContext(r.Context())
-
-		template, err := ctrl.repo.ItemTemplates.GetOne(r.Context(), auth.GID, templateID)
-		if err != nil {
-			return repo.ItemOut{}, err
-		}
-
-		quantity := template.DefaultQuantity
-		if body.Quantity != nil {
-			quantity = *body.Quantity
-		}
-
-		// Build custom fields from template
-		fields := make([]repo.ItemField, len(template.Fields))
-		for i, f := range template.Fields {
-			fields[i] = repo.ItemField{
-				Type:      f.Type,
-				Name:      f.Name,
-				TextValue: f.TextValue,
-			}
-		}
-
-		// Create item with all template data in a single transaction
-		return ctrl.repo.Items.CreateFromTemplate(r.Context(), auth.GID, repo.ItemCreateFromTemplate{
-			Name:             body.Name,
-			Description:      body.Description,
-			Quantity:         quantity,
-			LocationID:       body.LocationID,
-			LabelIDs:         body.LabelIDs,
-			Insured:          template.DefaultInsured,
-			Manufacturer:     template.DefaultManufacturer,
-			ModelNumber:      template.DefaultModelNumber,
-			LifetimeWarranty: template.DefaultLifetimeWarranty,
-			WarrantyDetails:  template.DefaultWarrantyDetails,
-			Fields:           fields,
-		})
-	}
-
-	return adapters.ActionID("id", fn, http.StatusCreated)
-}

backend/app/api/handlers/v1/v1_ctrl_items.go

@@ -1,330 +1,171 @@
 package v1
 
 import (
-	"database/sql"
 	"encoding/csv"
-	"errors"
-	"fmt"
-	"math/big"
 	"net/http"
-	"strings"
-	"time"
 
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/server"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
 	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
 )
 
 // HandleItemsGetAll godoc
-//
-//	@Summary	Query All Items
-//	@Tags		Items
-//	@Produce	json
-//	@Param		q			query		string		false	"search string"
-//	@Param		page		query		int			false	"page number"
-//	@Param		pageSize	query		int			false	"items per page"
-//	@Param		labels		query		[]string	false	"label Ids"		collectionFormat(multi)
-//	@Param		locations	query		[]string	false	"location Ids"	collectionFormat(multi)
-//	@Param		parentIds	query		[]string	false	"parent Ids"	collectionFormat(multi)
-//	@Success	200			{object}	repo.PaginationResult[repo.ItemSummary]{}
-//	@Router		/v1/items [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemsGetAll() errchain.HandlerFunc {
+// @Summary  Get All Items
+// @Tags     Items
+// @Produce  json
+// @Param    q         query    string   false "search string"
+// @Param    page      query    int      false "page number"
+// @Param    pageSize  query    int      false "items per page"
+// @Param    labels    query    []string false "label Ids"    collectionFormat(multi)
+// @Param    locations query    []string false "location Ids" collectionFormat(multi)
+// @Success  200       {object} repo.PaginationResult[repo.ItemSummary]{}
+// @Router   /v1/items [GET]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemsGetAll() server.HandlerFunc {
+
 	extractQuery := func(r *http.Request) repo.ItemQuery {
 		params := r.URL.Query()
 
-		filterFieldItems := func(raw []string) []repo.FieldQuery {
-			var items []repo.FieldQuery
-
-			for _, v := range raw {
-				parts := strings.SplitN(v, "=", 2)
-				if len(parts) == 2 {
-					items = append(items, repo.FieldQuery{
-						Name:  parts[0],
-						Value: parts[1],
-					})
-				}
-			}
-
-			return items
+		return repo.ItemQuery{
+			Page:            queryIntOrNegativeOne(params.Get("page")),
+			PageSize:        queryIntOrNegativeOne(params.Get("perPage")),
+			Search:          params.Get("q"),
+			LocationIDs:     queryUUIDList(params, "locations"),
+			LabelIDs:        queryUUIDList(params, "labels"),
+			IncludeArchived: queryBool(params.Get("includeArchived")),
 		}
-
-		v := repo.ItemQuery{
-			Page:             queryIntOrNegativeOne(params.Get("page")),
-			PageSize:         queryIntOrNegativeOne(params.Get("pageSize")),
-			Search:           params.Get("q"),
-			LocationIDs:      queryUUIDList(params, "locations"),
-			LabelIDs:         queryUUIDList(params, "labels"),
-			NegateLabels:     queryBool(params.Get("negateLabels")),
-			OnlyWithoutPhoto: queryBool(params.Get("onlyWithoutPhoto")),
-			OnlyWithPhoto:    queryBool(params.Get("onlyWithPhoto")),
-			ParentItemIDs:    queryUUIDList(params, "parentIds"),
-			IncludeArchived:  queryBool(params.Get("includeArchived")),
-			Fields:           filterFieldItems(params["fields"]),
-			OrderBy:          params.Get("orderBy"),
-		}
-
-		if strings.HasPrefix(v.Search, "#") {
-			aidStr := strings.TrimPrefix(v.Search, "#")
-
-			aid, ok := repo.ParseAssetID(aidStr)
-			if ok {
-				v.Search = ""
-				v.AssetID = aid
-			}
-		}
-
-		return v
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) error {
 		ctx := services.NewContext(r.Context())
-
 		items, err := ctrl.repo.Items.QueryByGroup(ctx, ctx.GID, extractQuery(r))
-		totalPrice := new(big.Int)
-		for _, item := range items.Items {
-			if !item.SoldTime.IsZero() { // Skip items with a non-null SoldDate
-				continue
-			}
-			totalPrice.Add(totalPrice, big.NewInt(int64(item.PurchasePrice*100)))
-		}
-
-		totalPriceFloat := new(big.Float).SetInt(totalPrice)
-		totalPriceFloat.Quo(totalPriceFloat, big.NewFloat(100))
-
 		if err != nil {
-			if errors.Is(err, sql.ErrNoRows) {
-				return server.JSON(w, http.StatusOK, repo.PaginationResult[repo.ItemSummary]{
-					Items: []repo.ItemSummary{},
-				})
-			}
 			log.Err(err).Msg("failed to get items")
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
-		return server.JSON(w, http.StatusOK, items)
+		return server.Respond(w, http.StatusOK, items)
 	}
 }
 
-// HandleItemFullPath godoc
-//
-//	@Summary	Get the full path of an item
-//	@Tags		Items
-//	@Produce	json
-//	@Param		id	path		string	true	"Item ID"
-//	@Success	200	{object}	[]repo.ItemPath
-//	@Router		/v1/items/{id}/path [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemFullPath() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) ([]repo.ItemPath, error) {
-		auth := services.NewContext(r.Context())
-		item, err := ctrl.repo.Items.GetOneByGroup(auth, auth.GID, ID)
-		if err != nil {
-			return nil, err
-		}
-
-		paths, err := ctrl.repo.Locations.PathForLoc(auth, auth.GID, item.Location.ID)
-		if err != nil {
-			return nil, err
-		}
-
-		if item.Parent != nil {
-			paths = append(paths, repo.ItemPath{
-				Type: repo.ItemTypeItem,
-				ID:   item.Parent.ID,
-				Name: item.Parent.Name,
-			})
-		}
-
-		paths = append(paths, repo.ItemPath{
-			Type: repo.ItemTypeItem,
-			ID:   item.ID,
-			Name: item.Name,
-		})
-
-		return paths, nil
-	}
-
-	return adapters.CommandID("id", fn, http.StatusOK)
-}
-
 // HandleItemsCreate godoc
-//
-//	@Summary	Create Item
-//	@Tags		Items
-//	@Produce	json
-//	@Param		payload	body		repo.ItemCreate	true	"Item Data"
-//	@Success	201		{object}	repo.ItemSummary
-//	@Router		/v1/items [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemsCreate() errchain.HandlerFunc {
-	fn := func(r *http.Request, body repo.ItemCreate) (repo.ItemOut, error) {
-		return ctrl.svc.Items.Create(services.NewContext(r.Context()), body)
-	}
+// @Summary  Create a new item
+// @Tags     Items
+// @Produce  json
+// @Param    payload body     repo.ItemCreate true "Item Data"
+// @Success  200     {object} repo.ItemSummary
+// @Router   /v1/items [POST]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemsCreate() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		createData := repo.ItemCreate{}
+		if err := server.Decode(r, &createData); err != nil {
+			log.Err(err).Msg("failed to decode request body")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
 
-	return adapters.Action(fn, http.StatusCreated)
+		user := services.UseUserCtx(r.Context())
+		item, err := ctrl.repo.Items.Create(r.Context(), user.GroupID, createData)
+		if err != nil {
+			log.Err(err).Msg("failed to create item")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
+
+		return server.Respond(w, http.StatusCreated, item)
+	}
 }
 
 // HandleItemGet godocs
-//
-//	@Summary	Get Item
-//	@Tags		Items
-//	@Produce	json
-//	@Param		id	path		string	true	"Item ID"
-//	@Success	200	{object}	repo.ItemOut
-//	@Router		/v1/items/{id} [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemGet() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) (repo.ItemOut, error) {
-		auth := services.NewContext(r.Context())
-
-		return ctrl.repo.Items.GetOneByGroup(auth, auth.GID, ID)
-	}
-
-	return adapters.CommandID("id", fn, http.StatusOK)
+// @Summary  Gets a item and fields
+// @Tags     Items
+// @Produce  json
+// @Param    id  path     string true "Item ID"
+// @Success  200 {object} repo.ItemOut
+// @Router   /v1/items/{id} [GET]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemGet() server.HandlerFunc {
+	return ctrl.handleItemsGeneral()
 }
 
 // HandleItemDelete godocs
-//
-//	@Summary	Delete Item
-//	@Tags		Items
-//	@Produce	json
-//	@Param		id	path	string	true	"Item ID"
-//	@Success	204
-//	@Router		/v1/items/{id} [DELETE]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemDelete() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) (any, error) {
-		auth := services.NewContext(r.Context())
-		err := ctrl.repo.Items.DeleteByGroup(auth, auth.GID, ID)
-		return nil, err
-	}
-
-	return adapters.CommandID("id", fn, http.StatusNoContent)
+// @Summary  deletes a item
+// @Tags     Items
+// @Produce  json
+// @Param    id path string true "Item ID"
+// @Success  204
+// @Router   /v1/items/{id} [DELETE]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemDelete() server.HandlerFunc {
+	return ctrl.handleItemsGeneral()
 }
 
 // HandleItemUpdate godocs
-//
-//	@Summary	Update Item
-//	@Tags		Items
-//	@Produce	json
-//	@Param		id		path		string			true	"Item ID"
-//	@Param		payload	body		repo.ItemUpdate	true	"Item Data"
-//	@Success	200		{object}	repo.ItemOut
-//	@Router		/v1/items/{id} [PUT]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemUpdate() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID, body repo.ItemUpdate) (repo.ItemOut, error) {
-		auth := services.NewContext(r.Context())
-
-		body.ID = ID
-		return ctrl.repo.Items.UpdateByGroup(auth, auth.GID, body)
-	}
-
-	return adapters.ActionID("id", fn, http.StatusOK)
+// @Summary  updates a item
+// @Tags     Items
+// @Produce  json
+// @Param    id      path     string          true "Item ID"
+// @Param    payload body     repo.ItemUpdate true "Item Data"
+// @Success  200     {object} repo.ItemOut
+// @Router   /v1/items/{id} [PUT]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemUpdate() server.HandlerFunc {
+	return ctrl.handleItemsGeneral()
 }
 
-// HandleItemPatch godocs
-//
-//	@Summary	Update Item
-//	@Tags		Items
-//	@Produce	json
-//	@Param		id		path		string			true	"Item ID"
-//	@Param		payload	body		repo.ItemPatch	true	"Item Data"
-//	@Success	200		{object}	repo.ItemOut
-//	@Router		/v1/items/{id} [Patch]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemPatch() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID, body repo.ItemPatch) (repo.ItemOut, error) {
-		auth := services.NewContext(r.Context())
-
-		body.ID = ID
-		err := ctrl.repo.Items.Patch(auth, auth.GID, ID, body)
+func (ctrl *V1Controller) handleItemsGeneral() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		ctx := services.NewContext(r.Context())
+		ID, err := ctrl.routeID(r)
 		if err != nil {
-			return repo.ItemOut{}, err
+			return err
 		}
 
-		return ctrl.repo.Items.GetOneByGroup(auth, auth.GID, ID)
+		switch r.Method {
+		case http.MethodGet:
+			items, err := ctrl.repo.Items.GetOneByGroup(r.Context(), ctx.GID, ID)
+			if err != nil {
+				log.Err(err).Msg("failed to get item")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			return server.Respond(w, http.StatusOK, items)
+		case http.MethodDelete:
+			err = ctrl.repo.Items.DeleteByGroup(r.Context(), ctx.GID, ID)
+			if err != nil {
+				log.Err(err).Msg("failed to delete item")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			return server.Respond(w, http.StatusNoContent, nil)
+		case http.MethodPut:
+			body := repo.ItemUpdate{}
+			if err := server.Decode(r, &body); err != nil {
+				log.Err(err).Msg("failed to decode request body")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			body.ID = ID
+			result, err := ctrl.repo.Items.UpdateByGroup(r.Context(), ctx.GID, body)
+			if err != nil {
+				log.Err(err).Msg("failed to update item")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			return server.Respond(w, http.StatusOK, result)
+		}
+
+		return nil
 	}
-
-	return adapters.ActionID("id", fn, http.StatusOK)
-}
-
-// HandleItemDuplicate godocs
-//
-//	@Summary	Duplicate Item
-//	@Tags		Items
-//	@Produce	json
-//	@Param		id		path		string					true	"Item ID"
-//	@Param		payload	body		repo.DuplicateOptions	true	"Duplicate Options"
-//	@Success	201		{object}	repo.ItemOut
-//	@Router		/v1/items/{id}/duplicate [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemDuplicate() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID, options repo.DuplicateOptions) (repo.ItemOut, error) {
-		ctx := services.NewContext(r.Context())
-		return ctrl.svc.Items.Duplicate(ctx, ctx.GID, ID, options)
-	}
-
-	return adapters.ActionID("id", fn, http.StatusCreated)
-}
-
-// HandleGetAllCustomFieldNames godocs
-//
-//	@Summary	Get All Custom Field Names
-//	@Tags		Items
-//	@Produce	json
-//	@Success	200
-//	@Router		/v1/items/fields [GET]
-//	@Success	200	{object}	[]string
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGetAllCustomFieldNames() errchain.HandlerFunc {
-	fn := func(r *http.Request) ([]string, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Items.GetAllCustomFieldNames(auth, auth.GID)
-	}
-
-	return adapters.Command(fn, http.StatusOK)
-}
-
-// HandleGetAllCustomFieldValues godocs
-//
-//	@Summary	Get All Custom Field Values
-//	@Tags		Items
-//	@Produce	json
-//	@Success	200
-//	@Router		/v1/items/fields/values [GET]
-//	@Success	200	{object}	[]string
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGetAllCustomFieldValues() errchain.HandlerFunc {
-	type query struct {
-		Field string `schema:"field" validate:"required"`
-	}
-
-	fn := func(r *http.Request, q query) ([]string, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Items.GetAllCustomFieldValues(auth, auth.GID, q.Field)
-	}
-
-	return adapters.Query(fn, http.StatusOK)
 }
 
 // HandleItemsImport godocs
-//
-//	@Summary	Import Items
-//	@Tags		Items
-//	@Accept		multipart/form-data
-//	@Produce	json
-//	@Success	204
-//	@Param		csv	formData	file	true	"Image to upload"
-//	@Router		/v1/items/import [Post]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemsImport() errchain.HandlerFunc {
+// @Summary  imports items into the database
+// @Tags     Items
+// @Produce  json
+// @Success  204
+// @Param    csv formData file true "Image to upload"
+// @Router   /v1/items/import [Post]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemsImport() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
+
 		err := r.ParseMultipartForm(ctrl.maxUploadSize << 20)
 		if err != nil {
 			log.Err(err).Msg("failed to parse multipart form")
@@ -337,43 +178,21 @@ func (ctrl *V1Controller) HandleItemsImport() errchain.HandlerFunc {
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
+		reader := csv.NewReader(file)
+		data, err := reader.ReadAll()
+		if err != nil {
+			log.Err(err).Msg("failed to read csv")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
+
 		user := services.UseUserCtx(r.Context())
 
-		_, err = ctrl.svc.Items.CsvImport(r.Context(), user.GroupID, file)
+		_, err = ctrl.svc.Items.CsvImport(r.Context(), user.GroupID, data)
 		if err != nil {
 			log.Err(err).Msg("failed to import items")
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		return server.JSON(w, http.StatusNoContent, nil)
-	}
-}
-
-// HandleItemsExport godocs
-//
-//	@Summary	Export Items
-//	@Tags		Items
-//	@Success	200	{string}	string	"text/csv"
-//	@Router		/v1/items/export [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemsExport() errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		ctx := services.NewContext(r.Context())
-
-		csvData, err := ctrl.svc.Items.ExportCSV(r.Context(), ctx.GID, GetHBURL(r.Header.Get("Referer"), ctrl.url))
-		if err != nil {
-			log.Err(err).Msg("failed to export items")
-			return validate.NewRequestError(err, http.StatusInternalServerError)
-		}
-
-		timestamp := time.Now().Format("2006-01-02_15-04-05")      // YYYY-MM-DD_HH-MM-SS format
-		filename := fmt.Sprintf("homebox-items_%s.csv", timestamp) // add timestamp to filename
-
-		w.Header().Set("Content-Type", "text/csv")
-		w.Header().Set("Content-Disposition", fmt.Sprintf("attachment;filename=%s", filename))
-
-		writer := csv.NewWriter(w)
-		writer.Comma = ','
-		return writer.WriteAll(csvData)
+		return server.Respond(w, http.StatusNoContent, nil)
 	}
 }

backend/app/api/handlers/v1/v1_ctrl_items_attachments.go

@@ -2,26 +2,15 @@ package v1
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
-	"net/url"
-	"path/filepath"
-	"strconv"
-	"strings"
 
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/server"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/data/ent/attachment"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
 	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/ent/attachment"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
-
-	"gocloud.dev/blob"
-	_ "gocloud.dev/blob/azureblob"
-	_ "gocloud.dev/blob/fileblob"
-	_ "gocloud.dev/blob/gcsblob"
-	_ "gocloud.dev/blob/memblob"
-	_ "gocloud.dev/blob/s3blob"
 )
 
 type (
@@ -30,27 +19,25 @@ type (
 	}
 )
 
-// HandleItemAttachmentCreate godocs
-//
-//	@Summary	Create Item Attachment
-//	@Tags		Items Attachments
-//	@Accept		multipart/form-data
-//	@Produce	json
-//	@Param		id		path		string	true	"Item ID"
-//	@Param		file	formData	file	true	"File attachment"
-//	@Param		type	formData	string	false	"Type of file"
-//	@Param		primary	formData	bool	false	"Is this the primary attachment"
-//	@Param		name	formData	string	true	"name of the file including extension"
-//	@Success	200		{object}	repo.ItemOut
-//	@Failure	422		{object}	validate.ErrorResponse
-//	@Router		/v1/items/{id}/attachments [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemAttachmentCreate() errchain.HandlerFunc {
+// HandleItemsImport godocs
+// @Summary  imports items into the database
+// @Tags     Items Attachments
+// @Produce  json
+// @Param    id   path     string true "Item ID"
+// @Param    file formData file   true "File attachment"
+// @Param    type formData string true "Type of file"
+// @Param    name formData string true "name of the file including extension"
+// @Success  200  {object} repo.ItemOut
+// @Failure  422  {object} server.ErrorResponse
+// @Router   /v1/items/{id}/attachments [POST]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemAttachmentCreate() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
 		err := r.ParseMultipartForm(ctrl.maxUploadSize << 20)
 		if err != nil {
 			log.Err(err).Msg("failed to parse multipart form")
 			return validate.NewRequestError(errors.New("failed to parse multipart form"), http.StatusBadRequest)
+
 		}
 
 		errs := validate.NewFieldErrors()
@@ -74,26 +61,12 @@ func (ctrl *V1Controller) HandleItemAttachmentCreate() errchain.HandlerFunc {
 		}
 
 		if !errs.Nil() {
-			return server.JSON(w, http.StatusUnprocessableEntity, errs)
+			return server.Respond(w, http.StatusUnprocessableEntity, errs)
 		}
 
 		attachmentType := r.FormValue("type")
 		if attachmentType == "" {
-			// Attempt to auto-detect the type of the file
-			ext := filepath.Ext(attachmentName)
-
-			switch strings.ToLower(ext) {
-			case ".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".tiff", ".avif", ".ico", ".heic", ".jxl":
-				attachmentType = attachment.TypePhoto.String()
-			default:
-				attachmentType = attachment.TypeAttachment.String()
-			}
-		}
-
-		primary, err := strconv.ParseBool(r.FormValue("primary"))
-		if err != nil {
-			log.Debug().Msg("failed to parse primary from form")
-			primary = false
+			attachmentType = attachment.TypeAttachment.String()
 		}
 
 		id, err := ctrl.routeID(r)
@@ -108,56 +81,80 @@ func (ctrl *V1Controller) HandleItemAttachmentCreate() errchain.HandlerFunc {
 			id,
 			attachmentName,
 			attachment.Type(attachmentType),
-			primary,
 			file,
 		)
+
 		if err != nil {
 			log.Err(err).Msg("failed to add attachment")
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		return server.JSON(w, http.StatusCreated, item)
+		return server.Respond(w, http.StatusCreated, item)
 	}
 }
 
 // HandleItemAttachmentGet godocs
-//
-//	@Summary	Get Item Attachment
-//	@Tags		Items Attachments
-//	@Produce	application/octet-stream
-//	@Param		id				path		string	true	"Item ID"
-//	@Param		attachment_id	path		string	true	"Attachment ID"
-//	@Success	200				{object}	ItemAttachmentToken
-//	@Router		/v1/items/{id}/attachments/{attachment_id} [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemAttachmentGet() errchain.HandlerFunc {
+// @Summary  retrieves an attachment for an item
+// @Tags     Items Attachments
+// @Produce  application/octet-stream
+// @Param    id    path  string true "Item ID"
+// @Param    token query string true "Attachment token"
+// @Success  200
+// @Router   /v1/items/{id}/attachments/download [GET]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemAttachmentDownload() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		token := server.GetParam(r, "token", "")
+
+		doc, err := ctrl.svc.Items.AttachmentPath(r.Context(), token)
+
+		if err != nil {
+			log.Err(err).Msg("failed to get attachment")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
+
+		w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", doc.Title))
+		w.Header().Set("Content-Type", "application/octet-stream")
+		http.ServeFile(w, r, doc.Path)
+		return nil
+	}
+}
+
+// HandleItemAttachmentToken godocs
+// @Summary  retrieves an attachment for an item
+// @Tags     Items Attachments
+// @Produce  application/octet-stream
+// @Param    id            path     string true "Item ID"
+// @Param    attachment_id path     string true "Attachment ID"
+// @Success  200           {object} ItemAttachmentToken
+// @Router   /v1/items/{id}/attachments/{attachment_id} [GET]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemAttachmentToken() server.HandlerFunc {
 	return ctrl.handleItemAttachmentsHandler
 }
 
 // HandleItemAttachmentDelete godocs
-//
-//	@Summary	Delete Item Attachment
-//	@Tags		Items Attachments
-//	@Param		id				path	string	true	"Item ID"
-//	@Param		attachment_id	path	string	true	"Attachment ID"
-//	@Success	204
-//	@Router		/v1/items/{id}/attachments/{attachment_id} [DELETE]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemAttachmentDelete() errchain.HandlerFunc {
+// @Summary  retrieves an attachment for an item
+// @Tags     Items Attachments
+// @Param    id            path string true "Item ID"
+// @Param    attachment_id path string true "Attachment ID"
+// @Success  204
+// @Router   /v1/items/{id}/attachments/{attachment_id} [DELETE]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemAttachmentDelete() server.HandlerFunc {
 	return ctrl.handleItemAttachmentsHandler
 }
 
 // HandleItemAttachmentUpdate godocs
-//
-//	@Summary	Update Item Attachment
-//	@Tags		Items Attachments
-//	@Param		id				path		string						true	"Item ID"
-//	@Param		attachment_id	path		string						true	"Attachment ID"
-//	@Param		payload			body		repo.ItemAttachmentUpdate	true	"Attachment Update"
-//	@Success	200				{object}	repo.ItemOut
-//	@Router		/v1/items/{id}/attachments/{attachment_id} [PUT]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleItemAttachmentUpdate() errchain.HandlerFunc {
+// @Summary  retrieves an attachment for an item
+// @Tags     Items Attachments
+// @Param    id            path     string                    true "Item ID"
+// @Param    attachment_id path     string                    true "Attachment ID"
+// @Param    payload       body     repo.ItemAttachmentUpdate true "Attachment Update"
+// @Success  200           {object} repo.ItemOut
+// @Router   /v1/items/{id}/attachments/{attachment_id} [PUT]
+// @Security Bearer
+func (ctrl *V1Controller) HandleItemAttachmentUpdate() server.HandlerFunc {
 	return ctrl.handleItemAttachmentsHandler
 }
 
@@ -174,41 +171,33 @@ func (ctrl *V1Controller) handleItemAttachmentsHandler(w http.ResponseWriter, r
 
 	ctx := services.NewContext(r.Context())
 	switch r.Method {
+	// Token Handler
 	case http.MethodGet:
-		doc, err := ctrl.svc.Items.AttachmentPath(r.Context(), ctx.GID, attachmentID)
+		token, err := ctrl.svc.Items.AttachmentToken(ctx, ID, attachmentID)
 		if err != nil {
-			log.Err(err).Msg("failed to get attachment path")
-			return validate.NewRequestError(err, http.StatusInternalServerError)
+			switch err {
+			case services.ErrNotFound:
+				log.Err(err).
+					Str("id", attachmentID.String()).
+					Msg("failed to find attachment with id")
+
+				return validate.NewRequestError(err, http.StatusNotFound)
+
+			case services.ErrFileNotFound:
+				log.Err(err).
+					Str("id", attachmentID.String()).
+					Msg("failed to find file path for attachment with id")
+				log.Warn().Msg("attachment with no file path removed from database")
+
+				return validate.NewRequestError(err, http.StatusNotFound)
+
+			default:
+				log.Err(err).Msg("failed to get attachment")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
 		}
 
-		bucket, err := blob.OpenBucket(ctx, ctrl.repo.Attachments.GetConnString())
-		if err != nil {
-			log.Err(err).Msg("failed to open bucket")
-			return validate.NewRequestError(err, http.StatusInternalServerError)
-		}
-		file, err := bucket.NewReader(ctx, ctrl.repo.Attachments.GetFullPath(doc.Path), nil)
-		if err != nil {
-			log.Err(err).Msg("failed to open file")
-			return validate.NewRequestError(err, http.StatusInternalServerError)
-		}
-		defer func(file *blob.Reader) {
-			err := file.Close()
-			if err != nil {
-				log.Err(err).Msg("failed to close file")
-			}
-		}(file)
-		defer func(bucket *blob.Bucket) {
-			err := bucket.Close()
-			if err != nil {
-				log.Err(err).Msg("failed to close bucket")
-			}
-		}(bucket)
-
-		// Set the Content-Disposition header for RFC6266 compliance
-		disposition := "inline; filename*=UTF-8''" + url.QueryEscape(doc.Title)
-		w.Header().Set("Content-Disposition", disposition)
-		http.ServeContent(w, r, doc.Title, doc.CreatedAt, file)
-		return nil
+		return server.Respond(w, http.StatusOK, ItemAttachmentToken{Token: token})
 
 	// Delete Attachment Handler
 	case http.MethodDelete:
@@ -218,7 +207,7 @@ func (ctrl *V1Controller) handleItemAttachmentsHandler(w http.ResponseWriter, r
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		return server.JSON(w, http.StatusNoContent, nil)
+		return server.Respond(w, http.StatusNoContent, nil)
 
 	// Update Attachment Handler
 	case http.MethodPut:
@@ -230,13 +219,13 @@ func (ctrl *V1Controller) handleItemAttachmentsHandler(w http.ResponseWriter, r
 		}
 
 		attachment.ID = attachmentID
-		val, err := ctrl.svc.Items.AttachmentUpdate(ctx, ctx.GID, ID, &attachment)
+		val, err := ctrl.svc.Items.AttachmentUpdate(ctx, ID, &attachment)
 		if err != nil {
-			log.Err(err).Msg("failed to update attachment")
+			log.Err(err).Msg("failed to delete attachment")
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		return server.JSON(w, http.StatusOK, val)
+		return server.Respond(w, http.StatusOK, val)
 	}
 
 	return nil

backend/app/api/handlers/v1/v1_ctrl_labelmaker.go

@@ -1,136 +0,0 @@
-package v1
-
-import (
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/go-chi/chi/v5"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
-	"github.com/sysadminsmedia/homebox/backend/pkgs/labelmaker"
-)
-
-func generateOrPrint(ctrl *V1Controller, w http.ResponseWriter, r *http.Request, title string, description string, url string) error {
-	params := labelmaker.NewGenerateParams(int(ctrl.config.LabelMaker.Width), int(ctrl.config.LabelMaker.Height), int(ctrl.config.LabelMaker.Margin), int(ctrl.config.LabelMaker.Padding), ctrl.config.LabelMaker.FontSize, title, description, url, ctrl.config.LabelMaker.DynamicLength, ctrl.config.LabelMaker.AdditionalInformation)
-
-	print := queryBool(r.URL.Query().Get("print"))
-
-	if print {
-		err := labelmaker.PrintLabel(ctrl.config, &params)
-		if err != nil {
-			return err
-		}
-
-		_, err = w.Write([]byte("Printed!"))
-		return err
-	} else {
-		return labelmaker.GenerateLabel(w, &params, ctrl.config)
-	}
-}
-
-// HandleGetLocationLabel godoc
-//
-//	@Summary	Get Location label
-//	@Tags		Locations
-//	@Produce	json
-//	@Param		id		path		string	true	"Location ID"
-//	@Param		print	query		bool	false	"Print this label, defaults to false"
-//	@Success	200		{string}	string	"image/png"
-//	@Router		/v1/labelmaker/location/{id} [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGetLocationLabel() errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		ID, err := adapters.RouteUUID(r, "id")
-		if err != nil {
-			return err
-		}
-
-		auth := services.NewContext(r.Context())
-		location, err := ctrl.repo.Locations.GetOneByGroup(auth, auth.GID, ID)
-		if err != nil {
-			return err
-		}
-
-		hbURL := GetHBURL(r.Header.Get("Referer"), ctrl.url)
-		return generateOrPrint(ctrl, w, r, location.Name, "Homebox Location", fmt.Sprintf("%s/location/%s", hbURL, location.ID))
-	}
-}
-
-// HandleGetItemLabel godoc
-//
-//	@Summary	Get Item label
-//	@Tags		Items
-//	@Produce	json
-//	@Param		id		path		string	true	"Item ID"
-//	@Param		print	query		bool	false	"Print this label, defaults to false"
-//	@Success	200		{string}	string	"image/png"
-//	@Router		/v1/labelmaker/item/{id} [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGetItemLabel() errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		ID, err := adapters.RouteUUID(r, "id")
-		if err != nil {
-			return err
-		}
-
-		auth := services.NewContext(r.Context())
-		item, err := ctrl.repo.Items.GetOneByGroup(auth, auth.GID, ID)
-		if err != nil {
-			return err
-		}
-
-		description := ""
-
-		if item.Location != nil {
-			description += fmt.Sprintf("\nLocation: %s", item.Location.Name)
-		}
-
-		hbURL := GetHBURL(r.Header.Get("Referer"), ctrl.url)
-		return generateOrPrint(ctrl, w, r, item.Name, description, fmt.Sprintf("%s/item/%s", hbURL, item.ID))
-	}
-}
-
-// HandleGetAssetLabel godoc
-//
-//	@Summary	Get Asset label
-//	@Tags		Items
-//	@Produce	json
-//	@Param		id		path		string	true	"Asset ID"
-//	@Param		print	query		bool	false	"Print this label, defaults to false"
-//	@Success	200		{string}	string	"image/png"
-//	@Router		/v1/labelmaker/assets/{id} [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGetAssetLabel() errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		assetIDParam := chi.URLParam(r, "id")
-		assetIDParam = strings.ReplaceAll(assetIDParam, "-", "")
-		assetID, err := strconv.ParseInt(assetIDParam, 10, 64)
-		if err != nil {
-			return err
-		}
-
-		auth := services.NewContext(r.Context())
-		item, err := ctrl.repo.Items.QueryByAssetID(auth, auth.GID, repo.AssetID(assetID), 0, 1)
-		if err != nil {
-			return err
-		}
-
-		if len(item.Items) == 0 {
-			return validate.NewRequestError(fmt.Errorf("failed to find asset id"), http.StatusNotFound)
-		}
-
-		description := item.Items[0].Name
-
-		if item.Items[0].Location != nil {
-			description += fmt.Sprintf("\nLocation: %s", item.Items[0].Location.Name)
-		}
-
-		hbURL := GetHBURL(r.Header.Get("Referer"), ctrl.url)
-		return generateOrPrint(ctrl, w, r, item.Items[0].AssetID.String(), description, fmt.Sprintf("%s/a/%s", hbURL, item.Items[0].AssetID.String()))
-	}
-}

backend/app/api/handlers/v1/v1_ctrl_labels.go

@@ -3,100 +3,141 @@ package v1
 import (
 	"net/http"
 
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/data/ent"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
+	"github.com/rs/zerolog/log"
 )
 
 // HandleLabelsGetAll godoc
-//
-//	@Summary	Get All Labels
-//	@Tags		Labels
-//	@Produce	json
-//	@Success	200	{object}	[]repo.LabelOut
-//	@Router		/v1/labels [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLabelsGetAll() errchain.HandlerFunc {
-	fn := func(r *http.Request) ([]repo.LabelSummary, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Labels.GetAll(auth, auth.GID)
+// @Summary  Get All Labels
+// @Tags     Labels
+// @Produce  json
+// @Success  200 {object} server.Results{items=[]repo.LabelOut}
+// @Router   /v1/labels [GET]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLabelsGetAll() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		user := services.UseUserCtx(r.Context())
+		labels, err := ctrl.repo.Labels.GetAll(r.Context(), user.GroupID)
+		if err != nil {
+			log.Err(err).Msg("error getting labels")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
+		return server.Respond(w, http.StatusOK, server.Results{Items: labels})
 	}
-
-	return adapters.Command(fn, http.StatusOK)
 }
 
 // HandleLabelsCreate godoc
-//
-//	@Summary	Create Label
-//	@Tags		Labels
-//	@Produce	json
-//	@Param		payload	body		repo.LabelCreate	true	"Label Data"
-//	@Success	200		{object}	repo.LabelSummary
-//	@Router		/v1/labels [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLabelsCreate() errchain.HandlerFunc {
-	fn := func(r *http.Request, data repo.LabelCreate) (repo.LabelOut, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Labels.Create(auth, auth.GID, data)
-	}
+// @Summary  Create a new label
+// @Tags     Labels
+// @Produce  json
+// @Param    payload body     repo.LabelCreate true "Label Data"
+// @Success  200     {object} repo.LabelSummary
+// @Router   /v1/labels [POST]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLabelsCreate() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		createData := repo.LabelCreate{}
+		if err := server.Decode(r, &createData); err != nil {
+			log.Err(err).Msg("error decoding label create data")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
 
-	return adapters.Action(fn, http.StatusCreated)
+		user := services.UseUserCtx(r.Context())
+		label, err := ctrl.repo.Labels.Create(r.Context(), user.GroupID, createData)
+		if err != nil {
+			log.Err(err).Msg("error creating label")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
+
+		return server.Respond(w, http.StatusCreated, label)
+	}
 }
 
 // HandleLabelDelete godocs
-//
-//	@Summary	Delete Label
-//	@Tags		Labels
-//	@Produce	json
-//	@Param		id	path	string	true	"Label ID"
-//	@Success	204
-//	@Router		/v1/labels/{id} [DELETE]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLabelDelete() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) (any, error) {
-		auth := services.NewContext(r.Context())
-		err := ctrl.repo.Labels.DeleteByGroup(auth, auth.GID, ID)
-		return nil, err
-	}
-
-	return adapters.CommandID("id", fn, http.StatusNoContent)
+// @Summary  deletes a label
+// @Tags     Labels
+// @Produce  json
+// @Param    id path string true "Label ID"
+// @Success  204
+// @Router   /v1/labels/{id} [DELETE]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLabelDelete() server.HandlerFunc {
+	return ctrl.handleLabelsGeneral()
 }
 
 // HandleLabelGet godocs
-//
-//	@Summary	Get Label
-//	@Tags		Labels
-//	@Produce	json
-//	@Param		id	path		string	true	"Label ID"
-//	@Success	200	{object}	repo.LabelOut
-//	@Router		/v1/labels/{id} [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLabelGet() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) (repo.LabelOut, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Labels.GetOneByGroup(auth, auth.GID, ID)
-	}
-
-	return adapters.CommandID("id", fn, http.StatusOK)
+// @Summary  Gets a label and fields
+// @Tags     Labels
+// @Produce  json
+// @Param    id  path     string true "Label ID"
+// @Success  200 {object} repo.LabelOut
+// @Router   /v1/labels/{id} [GET]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLabelGet() server.HandlerFunc {
+	return ctrl.handleLabelsGeneral()
 }
 
 // HandleLabelUpdate godocs
-//
-//	@Summary	Update Label
-//	@Tags		Labels
-//	@Produce	json
-//	@Param		id	path		string	true	"Label ID"
-//	@Success	200	{object}	repo.LabelOut
-//	@Router		/v1/labels/{id} [PUT]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLabelUpdate() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID, data repo.LabelUpdate) (repo.LabelOut, error) {
-		auth := services.NewContext(r.Context())
-		data.ID = ID
-		return ctrl.repo.Labels.UpdateByGroup(auth, auth.GID, data)
-	}
-
-	return adapters.ActionID("id", fn, http.StatusOK)
+// @Summary  updates a label
+// @Tags     Labels
+// @Produce  json
+// @Param    id  path     string true "Label ID"
+// @Success  200 {object} repo.LabelOut
+// @Router   /v1/labels/{id} [PUT]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLabelUpdate() server.HandlerFunc {
+	return ctrl.handleLabelsGeneral()
+}
+
+func (ctrl *V1Controller) handleLabelsGeneral() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		ctx := services.NewContext(r.Context())
+		ID, err := ctrl.routeID(r)
+		if err != nil {
+			return err
+		}
+
+		switch r.Method {
+		case http.MethodGet:
+			labels, err := ctrl.repo.Labels.GetOneByGroup(r.Context(), ctx.GID, ID)
+			if err != nil {
+				if ent.IsNotFound(err) {
+					log.Err(err).
+						Str("id", ID.String()).
+						Msg("label not found")
+					return validate.NewRequestError(err, http.StatusNotFound)
+				}
+				log.Err(err).Msg("error getting label")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			return server.Respond(w, http.StatusOK, labels)
+
+		case http.MethodDelete:
+			err = ctrl.repo.Labels.DeleteByGroup(ctx, ctx.GID, ID)
+			if err != nil {
+				log.Err(err).Msg("error deleting label")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			return server.Respond(w, http.StatusNoContent, nil)
+
+		case http.MethodPut:
+			body := repo.LabelUpdate{}
+			if err := server.Decode(r, &body); err != nil {
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+
+			body.ID = ID
+			result, err := ctrl.repo.Labels.UpdateByGroup(ctx, ctx.GID, body)
+			if err != nil {
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			return server.Respond(w, http.StatusOK, result)
+		}
+
+		return nil
+	}
 }

backend/app/api/handlers/v1/v1_ctrl_locations.go

@@ -1,168 +1,156 @@
 package v1
 
 import (
-	"context"
-	"math/big"
 	"net/http"
 
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/data/ent"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
+	"github.com/rs/zerolog/log"
 )
 
-// HandleLocationTreeQuery godoc
-//
-//	@Summary	Get Locations Tree
-//	@Tags		Locations
-//	@Produce	json
-//	@Param		withItems	query		bool	false	"include items in response tree"
-//	@Success	200			{object}	[]repo.TreeItem
-//	@Router		/v1/locations/tree [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLocationTreeQuery() errchain.HandlerFunc {
-	fn := func(r *http.Request, query repo.TreeQuery) ([]repo.TreeItem, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Locations.Tree(auth, auth.GID, query)
-	}
-
-	return adapters.Query(fn, http.StatusOK)
-}
-
 // HandleLocationGetAll godoc
-//
-//	@Summary	Get All Locations
-//	@Tags		Locations
-//	@Produce	json
-//	@Param		filterChildren	query		bool	false	"Filter locations with parents"
-//	@Success	200				{object}	[]repo.LocationOutCount
-//	@Router		/v1/locations [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLocationGetAll() errchain.HandlerFunc {
-	fn := func(r *http.Request, q repo.LocationQuery) ([]repo.LocationOutCount, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Locations.GetAll(auth, auth.GID, q)
-	}
+// @Summary  Get All Locations
+// @Tags     Locations
+// @Produce  json
+// @Param    filterChildren query bool false "Filter locations with parents"
+// @Success  200 {object} server.Results{items=[]repo.LocationOutCount}
+// @Router   /v1/locations [GET]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLocationGetAll() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		user := services.UseUserCtx(r.Context())
 
-	return adapters.Query(fn, http.StatusOK)
+		q := r.URL.Query()
+
+		filter := repo.LocationQuery{
+			FilterChildren: queryBool(q.Get("filterChildren")),
+		}
+
+		locations, err := ctrl.repo.Locations.GetAll(r.Context(), user.GroupID, filter)
+		if err != nil {
+			log.Err(err).Msg("failed to get locations")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
+		}
+
+		return server.Respond(w, http.StatusOK, server.Results{Items: locations})
+	}
 }
 
 // HandleLocationCreate godoc
-//
-//	@Summary	Create Location
-//	@Tags		Locations
-//	@Produce	json
-//	@Param		payload	body		repo.LocationCreate	true	"Location Data"
-//	@Success	200		{object}	repo.LocationSummary
-//	@Router		/v1/locations [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLocationCreate() errchain.HandlerFunc {
-	fn := func(r *http.Request, createData repo.LocationCreate) (repo.LocationOut, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Locations.Create(auth, auth.GID, createData)
-	}
-
-	return adapters.Action(fn, http.StatusCreated)
-}
-
-// HandleLocationDelete godoc
-//
-//	@Summary	Delete Location
-//	@Tags		Locations
-//	@Produce	json
-//	@Param		id	path	string	true	"Location ID"
-//	@Success	204
-//	@Router		/v1/locations/{id} [DELETE]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLocationDelete() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) (any, error) {
-		auth := services.NewContext(r.Context())
-		err := ctrl.repo.Locations.DeleteByGroup(auth, auth.GID, ID)
-		return nil, err
-	}
-
-	return adapters.CommandID("id", fn, http.StatusNoContent)
-}
-
-func (ctrl *V1Controller) GetLocationWithPrice(auth context.Context, gid uuid.UUID, id uuid.UUID) (repo.LocationOut, error) {
-	var location, err = ctrl.repo.Locations.GetOneByGroup(auth, gid, id)
-	if err != nil {
-		return repo.LocationOut{}, err
-	}
-
-	// Add direct child items price
-	totalPrice := new(big.Int)
-	items, err := ctrl.repo.Items.QueryByGroup(auth, gid, repo.ItemQuery{LocationIDs: []uuid.UUID{id}})
-	if err != nil {
-		return repo.LocationOut{}, err
-	}
-
-	for _, item := range items.Items {
-		// Skip items with a non-zero SoldTime
-		if !item.SoldTime.IsZero() {
-			continue
+// @Summary  Create a new location
+// @Tags     Locations
+// @Produce  json
+// @Param    payload body     repo.LocationCreate true "Location Data"
+// @Success  200     {object} repo.LocationSummary
+// @Router   /v1/locations [POST]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLocationCreate() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		createData := repo.LocationCreate{}
+		if err := server.Decode(r, &createData); err != nil {
+			log.Err(err).Msg("failed to decode location create data")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		// Convert item.Quantity to float64 for multiplication
-		quantity := float64(item.Quantity)
-		itemTotal := big.NewInt(int64(item.PurchasePrice * quantity * 100))
-		totalPrice.Add(totalPrice, itemTotal)
-	}
-
-	totalPriceFloat := new(big.Float).SetInt(totalPrice)
-	totalPriceFloat.Quo(totalPriceFloat, big.NewFloat(100))
-	location.TotalPrice, _ = totalPriceFloat.Float64()
-
-	// Add price from child locations
-	for _, childLocation := range location.Children {
-		var childLocationWithPrice repo.LocationOut
-		childLocationWithPrice, err = ctrl.GetLocationWithPrice(auth, gid, childLocation.ID)
+		user := services.UseUserCtx(r.Context())
+		location, err := ctrl.repo.Locations.Create(r.Context(), user.GroupID, createData)
 		if err != nil {
-			return repo.LocationOut{}, err
+			log.Err(err).Msg("failed to create location")
+			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
-		location.TotalPrice += childLocationWithPrice.TotalPrice
-	}
 
-	return location, nil
+		return server.Respond(w, http.StatusCreated, location)
+	}
 }
 
-// HandleLocationGet godoc
-//
-//	@Summary	Get Location
-//	@Tags		Locations
-//	@Produce	json
-//	@Param		id	path		string	true	"Location ID"
-//	@Success	200	{object}	repo.LocationOut
-//	@Router		/v1/locations/{id} [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLocationGet() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) (repo.LocationOut, error) {
-		auth := services.NewContext(r.Context())
-		var location, err = ctrl.GetLocationWithPrice(auth, auth.GID, ID)
-
-		return location, err
-	}
-
-	return adapters.CommandID("id", fn, http.StatusOK)
+// HandleLocationDelete godocs
+// @Summary  deletes a location
+// @Tags     Locations
+// @Produce  json
+// @Param    id path string true "Location ID"
+// @Success  204
+// @Router   /v1/locations/{id} [DELETE]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLocationDelete() server.HandlerFunc {
+	return ctrl.handleLocationGeneral()
 }
 
-// HandleLocationUpdate godoc
-//
-//	@Summary	Update Location
-//	@Tags		Locations
-//	@Produce	json
-//	@Param		id		path		string				true	"Location ID"
-//	@Param		payload	body		repo.LocationUpdate	true	"Location Data"
-//	@Success	200		{object}	repo.LocationOut
-//	@Router		/v1/locations/{id} [PUT]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleLocationUpdate() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID, body repo.LocationUpdate) (repo.LocationOut, error) {
-		auth := services.NewContext(r.Context())
-		body.ID = ID
-		return ctrl.repo.Locations.UpdateByGroup(auth, auth.GID, ID, body)
-	}
-
-	return adapters.ActionID("id", fn, http.StatusOK)
+// HandleLocationGet godocs
+// @Summary  Gets a location and fields
+// @Tags     Locations
+// @Produce  json
+// @Param    id  path     string true "Location ID"
+// @Success  200 {object} repo.LocationOut
+// @Router   /v1/locations/{id} [GET]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLocationGet() server.HandlerFunc {
+	return ctrl.handleLocationGeneral()
+}
+
+// HandleLocationUpdate godocs
+// @Summary  updates a location
+// @Tags     Locations
+// @Produce  json
+// @Param    id      path     string              true "Location ID"
+// @Param    payload body     repo.LocationUpdate true "Location Data"
+// @Success  200     {object} repo.LocationOut
+// @Router   /v1/locations/{id} [PUT]
+// @Security Bearer
+func (ctrl *V1Controller) HandleLocationUpdate() server.HandlerFunc {
+	return ctrl.handleLocationGeneral()
+}
+
+func (ctrl *V1Controller) handleLocationGeneral() server.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) error {
+		ctx := services.NewContext(r.Context())
+		ID, err := ctrl.routeID(r)
+		if err != nil {
+			return err
+		}
+
+		switch r.Method {
+		case http.MethodGet:
+			location, err := ctrl.repo.Locations.GetOneByGroup(r.Context(), ctx.GID, ID)
+			if err != nil {
+				l := log.Err(err).
+					Str("ID", ID.String()).
+					Str("GID", ctx.GID.String())
+
+				if ent.IsNotFound(err) {
+					l.Msg("location not found")
+					return validate.NewRequestError(err, http.StatusNotFound)
+				}
+
+				l.Msg("failed to get location")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			return server.Respond(w, http.StatusOK, location)
+		case http.MethodPut:
+			body := repo.LocationUpdate{}
+			if err := server.Decode(r, &body); err != nil {
+				log.Err(err).Msg("failed to decode location update data")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+
+			body.ID = ID
+
+			result, err := ctrl.repo.Locations.UpdateOneByGroup(r.Context(), ctx.GID, ID, body)
+			if err != nil {
+				log.Err(err).Msg("failed to update location")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			return server.Respond(w, http.StatusOK, result)
+		case http.MethodDelete:
+			err = ctrl.repo.Locations.DeleteByGroup(r.Context(), ctx.GID, ID)
+			if err != nil {
+				log.Err(err).Msg("failed to delete location")
+				return validate.NewRequestError(err, http.StatusInternalServerError)
+			}
+			return server.Respond(w, http.StatusNoContent, nil)
+		}
+		return nil
+	}
 }

backend/app/api/handlers/v1/v1_ctrl_maint_entry.go

@@ -1,49 +0,0 @@
-package v1
-
-import (
-	"net/http"
-
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
-)
-
-// HandleMaintenanceLogGet godoc
-//
-//	@Summary	Get Maintenance Log
-//	@Tags		Item Maintenance
-//	@Produce	json
-//	@Param		id		path	string					true	"Item ID"
-//	@Param		filters	query	repo.MaintenanceFilters	false	"which maintenance to retrieve"
-//	@Success	200		{array}	repo.MaintenanceEntryWithDetails[]
-//	@Router		/v1/items/{id}/maintenance [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleMaintenanceLogGet() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID, filters repo.MaintenanceFilters) ([]repo.MaintenanceEntryWithDetails, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.MaintEntry.GetMaintenanceByItemID(auth, auth.GID, ID, filters)
-	}
-
-	return adapters.QueryID("id", fn, http.StatusOK)
-}
-
-// HandleMaintenanceEntryCreate godoc
-//
-//	@Summary	Create Maintenance Entry
-//	@Tags		Item Maintenance
-//	@Produce	json
-//	@Param		id		path		string						true	"Item ID"
-//	@Param		payload	body		repo.MaintenanceEntryCreate	true	"Entry Data"
-//	@Success	201		{object}	repo.MaintenanceEntry
-//	@Router		/v1/items/{id}/maintenance [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleMaintenanceEntryCreate() errchain.HandlerFunc {
-	fn := func(r *http.Request, itemID uuid.UUID, body repo.MaintenanceEntryCreate) (repo.MaintenanceEntry, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.MaintEntry.Create(auth, itemID, body)
-	}
-
-	return adapters.ActionID("id", fn, http.StatusCreated)
-}

backend/app/api/handlers/v1/v1_ctrl_maintenance.go

@@ -1,67 +0,0 @@
-package v1
-
-import (
-	"net/http"
-
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
-)
-
-// HandleMaintenanceGetAll godoc
-//
-//	@Summary	Query All Maintenance
-//	@Tags		Maintenance
-//	@Produce	json
-//	@Param		filters	query	repo.MaintenanceFilters	false	"which maintenance to retrieve"
-//	@Success	200		{array}	repo.MaintenanceEntryWithDetails[]
-//	@Router		/v1/maintenance [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleMaintenanceGetAll() errchain.HandlerFunc {
-	fn := func(r *http.Request, filters repo.MaintenanceFilters) ([]repo.MaintenanceEntryWithDetails, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.MaintEntry.GetAllMaintenance(auth, auth.GID, filters)
-	}
-
-	return adapters.Query(fn, http.StatusOK)
-}
-
-// HandleMaintenanceEntryUpdate godoc
-//
-//	@Summary	Update Maintenance Entry
-//	@Tags		Maintenance
-//	@Produce	json
-//	@Param		id		path		string						true	"Maintenance ID"
-//	@Param		payload	body		repo.MaintenanceEntryUpdate	true	"Entry Data"
-//	@Success	200		{object}	repo.MaintenanceEntry
-//	@Router		/v1/maintenance/{id} [PUT]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleMaintenanceEntryUpdate() errchain.HandlerFunc {
-	fn := func(r *http.Request, entryID uuid.UUID, body repo.MaintenanceEntryUpdate) (repo.MaintenanceEntry, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.MaintEntry.Update(auth, entryID, body)
-	}
-
-	return adapters.ActionID("id", fn, http.StatusOK)
-}
-
-// HandleMaintenanceEntryDelete godoc
-//
-//	@Summary	Delete Maintenance Entry
-//	@Tags		Maintenance
-//	@Produce	json
-//	@Param		id	path	string	true	"Maintenance ID"
-//	@Success	204
-//	@Router		/v1/maintenance/{id} [DELETE]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleMaintenanceEntryDelete() errchain.HandlerFunc {
-	fn := func(r *http.Request, entryID uuid.UUID) (any, error) {
-		auth := services.NewContext(r.Context())
-		err := ctrl.repo.MaintEntry.Delete(auth, entryID)
-		return nil, err
-	}
-
-	return adapters.CommandID("id", fn, http.StatusNoContent)
-}

backend/app/api/handlers/v1/v1_ctrl_notifiers.go

@@ -1,104 +0,0 @@
-package v1
-
-import (
-	"net/http"
-
-	"github.com/containrrr/shoutrrr"
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
-)
-
-// HandleGetUserNotifiers godoc
-//
-//	@Summary	Get Notifiers
-//	@Tags		Notifiers
-//	@Produce	json
-//	@Success	200	{object}	[]repo.NotifierOut
-//	@Router		/v1/notifiers [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGetUserNotifiers() errchain.HandlerFunc {
-	fn := func(r *http.Request, _ struct{}) ([]repo.NotifierOut, error) {
-		user := services.UseUserCtx(r.Context())
-		return ctrl.repo.Notifiers.GetByUser(r.Context(), user.ID)
-	}
-
-	return adapters.Query(fn, http.StatusOK)
-}
-
-// HandleCreateNotifier godoc
-//
-//	@Summary	Create Notifier
-//	@Tags		Notifiers
-//	@Produce	json
-//	@Param		payload	body		repo.NotifierCreate	true	"Notifier Data"
-//	@Success	200		{object}	repo.NotifierOut
-//	@Router		/v1/notifiers [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleCreateNotifier() errchain.HandlerFunc {
-	fn := func(r *http.Request, in repo.NotifierCreate) (repo.NotifierOut, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Notifiers.Create(auth, auth.GID, auth.UID, in)
-	}
-
-	return adapters.Action(fn, http.StatusCreated)
-}
-
-// HandleDeleteNotifier godocs
-//
-//	@Summary	Delete a Notifier
-//	@Tags		Notifiers
-//	@Param		id	path	string	true	"Notifier ID"
-//	@Success	204
-//	@Router		/v1/notifiers/{id} [DELETE]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleDeleteNotifier() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID) (any, error) {
-		auth := services.NewContext(r.Context())
-		return nil, ctrl.repo.Notifiers.Delete(auth, auth.UID, ID)
-	}
-
-	return adapters.CommandID("id", fn, http.StatusNoContent)
-}
-
-// HandleUpdateNotifier godocs
-//
-//	@Summary	Update Notifier
-//	@Tags		Notifiers
-//	@Param		id		path		string				true	"Notifier ID"
-//	@Param		payload	body		repo.NotifierUpdate	true	"Notifier Data"
-//	@Success	200		{object}	repo.NotifierOut
-//	@Router		/v1/notifiers/{id} [PUT]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleUpdateNotifier() errchain.HandlerFunc {
-	fn := func(r *http.Request, ID uuid.UUID, in repo.NotifierUpdate) (repo.NotifierOut, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Notifiers.Update(auth, auth.UID, ID, in)
-	}
-
-	return adapters.ActionID("id", fn, http.StatusOK)
-}
-
-// HandlerNotifierTest godoc
-//
-//	@Summary	Test Notifier
-//	@Tags		Notifiers
-//	@Produce	json
-//	@Param		url	query	string	true	"URL"
-//	@Success	204
-//	@Router		/v1/notifiers/test [POST]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandlerNotifierTest() errchain.HandlerFunc {
-	type body struct {
-		URL string `json:"url" validate:"required"`
-	}
-
-	fn := func(r *http.Request, q body) (any, error) {
-		err := shoutrrr.Send(q.URL, "Test message from Homebox")
-		return nil, err
-	}
-
-	return adapters.Action(fn, http.StatusOK)
-}

backend/app/api/handlers/v1/v1_ctrl_product_search.go

@@ -1,332 +0,0 @@
-package v1
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/server"
-	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
-)
-
-type UPCITEMDBResponse struct {
-	Code   string `json:"code"`
-	Total  int    `json:"total"`
-	Offset int    `json:"offset"`
-	Items  []struct {
-		Ean                  string   `json:"ean"`
-		Title                string   `json:"title"`
-		Description          string   `json:"description"`
-		Upc                  string   `json:"upc"`
-		Brand                string   `json:"brand"`
-		Model                string   `json:"model"`
-		Color                string   `json:"color"`
-		Size                 string   `json:"size"`
-		Dimension            string   `json:"dimension"`
-		Weight               string   `json:"weight"`
-		Category             string   `json:"category"`
-		LowestRecordedPrice  float64  `json:"lowest_recorded_price"`
-		HighestRecordedPrice float64  `json:"highest_recorded_price"`
-		Images               []string `json:"images"`
-		Offers               []struct {
-			Merchant     string  `json:"merchant"`
-			Domain       string  `json:"domain"`
-			Title        string  `json:"title"`
-			Currency     string  `json:"currency"`
-			ListPrice    string  `json:"list_price"`
-			Price        float64 `json:"price"`
-			Shipping     string  `json:"shipping"`
-			Condition    string  `json:"condition"`
-			Availability string  `json:"availability"`
-			Link         string  `json:"link"`
-			UpdatedT     int     `json:"updated_t"`
-		} `json:"offers"`
-		Asin string `json:"asin"`
-		Elid string `json:"elid"`
-	} `json:"items"`
-}
-
-type BARCODESPIDER_COMResponse struct {
-	ItemResponse struct {
-		Code    int    `json:"code"`
-		Status  string `json:"status"`
-		Message string `json:"message"`
-	} `json:"item_response"`
-	ItemAttributes struct {
-		Title          string `json:"title"`
-		Upc            string `json:"upc"`
-		Ean            string `json:"ean"`
-		ParentCategory string `json:"parent_category"`
-		Category       string `json:"category"`
-		Brand          string `json:"brand"`
-		Model          string `json:"model"`
-		Mpn            string `json:"mpn"`
-		Manufacturer   string `json:"manufacturer"`
-		Publisher      string `json:"publisher"`
-		Asin           string `json:"asin"`
-		Color          string `json:"color"`
-		Size           string `json:"size"`
-		Weight         string `json:"weight"`
-		Image          string `json:"image"`
-		IsAdult        string `json:"is_adult"`
-		Description    string `json:"description"`
-	} `json:"item_attributes"`
-	Stores []struct {
-		StoreName string `json:"store_name"`
-		Title     string `json:"title"`
-		Image     string `json:"image"`
-		Price     string `json:"price"`
-		Currency  string `json:"currency"`
-		Link      string `json:"link"`
-		Updated   string `json:"updated"`
-	} `json:"Stores"`
-}
-
-// HandleGenerateQRCode godoc
-//
-//	@Summary	Search EAN from Barcode
-//	@Tags		Items
-//	@Produce	json
-//	@Param		data	query		string	false	"barcode to be searched"
-//	@Success	200		{object}	[]repo.BarcodeProduct
-//	@Router		/v1/products/search-from-barcode [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleProductSearchFromBarcode(conf config.BarcodeAPIConf) errchain.HandlerFunc {
-	type query struct {
-		// 80 characters is the longest non-2D barcode length (GS1-128)
-		EAN string `schema:"productEAN" validate:"required,max=80"`
-	}
-
-	return func(w http.ResponseWriter, r *http.Request) error {
-		q, err := adapters.DecodeQuery[query](r)
-		if err != nil {
-			return err
-		}
-
-		const TIMEOUT_SEC = 10
-
-		log.Info().Msg("Processing barcode lookup request on: " + q.EAN)
-
-		// Search on UPCITEMDB
-		var products []repo.BarcodeProduct
-
-		// www.ean-search.org/: not free
-
-		// Example code: dewalt 5035048748428
-
-		upcitemdb := func(iEan string) ([]repo.BarcodeProduct, error) {
-			client := &http.Client{Timeout: TIMEOUT_SEC * time.Second}
-			resp, err := client.Get("https://api.upcitemdb.com/prod/trial/lookup?upc=" + iEan)
-			if err != nil {
-				return nil, err
-			}
-
-			defer func() {
-				err = errors.Join(err, resp.Body.Close())
-			}()
-
-			if resp.StatusCode != http.StatusOK {
-				return nil, fmt.Errorf("API returned status code: %d", resp.StatusCode)
-			}
-
-			// We Read the response body on the line below.
-			body, err := io.ReadAll(resp.Body)
-			if err != nil {
-				return nil, err
-			}
-
-			// Uncomment the following string for debug
-			// sb := string(body)
-			// log.Debug().Msg("Response: " + sb)
-
-			var result UPCITEMDBResponse
-			if err := json.Unmarshal(body, &result); err != nil { // Parse []byte to go struct pointer
-				log.Error().Msg("Can not unmarshal JSON")
-			}
-
-			var res []repo.BarcodeProduct
-
-			for _, it := range result.Items {
-				var p repo.BarcodeProduct
-				p.SearchEngineName = "upcitemdb.com"
-				p.Barcode = iEan
-
-				p.Item.Description = it.Description
-				p.Item.Name = it.Title
-				p.Manufacturer = it.Brand
-				p.ModelNumber = it.Model
-				if len(it.Images) != 0 {
-					p.ImageURL = it.Images[0]
-				}
-
-				res = append(res, p)
-			}
-
-			return res, nil
-		}
-
-		ps, err := upcitemdb(q.EAN)
-		if err != nil {
-			log.Error().Msg("Can not retrieve product from upcitemdb.com" + err.Error())
-		}
-
-		// Barcode spider implementation
-		barcodespider := func(tokenAPI string, iEan string) ([]repo.BarcodeProduct, error) {
-			if len(tokenAPI) == 0 {
-				return nil, errors.New("no api token configured for barcodespider. " +
-					"Please define the api token in environment variable HBOX_BARCODE_TOKEN_BARCODESPIDER")
-			}
-
-			req, err := http.NewRequest(
-				"GET", "https://api.barcodespider.com/v1/lookup?upc="+iEan, nil)
-
-			if err != nil {
-				return nil, err
-			}
-
-			req.Header.Add("token", tokenAPI)
-
-			client := &http.Client{Timeout: TIMEOUT_SEC * time.Second}
-
-			resp, err := client.Do(req)
-			if err != nil {
-				return nil, err
-			}
-
-			// defer the call to Body.Close(). We also check the error code, and merge
-			// it with the other error in this code to avoid error overiding.
-			defer func() {
-				err = errors.Join(err, resp.Body.Close())
-			}()
-
-			if resp.StatusCode != http.StatusOK {
-				return nil, fmt.Errorf("barcodespider API returned status code: %d", resp.StatusCode)
-			}
-
-			// We Read the response body on the line below.
-			body, err := io.ReadAll(resp.Body)
-			if err != nil {
-				return nil, err
-			}
-
-			// Uncomment the following string for debug
-			// sb := string(body)
-			// log.Debug().Msg("Response: " + sb)
-
-			var result BARCODESPIDER_COMResponse
-			if err := json.Unmarshal(body, &result); err != nil { // Parse []byte to go struct pointer
-				log.Error().Msg("Can not unmarshal JSON")
-			}
-
-			// TODO: check 200 code on HTTP response.
-			var p repo.BarcodeProduct
-			p.Barcode = iEan
-			p.SearchEngineName = "barcodespider.com"
-			p.Item.Name = result.ItemAttributes.Title
-			p.Item.Description = result.ItemAttributes.Description
-			p.Manufacturer = result.ItemAttributes.Brand
-			p.ModelNumber = result.ItemAttributes.Model
-			p.ImageURL = result.ItemAttributes.Image
-
-			var res []repo.BarcodeProduct
-			res = append(res, p)
-
-			return res, nil
-		}
-
-		ps2, err := barcodespider(conf.TokenBarcodespider, q.EAN)
-		if err != nil {
-			log.Error().Msg("Can not retrieve product from barcodespider.com: " + err.Error())
-		}
-
-		// Merge everything.
-		products = append(products, ps...)
-
-		products = append(products, ps2...)
-
-		// Retrieve images if possible
-		for i := range products {
-			p := &products[i]
-
-			if len(p.ImageURL) == 0 {
-				continue
-			}
-
-			// Validate URL is HTTPS
-			u, err := url.Parse(p.ImageURL)
-			if err != nil || u.Scheme != "https" {
-				log.Warn().Msg("Skipping non-HTTPS image URL: " + p.ImageURL)
-				continue
-			}
-
-			client := &http.Client{Timeout: TIMEOUT_SEC * time.Second}
-			res, err := client.Get(p.ImageURL)
-			if err != nil {
-				log.Warn().Msg("Cannot fetch image for URL: " + p.ImageURL + ": " + err.Error())
-			}
-
-			defer func() {
-				err = errors.Join(err, res.Body.Close())
-			}()
-
-			// Validate response
-			if res.StatusCode != http.StatusOK {
-				continue
-			}
-
-			// Check content type
-			contentType := res.Header.Get("Content-Type")
-			if !strings.HasPrefix(contentType, "image/") {
-				continue
-			}
-
-			// Limit image size to 8MB
-			limitedReader := io.LimitReader(res.Body, 8*1024*1024)
-
-			// Read data of image
-			bytes, err := io.ReadAll(limitedReader)
-			if err != nil {
-				log.Warn().Msg(err.Error())
-				continue
-			}
-
-			// Convert to Base64
-			var base64Encoding string
-
-			// Determine the content type of the image file
-			mimeType := http.DetectContentType(bytes)
-
-			// Prepend the appropriate URI scheme header depending
-			// on the MIME type
-			switch mimeType {
-			case "image/jpeg":
-				base64Encoding += "data:image/jpeg;base64,"
-			case "image/png":
-				base64Encoding += "data:image/png;base64,"
-			default:
-				continue
-			}
-
-			// Append the base64 encoded output
-			base64Encoding += base64.StdEncoding.EncodeToString(bytes)
-
-			p.ImageBase64 = base64Encoding
-		}
-
-		if len(products) != 0 {
-			return server.JSON(w, http.StatusOK, products)
-		}
-
-		return server.JSON(w, http.StatusNoContent, nil)
-	}
-}

backend/app/api/handlers/v1/v1_ctrl_qrcode.go

@@ -1,72 +0,0 @@
-package v1
-
-import (
-	"bytes"
-	"image/png"
-	"io"
-	"net/http"
-	"net/url"
-
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
-	"github.com/yeqown/go-qrcode/v2"
-	"github.com/yeqown/go-qrcode/writer/standard"
-
-	_ "embed"
-)
-
-//go:embed assets/QRIcon.png
-var qrcodeLogo []byte
-
-// HandleGenerateQRCode godoc
-//
-//	@Summary	Create QR Code
-//	@Tags		Items
-//	@Produce	json
-//	@Param		data	query		string	false	"data to be encoded into qrcode"
-//	@Success	200		{string}	string	"image/jpeg"
-//	@Router		/v1/qrcode [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGenerateQRCode() errchain.HandlerFunc {
-	type query struct {
-		// 4,296 characters is the maximum length of a QR code
-		Data string `schema:"data" validate:"required,max=4296"`
-	}
-
-	return func(w http.ResponseWriter, r *http.Request) error {
-		q, err := adapters.DecodeQuery[query](r)
-		if err != nil {
-			return err
-		}
-
-		image, err := png.Decode(bytes.NewReader(qrcodeLogo))
-		if err != nil {
-			panic(err)
-		}
-
-		decodedStr, err := url.QueryUnescape(q.Data)
-		if err != nil {
-			return err
-		}
-
-		qrc, err := qrcode.New(decodedStr)
-		if err != nil {
-			return err
-		}
-
-		toWriteCloser := struct {
-			io.Writer
-			io.Closer
-		}{
-			Writer: w,
-			Closer: io.NopCloser(nil),
-		}
-
-		qrwriter := standard.NewWithWriter(toWriteCloser, standard.WithLogoImage(image))
-
-		// Return the QR code as a jpeg image
-		w.Header().Set("Content-Type", "image/jpeg")
-		w.Header().Set("Content-Disposition", "attachment; filename=qrcode.jpg")
-		return qrc.Save(qrwriter)
-	}
-}

backend/app/api/handlers/v1/v1_ctrl_reporting.go

@@ -1,31 +0,0 @@
-package v1
-
-import (
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"net/http"
-)
-
-// HandleBillOfMaterialsExport godoc
-//
-//	@Summary	Export Bill of Materials
-//	@Tags		Reporting
-//	@Produce	json
-//	@Success	200	{string}	string	"text/csv"
-//	@Router		/v1/reporting/bill-of-materials [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleBillOfMaterialsExport() errchain.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) error {
-		actor := services.UseUserCtx(r.Context())
-
-		csv, err := ctrl.svc.Items.ExportBillOfMaterialsCSV(r.Context(), actor.GroupID)
-		if err != nil {
-			return err
-		}
-
-		w.Header().Set("Content-Type", "text/csv")
-		w.Header().Set("Content-Disposition", "attachment; filename=bill-of-materials.csv")
-		_, err = w.Write(csv)
-		return err
-	}
-}

backend/app/api/handlers/v1/v1_ctrl_statistics.go

@@ -1,104 +0,0 @@
-package v1
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/server"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/adapters"
-)
-
-// HandleGroupStatisticsLocations godoc
-//
-//	@Summary	Get Location Statistics
-//	@Tags		Statistics
-//	@Produce	json
-//	@Success	200	{object}	[]repo.TotalsByOrganizer
-//	@Router		/v1/groups/statistics/locations [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGroupStatisticsLocations() errchain.HandlerFunc {
-	fn := func(r *http.Request) ([]repo.TotalsByOrganizer, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Groups.StatsLocationsByPurchasePrice(auth, auth.GID)
-	}
-
-	return adapters.Command(fn, http.StatusOK)
-}
-
-// HandleGroupStatisticsLabels godoc
-//
-//	@Summary	Get Label Statistics
-//	@Tags		Statistics
-//	@Produce	json
-//	@Success	200	{object}	[]repo.TotalsByOrganizer
-//	@Router		/v1/groups/statistics/labels [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGroupStatisticsLabels() errchain.HandlerFunc {
-	fn := func(r *http.Request) ([]repo.TotalsByOrganizer, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Groups.StatsLabelsByPurchasePrice(auth, auth.GID)
-	}
-
-	return adapters.Command(fn, http.StatusOK)
-}
-
-// HandleGroupStatistics godoc
-//
-//	@Summary	Get Group Statistics
-//	@Tags		Statistics
-//	@Produce	json
-//	@Success	200	{object}	repo.GroupStatistics
-//	@Router		/v1/groups/statistics [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGroupStatistics() errchain.HandlerFunc {
-	fn := func(r *http.Request) (repo.GroupStatistics, error) {
-		auth := services.NewContext(r.Context())
-		return ctrl.repo.Groups.StatsGroup(auth, auth.GID)
-	}
-
-	return adapters.Command(fn, http.StatusOK)
-}
-
-// HandleGroupStatisticsPriceOverTime godoc
-//
-//	@Summary	Get Purchase Price Statistics
-//	@Tags		Statistics
-//	@Produce	json
-//	@Success	200		{object}	repo.ValueOverTime
-//	@Param		start	query		string	false	"start date"
-//	@Param		end		query		string	false	"end date"
-//	@Router		/v1/groups/statistics/purchase-price [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleGroupStatisticsPriceOverTime() errchain.HandlerFunc {
-	parseDate := func(datestr string, defaultDate time.Time) (time.Time, error) {
-		if datestr == "" {
-			return defaultDate, nil
-		}
-		return time.Parse("2006-01-02", datestr)
-	}
-
-	return func(w http.ResponseWriter, r *http.Request) error {
-		ctx := services.NewContext(r.Context())
-
-		startDate, err := parseDate(r.URL.Query().Get("start"), time.Now().AddDate(0, -1, 0))
-		if err != nil {
-			return validate.NewRequestError(err, http.StatusBadRequest)
-		}
-
-		endDate, err := parseDate(r.URL.Query().Get("end"), time.Now())
-		if err != nil {
-			return validate.NewRequestError(err, http.StatusBadRequest)
-		}
-
-		stats, err := ctrl.repo.Groups.StatsPurchasePrice(ctx, ctx.GID, startDate, endDate)
-		if err != nil {
-			return validate.NewRequestError(err, http.StatusInternalServerError)
-		}
-
-		return server.JSON(w, http.StatusOK, stats)
-	}
-}

backend/app/api/handlers/v1/v1_ctrl_user.go

@@ -1,34 +1,25 @@
 package v1
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/server"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
 	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
 )
 
-// HandleUserRegistration godoc
-//
-//	@Summary	Register New User
-//	@Tags		User
-//	@Produce	json
-//	@Param		payload	body	services.UserRegistration	true	"User Data"
-//	@Success	204
-//  @Failure    403 {string} string "Local login is not enabled"
-//	@Router		/v1/users/register [Post]
-func (ctrl *V1Controller) HandleUserRegistration() errchain.HandlerFunc {
+// HandleUserSelf godoc
+// @Summary Get the current user
+// @Tags    User
+// @Produce json
+// @Param   payload body services.UserRegistration true "User Data"
+// @Success 204
+// @Router  /v1/users/register [Post]
+func (ctrl *V1Controller) HandleUserRegistration() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
-		// Forbidden if local login is not enabled
-		if !ctrl.config.Options.AllowLocalLogin {
-			return validate.NewRequestError(fmt.Errorf("local login is not enabled"), http.StatusForbidden)
-		}
-
 		regData := services.UserRegistration{}
 
 		if err := server.Decode(r, &regData); err != nil {
@@ -37,7 +28,7 @@ func (ctrl *V1Controller) HandleUserRegistration() errchain.HandlerFunc {
 		}
 
 		if !ctrl.allowRegistration && regData.GroupToken == "" {
-			return validate.NewRequestError(fmt.Errorf("user registration disabled"), http.StatusForbidden)
+			return validate.NewRequestError(nil, http.StatusForbidden)
 		}
 
 		_, err := ctrl.svc.User.RegisterUser(r.Context(), regData)
@@ -46,19 +37,18 @@ func (ctrl *V1Controller) HandleUserRegistration() errchain.HandlerFunc {
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		return server.JSON(w, http.StatusNoContent, nil)
+		return server.Respond(w, http.StatusNoContent, nil)
 	}
 }
 
 // HandleUserSelf godoc
-//
-//	@Summary	Get User Self
-//	@Tags		User
-//	@Produce	json
-//	@Success	200	{object}	Wrapped{item=repo.UserOut}
-//	@Router		/v1/users/self [GET]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleUserSelf() errchain.HandlerFunc {
+// @Summary  Get the current user
+// @Tags     User
+// @Produce  json
+// @Success  200 {object} server.Result{item=repo.UserOut}
+// @Router   /v1/users/self [GET]
+// @Security Bearer
+func (ctrl *V1Controller) HandleUserSelf() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
 		token := services.UseTokenCtx(r.Context())
 		usr, err := ctrl.svc.User.GetSelf(r.Context(), token)
@@ -67,20 +57,19 @@ func (ctrl *V1Controller) HandleUserSelf() errchain.HandlerFunc {
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		return server.JSON(w, http.StatusOK, Wrap(usr))
+		return server.Respond(w, http.StatusOK, server.Wrap(usr))
 	}
 }
 
 // HandleUserSelfUpdate godoc
-//
-//	@Summary	Update Account
-//	@Tags		User
-//	@Produce	json
-//	@Param		payload	body		repo.UserUpdate	true	"User Data"
-//	@Success	200		{object}	Wrapped{item=repo.UserUpdate}
-//	@Router		/v1/users/self [PUT]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleUserSelfUpdate() errchain.HandlerFunc {
+// @Summary  Update the current user
+// @Tags     User
+// @Produce  json
+// @Param    payload body     repo.UserUpdate true "User Data"
+// @Success  200     {object} server.Result{item=repo.UserUpdate}
+// @Router   /v1/users/self [PUT]
+// @Security Bearer
+func (ctrl *V1Controller) HandleUserSelfUpdate() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
 		updateData := repo.UserUpdate{}
 		if err := server.Decode(r, &updateData); err != nil {
@@ -90,23 +79,23 @@ func (ctrl *V1Controller) HandleUserSelfUpdate() errchain.HandlerFunc {
 
 		actor := services.UseUserCtx(r.Context())
 		newData, err := ctrl.svc.User.UpdateSelf(r.Context(), actor.ID, updateData)
+
 		if err != nil {
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		return server.JSON(w, http.StatusOK, Wrap(newData))
+		return server.Respond(w, http.StatusOK, server.Wrap(newData))
 	}
 }
 
 // HandleUserSelfDelete godoc
-//
-//	@Summary	Delete Account
-//	@Tags		User
-//	@Produce	json
-//	@Success	204
-//	@Router		/v1/users/self [DELETE]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleUserSelfDelete() errchain.HandlerFunc {
+// @Summary  Deletes the user account
+// @Tags     User
+// @Produce  json
+// @Success  204
+// @Router   /v1/users/self [DELETE]
+// @Security Bearer
+func (ctrl *V1Controller) HandleUserSelfDelete() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
 		if ctrl.isDemo {
 			return validate.NewRequestError(nil, http.StatusForbidden)
@@ -117,7 +106,7 @@ func (ctrl *V1Controller) HandleUserSelfDelete() errchain.HandlerFunc {
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		return server.JSON(w, http.StatusNoContent, nil)
+		return server.Respond(w, http.StatusNoContent, nil)
 	}
 }
 
@@ -129,14 +118,13 @@ type (
 )
 
 // HandleUserSelfChangePassword godoc
-//
-//	@Summary	Change Password
-//	@Tags		User
-//	@Success	204
-//	@Param		payload	body	ChangePassword	true	"Password Payload"
-//	@Router		/v1/users/change-password [PUT]
-//	@Security	Bearer
-func (ctrl *V1Controller) HandleUserSelfChangePassword() errchain.HandlerFunc {
+// @Summary  Updates the users password
+// @Tags     User
+// @Success  204
+// @Param    payload body ChangePassword true "Password Payload"
+// @Router   /v1/users/change-password [PUT]
+// @Security Bearer
+func (ctrl *V1Controller) HandleUserSelfChangePassword() server.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) error {
 		if ctrl.isDemo {
 			return validate.NewRequestError(nil, http.StatusForbidden)
@@ -155,6 +143,6 @@ func (ctrl *V1Controller) HandleUserSelfChangePassword() errchain.HandlerFunc {
 			return validate.NewRequestError(err, http.StatusInternalServerError)
 		}
 
-		return server.JSON(w, http.StatusNoContent, nil)
+		return server.Respond(w, http.StatusNoContent, nil)
 	}
 }

backend/app/api/logger.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"os"
+	"strings"
 
+	"github.com/hay-kot/homebox/backend/internal/sys/config"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
 )
 
 // setupLogger initializes the zerolog config
@@ -17,11 +18,24 @@ func (a *app) setupLogger() {
 		log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr}).With().Caller().Logger()
 	}
 
-	level, err := zerolog.ParseLevel(a.conf.Log.Level)
-	if err != nil {
-		log.Error().Err(err).Str("level", a.conf.Log.Level).Msg("invalid log level, falling back to info")
-		zerolog.SetGlobalLevel(zerolog.InfoLevel)
-	} else {
-		zerolog.SetGlobalLevel(level)
+	log.Level(getLevel(a.conf.Log.Level))
+}
+
+func getLevel(l string) zerolog.Level {
+	switch strings.ToLower(l) {
+	case "debug":
+		return zerolog.DebugLevel
+	case "info":
+		return zerolog.InfoLevel
+	case "warn":
+		return zerolog.WarnLevel
+	case "error":
+		return zerolog.ErrorLevel
+	case "fatal":
+		return zerolog.FatalLevel
+	case "panic":
+		return zerolog.PanicLevel
+	default:
+		return zerolog.InfoLevel
 	}
 }

backend/app/api/main.go

@@ -2,44 +2,23 @@ package main
 
 import (
 	"context"
-	"errors"
-	"fmt"
 	"net/http"
-	"strings"
+	"os"
+	"path/filepath"
 	"time"
 
-	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/chi/v5/middleware"
-	"github.com/pressly/goose/v3"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/analytics"
-
-	"github.com/hay-kot/httpkit/errchain"
-	"github.com/hay-kot/httpkit/graceful"
-	"github.com/rs/zerolog"
+	atlas "ariga.io/atlas/sql/migrate"
+	"entgo.io/ent/dialect/sql/schema"
+	"github.com/hay-kot/homebox/backend/app/api/static/docs"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/data/ent"
+	"github.com/hay-kot/homebox/backend/internal/data/migrations"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/internal/sys/config"
+	"github.com/hay-kot/homebox/backend/internal/web/mid"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
+	_ "github.com/mattn/go-sqlite3"
 	"github.com/rs/zerolog/log"
-	"github.com/rs/zerolog/pkgerrors"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/currencies"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services/reporting/eventbus"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/ent"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/migrations"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
-	"github.com/sysadminsmedia/homebox/backend/internal/web/mid"
-	"go.balki.me/anyhttp"
-
-	_ "github.com/lib/pq"
-	_ "github.com/sysadminsmedia/homebox/backend/internal/data/migrations/postgres"
-	_ "github.com/sysadminsmedia/homebox/backend/internal/data/migrations/sqlite3"
-	_ "github.com/sysadminsmedia/homebox/backend/pkgs/cgofreesqlite"
-
-	_ "gocloud.dev/pubsub/awssnssqs"
-	_ "gocloud.dev/pubsub/azuresb"
-	_ "gocloud.dev/pubsub/gcppubsub"
-	_ "gocloud.dev/pubsub/kafkapubsub"
-	_ "gocloud.dev/pubsub/mempubsub"
-	_ "gocloud.dev/pubsub/natspubsub"
-	_ "gocloud.dev/pubsub/rabbitpubsub"
 )
 
 var (
@@ -48,50 +27,24 @@ var (
 	buildTime = "now"
 )
 
-func build() string {
-	short := commit
-	if len(short) > 7 {
-		short = short[:7]
-	}
-
-	return fmt.Sprintf("%s, commit %s, built at %s", version, short, buildTime)
-}
-
-func validatePostgresSSLMode(sslMode string) bool {
-	validModes := map[string]bool{
-		"":            true,
-		"disable":     true,
-		"allow":       true,
-		"prefer":      true,
-		"require":     true,
-		"verify-ca":   true,
-		"verify-full": true,
-	}
-	return validModes[strings.ToLower(strings.TrimSpace(sslMode))]
-}
-
-//	@title						Homebox API
-//	@version					1.0
-//	@description				Track, Manage, and Organize your Things.
-//	@contact.name				Homebox Team
-//	@contact.url				https://discord.homebox.software
-//	@host						demo.homebox.software
-//	@schemes					https http
-//	@BasePath					/api
-//	@securityDefinitions.apikey	Bearer
-//	@in							header
-//	@name						Authorization
-//	@description				"Type 'Bearer TOKEN' to correctly set the API Key"
-//	@externalDocs.url			https://homebox.software/en/api
-
+// @title                      Go API Templates
+// @version                    1.0
+// @description                This is a simple Rest API Server Template that implements some basic User and Authentication patterns to help you get started and bootstrap your next project!.
+// @contact.name               Don't
+// @license.name               MIT
+// @BasePath                   /api
+// @securityDefinitions.apikey Bearer
+// @in                         header
+// @name                       Authorization
+// @description                "Type 'Bearer TOKEN' to correctly set the API Key"
 func main() {
-	zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
-
-	cfg, err := config.New(build(), "Homebox inventory management system")
+	cfg, err := config.New()
 	if err != nil {
 		panic(err)
 	}
 
+	docs.SwaggerInfo.Host = cfg.Swagger.Host
+
 	if err := run(cfg); err != nil {
 		panic(err)
 	}
@@ -103,161 +56,121 @@ func run(cfg *config.Config) error {
 
 	// =========================================================================
 	// Initialize Database & Repos
-	err := setupStorageDir(cfg)
+
+	err := os.MkdirAll(cfg.Storage.Data, 0755)
 	if err != nil {
-		return err
+		log.Fatal().Err(err).Msg("failed to create data directory")
 	}
 
-	if strings.ToLower(cfg.Database.Driver) == "postgres" {
-		if !validatePostgresSSLMode(cfg.Database.SslMode) {
-			log.Error().Str("sslmode", cfg.Database.SslMode).Msg("invalid sslmode")
-			return fmt.Errorf("invalid sslmode: %s", cfg.Database.SslMode)
+	c, err := ent.Open("sqlite3", cfg.Storage.SqliteUrl)
+	if err != nil {
+		log.Fatal().
+			Err(err).
+			Str("driver", "sqlite").
+			Str("url", cfg.Storage.SqliteUrl).
+			Msg("failed opening connection to sqlite")
+	}
+	defer func(c *ent.Client) {
+		err := c.Close()
+		if err != nil {
+			log.Fatal().Err(err).Msg("failed to close database connection")
 		}
-	}
+	}(c)
 
-	databaseURL, err := setupDatabaseURL(cfg)
+	temp := filepath.Join(os.TempDir(), "migrations")
+
+	err = migrations.Write(temp)
 	if err != nil {
 		return err
 	}
 
-	c, err := ent.Open(strings.ToLower(cfg.Database.Driver), databaseURL)
+	dir, err := atlas.NewLocalDir(temp)
 	if err != nil {
-		log.Error().
+		return err
+	}
+
+	options := []schema.MigrateOption{
+		schema.WithDir(dir),
+		schema.WithDropColumn(true),
+		schema.WithDropIndex(true),
+	}
+
+	err = c.Schema.Create(context.Background(), options...)
+	if err != nil {
+		log.Fatal().
 			Err(err).
-			Str("driver", strings.ToLower(cfg.Database.Driver)).
-			Str("host", cfg.Database.Host).
-			Str("port", cfg.Database.Port).
-			Str("database", cfg.Database.Database).
-			Msg("failed opening connection to {driver} database at {host}:{port}/{database}")
-		return fmt.Errorf("failed opening connection to %s database at %s:%s/%s: %w",
-			strings.ToLower(cfg.Database.Driver),
-			cfg.Database.Host,
-			cfg.Database.Port,
-			cfg.Database.Database,
-			err,
-		)
+			Str("driver", "sqlite").
+			Str("url", cfg.Storage.SqliteUrl).
+			Msg("failed creating schema resources")
 	}
 
-	migrationsFs, err := migrations.Migrations(strings.ToLower(cfg.Database.Driver))
+	err = os.RemoveAll(temp)
 	if err != nil {
-		return fmt.Errorf("failed to get migrations for %s: %w", strings.ToLower(cfg.Database.Driver), err)
-	}
-
-	goose.SetBaseFS(migrationsFs)
-	err = goose.SetDialect(strings.ToLower(cfg.Database.Driver))
-	if err != nil {
-		log.Error().Str("driver", cfg.Database.Driver).Msg("unsupported database driver")
-		return fmt.Errorf("unsupported database driver: %s", cfg.Database.Driver)
-	}
-
-	err = goose.Up(c.Sql(), strings.ToLower(cfg.Database.Driver))
-	if err != nil {
-		log.Error().Err(err).Msg("failed to migrate database")
+		log.Fatal().Err(err).Msg("failed to remove temporary directory for database migrations")
 		return err
 	}
 
-	collectFuncs, err := loadCurrencies(cfg)
-	if err != nil {
-		return err
-	}
-
-	currencies, err := currencies.CollectionCurrencies(collectFuncs...)
-	if err != nil {
-		log.Error().
-			Err(err).
-			Msg("failed to collect currencies")
-		return err
-	}
-
-	app.bus = eventbus.New()
 	app.db = c
-	app.repos = repo.New(c, app.bus, cfg.Storage, cfg.Database.PubSubConnString, cfg.Thumbnail)
-	app.services = services.New(
-		app.repos,
-		services.WithAutoIncrementAssetID(cfg.Options.AutoIncrementAssetID),
-		services.WithCurrencies(currencies),
-	)
+	app.repos = repo.New(c, cfg.Storage.Data)
+	app.services = services.New(app.repos)
 
 	// =========================================================================
-	// Start Server
-
+	// Start Server\
 	logger := log.With().Caller().Logger()
 
-	router := chi.NewMux()
-	router.Use(
-		middleware.RequestID,
-		middleware.RealIP,
-		mid.Logger(logger),
-		middleware.Recoverer,
-		middleware.StripSlashes,
-	)
-
-	chain := errchain.New(mid.Errors(logger))
-
-	app.mountRoutes(router, chain, app.repos)
-
-	runner := graceful.NewRunner()
-
-	runner.AddFunc("server", func(ctx context.Context) error {
-		httpserver := http.Server{
-			Addr:         fmt.Sprintf("%s:%s", cfg.Web.Host, cfg.Web.Port),
-			Handler:      router,
-			ReadTimeout:  cfg.Web.ReadTimeout,
-			WriteTimeout: cfg.Web.WriteTimeout,
-			IdleTimeout:  cfg.Web.IdleTimeout,
-		}
-
-		go func() {
-			<-ctx.Done()
-			_ = httpserver.Shutdown(context.Background())
-		}()
-
-		listener, addrType, addrCfg, err := anyhttp.GetListener(cfg.Web.Host)
-		if err == nil {
-			switch addrType {
-			case anyhttp.SystemdFD:
-				sysdCfg := addrCfg.(*anyhttp.SysdConfig)
-				if sysdCfg.IdleTimeout != nil {
-					log.Error().Msg("idle timeout not yet supported. Please remove and try again")
-					return errors.New("idle timeout not yet supported. Please remove and try again")
-				}
-				fallthrough
-			case anyhttp.UnixSocket:
-				log.Info().Msgf("Server is running on %s", cfg.Web.Host)
-				return httpserver.Serve(listener)
-			}
-		} else {
-			log.Debug().Msgf("anyhttp error: %v", err)
-		}
-		log.Info().Msgf("Server is running on %s:%s", cfg.Web.Host, cfg.Web.Port)
-		return httpserver.ListenAndServe()
-	})
-
-	// Start Reoccurring Tasks
-	registerRecurringTasks(app, cfg, runner)
-
-	// Send analytics if enabled at around midnight UTC
-	if cfg.Options.AllowAnalytics {
-		analyticsTime := time.Second
-		runner.AddPlugin(NewTask("send-analytics", analyticsTime, func(ctx context.Context) {
-			for {
-				now := time.Now().UTC()
-				nextMidnight := time.Date(now.Year(), now.Month(), now.Day()+1, 0, 0, 0, 0, time.UTC)
-				dur := time.Until(nextMidnight)
-				analyticsTime = dur
-				select {
-				case <-ctx.Done():
-					return
-				case <-time.After(dur):
-					log.Debug().Msg("running send analytics")
-					err := analytics.Send(version, build())
-					if err != nil {
-						log.Error().Err(err).Msg("failed to send analytics")
-					}
-				}
-			}
-		}))
+	mwLogger := mid.Logger(logger)
+	if app.conf.Mode == config.ModeDevelopment {
+		mwLogger = mid.SugarLogger(logger)
 	}
 
-	return runner.Start(context.Background())
+	app.server = server.NewServer(
+		server.WithHost(app.conf.Web.Host),
+		server.WithPort(app.conf.Web.Port),
+		server.WithMiddleware(
+			mwLogger,
+			mid.Errors(logger),
+			mid.Panic(app.conf.Mode == config.ModeDevelopment),
+		),
+	)
+
+	app.mountRoutes(app.repos)
+
+	log.Info().Msgf("Starting HTTP Server on %s:%s", app.server.Host, app.server.Port)
+
+	// =========================================================================
+	// Start Reoccurring Tasks
+
+	go app.startBgTask(time.Duration(24)*time.Hour, func() {
+		_, err := app.repos.AuthTokens.PurgeExpiredTokens(context.Background())
+		if err != nil {
+			log.Error().
+				Err(err).
+				Msg("failed to purge expired tokens")
+		}
+	})
+	go app.startBgTask(time.Duration(24)*time.Hour, func() {
+		_, err := app.repos.Groups.InvitationPurge(context.Background())
+		if err != nil {
+			log.Error().
+				Err(err).
+				Msg("failed to purge expired invitations")
+		}
+	})
+
+	// TODO: Remove through external API that does setup
+	if cfg.Demo {
+		log.Info().Msg("Running in demo mode, creating demo data")
+		app.SetupDemo()
+	}
+
+	if cfg.Debug.Enabled {
+		debugrouter := app.debugRouter()
+		go func() {
+			if err := http.ListenAndServe(":"+cfg.Debug.Port, debugrouter); err != nil {
+				log.Fatal().Err(err).Msg("failed to start debug server")
+			}
+		}()
+	}
+
+	return app.server.Start()
 }

backend/app/api/middleware.go

@@ -1,151 +1,31 @@
 package main
 
 import (
-	"context"
 	"errors"
 	"net/http"
-	"net/url"
 	"strings"
 
-	"github.com/hay-kot/httpkit/errchain"
-	v1 "github.com/sysadminsmedia/homebox/backend/app/api/handlers/v1"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/ent"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/internal/core/services"
+	"github.com/hay-kot/homebox/backend/internal/sys/validate"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
 )
 
-type tokenHasKey struct {
-	key string
-}
-
-var hashedToken = tokenHasKey{key: "hashedToken"}
-
-type RoleMode int
-
-const (
-	RoleModeOr  RoleMode = 0
-	RoleModeAnd RoleMode = 1
-)
-
-// mwRoles is a middleware that will validate the required roles are met. All roles
-// are required to be met for the request to be allowed. If the user does not have
-// the required roles, a 403 Forbidden will be returned.
-//
-// WARNING: This middleware _MUST_ be called after mwAuthToken or else it will panic
-func (a *app) mwRoles(rm RoleMode, required ...string) errchain.Middleware {
-	return func(next errchain.Handler) errchain.Handler {
-		return errchain.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-			ctx := r.Context()
-
-			maybeToken := ctx.Value(hashedToken)
-			if maybeToken == nil {
-				panic("mwRoles: token not found in context, you must call mwAuthToken before mwRoles")
-			}
-
-			token := maybeToken.(string)
-
-			roles, err := a.repos.AuthTokens.GetRoles(r.Context(), token)
-			if err != nil {
-				return err
-			}
-
-		outer:
-			switch rm {
-			case RoleModeOr:
-				for _, role := range required {
-					if roles.Contains(role) {
-						break outer
-					}
-				}
-				return validate.NewRequestError(errors.New("Forbidden"), http.StatusForbidden)
-			case RoleModeAnd:
-				for _, req := range required {
-					if !roles.Contains(req) {
-						return validate.NewRequestError(errors.New("Unauthorized"), http.StatusForbidden)
-					}
-				}
-			}
-
-			return next.ServeHTTP(w, r)
-		})
-	}
-}
-
-type KeyFunc func(r *http.Request) (string, error)
-
-func getBearer(r *http.Request) (string, error) {
-	auth := r.Header.Get("Authorization")
-	if auth == "" {
-		return "", errors.New("authorization header is required")
-	}
-
-	return auth, nil
-}
-
-func getQuery(r *http.Request) (string, error) {
-	token := r.URL.Query().Get("access_token")
-	if token == "" {
-		return "", errors.New("access_token query is required")
-	}
-
-	token, err := url.QueryUnescape(token)
-	if err != nil {
-		return "", errors.New("access_token query is required")
-	}
-
-	return token, nil
-}
-
 // mwAuthToken is a middleware that will check the database for a stateful token
-// and attach it's user to the request context, or return an appropriate error.
-// Authorization support is by token via Headers or Query Parameter
-//
-// Example:
-//   - header = "Bearer 1234567890"
-//   - query = "?access_token=1234567890"
-func (a *app) mwAuthToken(next errchain.Handler) errchain.Handler {
-	return errchain.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		var requestToken string
-
-		// We ignore the error to allow the next strategy to be attempted
-		{
-			cookies, _ := v1.GetCookies(r)
-			if cookies != nil {
-				requestToken = cookies.Token
-			}
-		}
+// and attach it to the request context with the user, or return a 401 if it doesn't exist.
+func (a *app) mwAuthToken(next server.Handler) server.Handler {
+	return server.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
+		requestToken := r.Header.Get("Authorization")
 
 		if requestToken == "" {
-			keyFuncs := [...]KeyFunc{
-				getBearer,
-				getQuery,
-			}
-
-			for _, keyFunc := range keyFuncs {
-				token, err := keyFunc(r)
-				if err == nil {
-					requestToken = token
-					break
-				}
-			}
-		}
-
-		if requestToken == "" {
-			return validate.NewRequestError(errors.New("authorization header or query is required"), http.StatusUnauthorized)
+			return validate.NewRequestError(errors.New("Authorization header is required"), http.StatusUnauthorized)
 		}
 
 		requestToken = strings.TrimPrefix(requestToken, "Bearer ")
-
-		r = r.WithContext(context.WithValue(r.Context(), hashedToken, requestToken))
-
 		usr, err := a.services.User.GetSelf(r.Context(), requestToken)
+
 		// Check the database for the token
 		if err != nil {
-			if ent.IsNotFound(err) {
-				return validate.NewRequestError(errors.New("valid authorization token is required"), http.StatusUnauthorized)
-			}
-
-			return err
+			return validate.NewRequestError(errors.New("Authorization header is required"), http.StatusUnauthorized)
 		}
 
 		r = r.WithContext(services.SetUserCtx(r.Context(), &usr, requestToken))

backend/app/api/providers/doc.go

@@ -1,2 +0,0 @@
-// Package providers provides a authentication abstraction for the backend.
-package providers

backend/app/api/providers/extractors.go

@@ -1,55 +0,0 @@
-package providers
-
-import (
-	"errors"
-	"net/http"
-
-	"github.com/hay-kot/httpkit/server"
-	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/validate"
-)
-
-type LoginForm struct {
-	Username     string `json:"username"`
-	Password     string `json:"password"`
-	StayLoggedIn bool   `json:"stayLoggedIn"`
-}
-
-func getLoginForm(r *http.Request) (LoginForm, error) {
-	loginForm := LoginForm{}
-
-	switch r.Header.Get("Content-Type") {
-	case "application/x-www-form-urlencoded":
-		err := r.ParseForm()
-		if err != nil {
-			return loginForm, errors.New("failed to parse form")
-		}
-
-		loginForm.Username = r.PostFormValue("username")
-		loginForm.Password = r.PostFormValue("password")
-		loginForm.StayLoggedIn = r.PostFormValue("stayLoggedIn") == "true"
-	case "application/json":
-		err := server.Decode(r, &loginForm)
-		if err != nil {
-			log.Err(err).Msg("failed to decode login form")
-			return loginForm, errors.New("failed to decode login form")
-		}
-	default:
-		return loginForm, errors.New("invalid content type")
-	}
-
-	if loginForm.Username == "" || loginForm.Password == "" {
-		return loginForm, validate.NewFieldErrors(
-			validate.FieldError{
-				Field: "username",
-				Error: "username or password is empty",
-			},
-			validate.FieldError{
-				Field: "password",
-				Error: "username or password is empty",
-			},
-		)
-	}
-
-	return loginForm, nil
-}

backend/app/api/providers/local.go

@@ -1,30 +0,0 @@
-package providers
-
-import (
-	"net/http"
-
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-)
-
-type LocalProvider struct {
-	service *services.UserService
-}
-
-func NewLocalProvider(service *services.UserService) *LocalProvider {
-	return &LocalProvider{
-		service: service,
-	}
-}
-
-func (p *LocalProvider) Name() string {
-	return "local"
-}
-
-func (p *LocalProvider) Authenticate(w http.ResponseWriter, r *http.Request) (services.UserAuthTokenDetail, error) {
-	loginForm, err := getLoginForm(r)
-	if err != nil {
-		return services.UserAuthTokenDetail{}, err
-	}
-
-	return p.service.Login(r.Context(), loginForm.Username, loginForm.Password, loginForm.StayLoggedIn)
-}

backend/app/api/providers/oidc.go

@@ -1,626 +0,0 @@
-package providers
-
-import (
-	"context"
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/base64"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/coreos/go-oidc/v3/oidc"
-	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/services"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
-	"golang.org/x/oauth2"
-)
-
-type OIDCProvider struct {
-	service      *services.UserService
-	config       *config.OIDCConf
-	options      *config.Options
-	cookieSecure bool
-	provider     *oidc.Provider
-	verifier     *oidc.IDTokenVerifier
-	endpoint     oauth2.Endpoint
-}
-
-type OIDCClaims struct {
-	Email         string
-	Groups        []string
-	Name          string
-	Subject       string
-	Issuer        string
-	EmailVerified *bool
-}
-
-func NewOIDCProvider(service *services.UserService, config *config.OIDCConf, options *config.Options, cookieSecure bool) (*OIDCProvider, error) {
-	if !config.Enabled {
-		return nil, fmt.Errorf("OIDC is not enabled")
-	}
-
-	// Validate required configuration
-	if config.ClientID == "" {
-		return nil, fmt.Errorf("OIDC client ID is required when OIDC is enabled (set HBOX_OIDC_CLIENT_ID)")
-	}
-	if config.ClientSecret == "" {
-		return nil, fmt.Errorf("OIDC client secret is required when OIDC is enabled (set HBOX_OIDC_CLIENT_SECRET)")
-	}
-	if config.IssuerURL == "" {
-		return nil, fmt.Errorf("OIDC issuer URL is required when OIDC is enabled (set HBOX_OIDC_ISSUER_URL)")
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), config.RequestTimeout)
-	defer cancel()
-
-	provider, err := oidc.NewProvider(ctx, config.IssuerURL)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create OIDC provider from issuer URL: %w", err)
-	}
-
-	// Create ID token verifier
-	verifier := provider.Verifier(&oidc.Config{
-		ClientID: config.ClientID,
-	})
-
-	log.Info().
-		Str("issuer", config.IssuerURL).
-		Str("client_id", config.ClientID).
-		Str("scope", config.Scope).
-		Msg("OIDC provider initialized successfully with discovery")
-
-	return &OIDCProvider{
-		service:      service,
-		config:       config,
-		options:      options,
-		cookieSecure: cookieSecure,
-		provider:     provider,
-		verifier:     verifier,
-		endpoint:     provider.Endpoint(),
-	}, nil
-}
-
-func (p *OIDCProvider) Name() string {
-	return "oidc"
-}
-
-// Authenticate implements the AuthProvider interface but is not used for OIDC
-// OIDC uses dedicated endpoints: GET /api/v1/users/login/oidc and GET /api/v1/users/login/oidc/callback
-func (p *OIDCProvider) Authenticate(w http.ResponseWriter, r *http.Request) (services.UserAuthTokenDetail, error) {
-	_ = w
-	_ = r
-	return services.UserAuthTokenDetail{}, fmt.Errorf("OIDC authentication uses dedicated endpoints: /api/v1/users/login/oidc")
-}
-
-// AuthenticateWithBaseURL is the main authentication method that requires baseURL
-// Called from handleCallback after state, nonce, and PKCE verification
-func (p *OIDCProvider) AuthenticateWithBaseURL(baseURL, expectedNonce, pkceVerifier string, _ http.ResponseWriter, r *http.Request) (services.UserAuthTokenDetail, error) {
-	code := r.URL.Query().Get("code")
-	if code == "" {
-		return services.UserAuthTokenDetail{}, fmt.Errorf("missing authorization code")
-	}
-
-	// Get OAuth2 config for this request
-	oauth2Config := p.getOAuth2Config(baseURL)
-
-	// Exchange code for token with timeout and PKCE verifier
-	ctx, cancel := context.WithTimeout(r.Context(), p.config.RequestTimeout)
-	defer cancel()
-
-	token, err := oauth2Config.Exchange(ctx, code, oauth2.SetAuthURLParam("code_verifier", pkceVerifier))
-	if err != nil {
-		log.Err(err).Msg("failed to exchange OIDC code for token")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("failed to exchange code for token")
-	}
-
-	// Extract ID token
-	idToken, ok := token.Extra("id_token").(string)
-	if !ok {
-		return services.UserAuthTokenDetail{}, fmt.Errorf("no id_token in response")
-	}
-
-	// Parse and validate the ID token using the library's verifier with timeout
-	verifyCtx, verifyCancel := context.WithTimeout(r.Context(), p.config.RequestTimeout)
-	defer verifyCancel()
-
-	idTokenStruct, err := p.verifier.Verify(verifyCtx, idToken)
-	if err != nil {
-		log.Err(err).Msg("failed to verify ID token")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("failed to verify ID token")
-	}
-
-	// Extract claims from the verified token using dynamic parsing
-	var rawClaims map[string]interface{}
-	if err := idTokenStruct.Claims(&rawClaims); err != nil {
-		log.Err(err).Msg("failed to extract claims from ID token")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("failed to extract claims from ID token")
-	}
-
-	// Attempt to retrieve UserInfo claims; use them as primary, fallback to ID token claims.
-	finalClaims := rawClaims
-	userInfoCtx, uiCancel := context.WithTimeout(r.Context(), p.config.RequestTimeout)
-	defer uiCancel()
-
-	userInfo, uiErr := p.provider.UserInfo(userInfoCtx, oauth2.StaticTokenSource(token))
-	if uiErr != nil {
-		log.Debug().Err(uiErr).Msg("OIDC UserInfo fetch failed; falling back to ID token claims")
-	} else {
-		var uiClaims map[string]interface{}
-		if err := userInfo.Claims(&uiClaims); err != nil {
-			log.Debug().Err(err).Msg("failed to decode UserInfo claims; falling back to ID token claims")
-		} else {
-			finalClaims = mergeOIDCClaims(uiClaims, rawClaims) // UserInfo first, then fill gaps from ID token
-			log.Debug().Int("userinfo_claims", len(uiClaims)).Int("id_token_claims", len(rawClaims)).Int("merged_claims", len(finalClaims)).Msg("merged UserInfo and ID token claims")
-		}
-	}
-
-	// Parse claims using configurable claim names (after merge)
-	claims, err := p.parseOIDCClaims(finalClaims)
-	if err != nil {
-		log.Err(err).Msg("failed to parse OIDC claims")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("failed to parse OIDC claims: %w", err)
-	}
-
-	// Verify nonce claim matches expected value (nonce only from ID token; ensure preserved in merged map)
-	tokenNonce, exists := finalClaims["nonce"]
-	if !exists {
-		log.Warn().Msg("nonce claim missing from ID token - possible replay attack")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("nonce claim missing from token")
-	}
-
-	tokenNonceStr, ok := tokenNonce.(string)
-	if !ok {
-		log.Warn().Msg("nonce claim is not a string in ID token")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("invalid nonce claim format")
-	}
-
-	if tokenNonceStr != expectedNonce {
-		log.Warn().Str("received", tokenNonceStr).Str("expected", expectedNonce).Msg("OIDC nonce mismatch - possible replay attack")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("nonce parameter mismatch")
-	}
-
-	// Check if email is verified
-	if p.config.VerifyEmail {
-		if claims.EmailVerified == nil {
-			return services.UserAuthTokenDetail{}, fmt.Errorf("email verification status not found in token claims")
-		}
-
-		if !*claims.EmailVerified {
-			return services.UserAuthTokenDetail{}, fmt.Errorf("email not verified")
-		}
-	}
-
-	// Check group authorization if configured
-	if p.config.AllowedGroups != "" {
-		allowedGroups := strings.Split(p.config.AllowedGroups, ",")
-		if !p.hasAllowedGroup(claims.Groups, allowedGroups) {
-			log.Warn().
-				Strs("user_groups", claims.Groups).
-				Strs("allowed_groups", allowedGroups).
-				Str("user", claims.Email).
-				Msg("user not in allowed groups")
-			return services.UserAuthTokenDetail{}, fmt.Errorf("user not in allowed groups")
-		}
-	}
-
-	// Determine username from claims
-	email := claims.Email
-	if email == "" {
-		return services.UserAuthTokenDetail{}, fmt.Errorf("no email found in token claims")
-	}
-	if claims.Subject == "" {
-		return services.UserAuthTokenDetail{}, fmt.Errorf("no subject (sub) claim present")
-	}
-	if claims.Issuer == "" {
-		claims.Issuer = p.config.IssuerURL // fallback to configured issuer, though spec requires 'iss'
-	}
-
-	// Use the dedicated OIDC login method (issuer + subject identity)
-	sessionToken, err := p.service.LoginOIDC(r.Context(), claims.Issuer, claims.Subject, email, claims.Name)
-	if err != nil {
-		log.Err(err).Str("email", email).Str("issuer", claims.Issuer).Str("subject", claims.Subject).Msg("OIDC login failed")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("OIDC login failed: %w", err)
-	}
-
-	return sessionToken, nil
-}
-
-func (p *OIDCProvider) parseOIDCClaims(rawClaims map[string]interface{}) (OIDCClaims, error) {
-	var claims OIDCClaims
-
-	// Parse email claim
-	key := p.config.EmailClaim
-	if key == "" {
-		key = "email"
-	}
-	if emailValue, exists := rawClaims[key]; exists {
-		if email, ok := emailValue.(string); ok {
-			claims.Email = email
-		}
-	}
-
-	// Parse email_verified claim
-	if p.config.VerifyEmail {
-		key = p.config.EmailVerifiedClaim
-		if key == "" {
-			key = "email_verified"
-		}
-		if emailVerifiedValue, exists := rawClaims[key]; exists {
-			switch v := emailVerifiedValue.(type) {
-			case bool:
-				claims.EmailVerified = &v
-			case string:
-				if b, err := strconv.ParseBool(v); err == nil {
-					claims.EmailVerified = &b
-				}
-			}
-		}
-	}
-
-	// Parse name claim
-	key = p.config.NameClaim
-	if key == "" {
-		key = "name"
-	}
-	if nameValue, exists := rawClaims[key]; exists {
-		if name, ok := nameValue.(string); ok {
-			claims.Name = name
-		}
-	}
-
-	// Parse groups claim
-	key = p.config.GroupClaim
-	if key == "" {
-		key = "groups"
-	}
-	if groupsValue, exists := rawClaims[key]; exists {
-		switch groups := groupsValue.(type) {
-		case []interface{}:
-			for _, group := range groups {
-				if groupStr, ok := group.(string); ok {
-					claims.Groups = append(claims.Groups, groupStr)
-				}
-			}
-		case []string:
-			claims.Groups = groups
-		case string:
-			// Single group as string
-			claims.Groups = []string{groups}
-		}
-	}
-
-	// Parse subject claim (always "sub")
-	if subValue, exists := rawClaims["sub"]; exists {
-		if subject, ok := subValue.(string); ok {
-			claims.Subject = subject
-		}
-	}
-	// Parse issuer claim ("iss")
-	if issValue, exists := rawClaims["iss"]; exists {
-		if iss, ok := issValue.(string); ok {
-			claims.Issuer = iss
-		}
-	}
-
-	return claims, nil
-}
-
-func (p *OIDCProvider) hasAllowedGroup(userGroups, allowedGroups []string) bool {
-	if len(allowedGroups) == 0 {
-		return true
-	}
-
-	allowedGroupsMap := make(map[string]bool)
-	for _, group := range allowedGroups {
-		allowedGroupsMap[strings.TrimSpace(group)] = true
-	}
-
-	for _, userGroup := range userGroups {
-		if allowedGroupsMap[userGroup] {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (p *OIDCProvider) GetAuthURL(baseURL, state, nonce, pkceVerifier string) string {
-	oauth2Config := p.getOAuth2Config(baseURL)
-	pkceChallenge := generatePKCEChallenge(pkceVerifier)
-	return oauth2Config.AuthCodeURL(state,
-		oidc.Nonce(nonce),
-		oauth2.SetAuthURLParam("code_challenge", pkceChallenge),
-		oauth2.SetAuthURLParam("code_challenge_method", "S256"))
-}
-
-func (p *OIDCProvider) getOAuth2Config(baseURL string) oauth2.Config {
-	// Construct full redirect URL with dedicated callback endpoint
-	redirectURL, err := url.JoinPath(baseURL, "/api/v1/users/login/oidc/callback")
-	if err != nil {
-		log.Err(err).Msg("failed to construct redirect URL")
-		return oauth2.Config{}
-	}
-
-	return oauth2.Config{
-		ClientID:     p.config.ClientID,
-		ClientSecret: p.config.ClientSecret,
-		RedirectURL:  redirectURL,
-		Endpoint:     p.endpoint,
-		Scopes:       strings.Fields(p.config.Scope),
-	}
-}
-
-// initiateOIDCFlow handles the initial OIDC authentication request by redirecting to the provider
-func (p *OIDCProvider) initiateOIDCFlow(w http.ResponseWriter, r *http.Request) (services.UserAuthTokenDetail, error) {
-	// Generate state parameter for CSRF protection
-	state, err := generateSecureToken()
-	if err != nil {
-		log.Err(err).Msg("failed to generate OIDC state parameter")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("internal server error")
-	}
-
-	// Generate nonce parameter for replay attack protection
-	nonce, err := generateSecureToken()
-	if err != nil {
-		log.Err(err).Msg("failed to generate OIDC nonce parameter")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("internal server error")
-	}
-
-	// Generate PKCE verifier for code interception protection
-	pkceVerifier, err := generatePKCEVerifier()
-	if err != nil {
-		log.Err(err).Msg("failed to generate OIDC PKCE verifier")
-		return services.UserAuthTokenDetail{}, fmt.Errorf("internal server error")
-	}
-
-	// Get base URL from request
-	baseURL := p.getBaseURL(r)
-	u, _ := url.Parse(baseURL)
-	domain := u.Hostname()
-	if domain == "" {
-		domain = noPort(r.Host)
-	}
-
-	// Store state in session cookie for validation
-	http.SetCookie(w, &http.Cookie{
-		Name:     "oidc_state",
-		Value:    state,
-		Expires:  time.Now().Add(p.config.StateExpiry),
-		Domain:   domain,
-		Secure:   p.isSecure(r),
-		HttpOnly: true,
-		Path:     "/",
-		SameSite: http.SameSiteLaxMode,
-	})
-
-	// Store nonce in session cookie for validation
-	http.SetCookie(w, &http.Cookie{
-		Name:     "oidc_nonce",
-		Value:    nonce,
-		Expires:  time.Now().Add(p.config.StateExpiry),
-		Domain:   domain,
-		Secure:   p.isSecure(r),
-		HttpOnly: true,
-		Path:     "/",
-		SameSite: http.SameSiteLaxMode,
-	})
-
-	// Store PKCE verifier in session cookie for token exchange
-	http.SetCookie(w, &http.Cookie{
-		Name:     "oidc_pkce_verifier",
-		Value:    pkceVerifier,
-		Expires:  time.Now().Add(p.config.StateExpiry),
-		Domain:   domain,
-		Secure:   p.isSecure(r),
-		HttpOnly: true,
-		Path:     "/",
-		SameSite: http.SameSiteLaxMode,
-	})
-
-	// Generate auth URL and redirect
-	authURL := p.GetAuthURL(baseURL, state, nonce, pkceVerifier)
-	http.Redirect(w, r, authURL, http.StatusFound)
-
-	// Return empty token since this is a redirect response
-	return services.UserAuthTokenDetail{}, nil
-}
-
-// handleCallback processes the OAuth2 callback from the OIDC provider
-func (p *OIDCProvider) handleCallback(w http.ResponseWriter, r *http.Request) (services.UserAuthTokenDetail, error) {
-	// Helper to clear state cookie using computed domain
-	baseURL := p.getBaseURL(r)
-	u, _ := url.Parse(baseURL)
-	domain := u.Hostname()
-	if domain == "" {
-		domain = noPort(r.Host)
-	}
-	clearCookies := func() {
-		http.SetCookie(w, &http.Cookie{
-			Name:     "oidc_state",
-			Value:    "",
-			Expires:  time.Unix(0, 0),
-			Domain:   domain,
-			MaxAge:   -1,
-			Secure:   p.isSecure(r),
-			HttpOnly: true,
-			Path:     "/",
-			SameSite: http.SameSiteLaxMode,
-		})
-		http.SetCookie(w, &http.Cookie{
-			Name:     "oidc_nonce",
-			Value:    "",
-			Expires:  time.Unix(0, 0),
-			Domain:   domain,
-			MaxAge:   -1,
-			Secure:   p.isSecure(r),
-			HttpOnly: true,
-			Path:     "/",
-			SameSite: http.SameSiteLaxMode,
-		})
-		http.SetCookie(w, &http.Cookie{
-			Name:     "oidc_pkce_verifier",
-			Value:    "",
-			Expires:  time.Unix(0, 0),
-			Domain:   domain,
-			MaxAge:   -1,
-			Secure:   p.isSecure(r),
-			HttpOnly: true,
-			Path:     "/",
-			SameSite: http.SameSiteLaxMode,
-		})
-	}
-
-	// Check for OAuth error responses first
-	if errCode := r.URL.Query().Get("error"); errCode != "" {
-		errDesc := r.URL.Query().Get("error_description")
-		log.Warn().Str("error", errCode).Str("description", errDesc).Msg("OIDC provider returned error")
-		clearCookies()
-		return services.UserAuthTokenDetail{}, fmt.Errorf("OIDC provider error: %s - %s", errCode, errDesc)
-	}
-
-	// Verify state parameter
-	stateCookie, err := r.Cookie("oidc_state")
-	if err != nil {
-		log.Warn().Err(err).Msg("OIDC state cookie not found - possible CSRF attack or expired session")
-		clearCookies()
-		return services.UserAuthTokenDetail{}, fmt.Errorf("state cookie not found")
-	}
-
-	stateParam := r.URL.Query().Get("state")
-	if stateParam == "" {
-		log.Warn().Msg("OIDC state parameter missing from callback")
-		clearCookies()
-		return services.UserAuthTokenDetail{}, fmt.Errorf("state parameter missing")
-	}
-
-	if stateParam != stateCookie.Value {
-		log.Warn().Str("received", stateParam).Str("expected", stateCookie.Value).Msg("OIDC state mismatch - possible CSRF attack")
-		clearCookies()
-		return services.UserAuthTokenDetail{}, fmt.Errorf("state parameter mismatch")
-	}
-
-	// Verify nonce parameter
-	nonceCookie, err := r.Cookie("oidc_nonce")
-	if err != nil {
-		log.Warn().Err(err).Msg("OIDC nonce cookie not found - possible replay attack or expired session")
-		clearCookies()
-		return services.UserAuthTokenDetail{}, fmt.Errorf("nonce cookie not found")
-	}
-
-	// Verify PKCE verifier parameter
-	pkceCookie, err := r.Cookie("oidc_pkce_verifier")
-	if err != nil {
-		log.Warn().Err(err).Msg("OIDC PKCE verifier cookie not found - possible code interception attack or expired session")
-		clearCookies()
-		return services.UserAuthTokenDetail{}, fmt.Errorf("PKCE verifier cookie not found")
-	}
-
-	// Clear cookies before proceeding to token verification
-	clearCookies()
-
-	// Use the existing callback logic but return the token instead of redirecting
-	return p.AuthenticateWithBaseURL(baseURL, nonceCookie.Value, pkceCookie.Value, w, r)
-}
-
-// Helper functions
-func generateSecureToken() (string, error) {
-	// Generate 32 bytes of cryptographically secure random data
-	bytes := make([]byte, 32)
-	_, err := rand.Read(bytes)
-	if err != nil {
-		return "", fmt.Errorf("failed to generate secure random token: %w", err)
-	}
-	// Use URL-safe base64 encoding without padding for clean URLs
-	return base64.RawURLEncoding.EncodeToString(bytes), nil
-}
-
-// generatePKCEVerifier generates a cryptographically secure code verifier for PKCE
-func generatePKCEVerifier() (string, error) {
-	// PKCE verifier must be 43-128 characters, we'll use 43 for efficiency
-	// 32 bytes = 43 characters when base64url encoded without padding
-	bytes := make([]byte, 32)
-	_, err := rand.Read(bytes)
-	if err != nil {
-		return "", fmt.Errorf("failed to generate PKCE verifier: %w", err)
-	}
-	return base64.RawURLEncoding.EncodeToString(bytes), nil
-}
-
-// generatePKCEChallenge generates a code challenge from a verifier using S256 method
-func generatePKCEChallenge(verifier string) string {
-	hash := sha256.Sum256([]byte(verifier))
-	return base64.RawURLEncoding.EncodeToString(hash[:])
-}
-
-func noPort(host string) string {
-	return strings.Split(host, ":")[0]
-}
-
-func (p *OIDCProvider) getBaseURL(r *http.Request) string {
-	scheme := "http"
-	if r.TLS != nil {
-		scheme = "https"
-	} else if p.options.TrustProxy && r.Header.Get("X-Forwarded-Proto") == "https" {
-		scheme = "https"
-	}
-
-	host := r.Host
-	if p.options.Hostname != "" {
-		host = p.options.Hostname
-	} else if p.options.TrustProxy {
-		if xfHost := r.Header.Get("X-Forwarded-Host"); xfHost != "" {
-			host = xfHost
-		}
-	}
-
-	return scheme + "://" + host
-}
-
-func (p *OIDCProvider) isSecure(r *http.Request) bool {
-	_ = r
-	return p.cookieSecure
-}
-
-// InitiateOIDCFlow starts the OIDC authentication flow by redirecting to the provider
-func (p *OIDCProvider) InitiateOIDCFlow(w http.ResponseWriter, r *http.Request) (services.UserAuthTokenDetail, error) {
-	return p.initiateOIDCFlow(w, r)
-}
-
-// HandleCallback processes the OIDC callback and returns the authenticated user token
-func (p *OIDCProvider) HandleCallback(w http.ResponseWriter, r *http.Request) (services.UserAuthTokenDetail, error) {
-	return p.handleCallback(w, r)
-}
-
-func mergeOIDCClaims(primary, secondary map[string]interface{}) map[string]interface{} {
-	// primary has precedence; fill missing/empty values from secondary.
-	merged := make(map[string]interface{}, len(primary)+len(secondary))
-	for k, v := range primary {
-		merged[k] = v
-	}
-	for k, v := range secondary {
-		if existing, ok := merged[k]; !ok || isEmptyClaim(existing) {
-			merged[k] = v
-		}
-	}
-	return merged
-}
-
-func isEmptyClaim(v interface{}) bool {
-	if v == nil {
-		return true
-	}
-	switch val := v.(type) {
-	case string:
-		return val == ""
-	case []interface{}:
-		return len(val) == 0
-	case []string:
-		return len(val) == 0
-	default:
-		return false
-	}
-}

backend/app/api/recurring.go

@@ -1,151 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/hay-kot/httpkit/graceful"
-	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
-	"github.com/sysadminsmedia/homebox/backend/pkgs/utils"
-	"gocloud.dev/pubsub"
-)
-
-func registerRecurringTasks(app *app, cfg *config.Config, runner *graceful.Runner) {
-	runner.AddFunc("eventbus", app.bus.Run)
-
-	runner.AddFunc("seed_database", func(ctx context.Context) error {
-		if cfg.Demo {
-			log.Info().Msg("Running in demo mode, creating demo data")
-			err := app.SetupDemo()
-			if err != nil {
-				log.Error().Err(err).Msg("failed to setup demo data")
-				return fmt.Errorf("failed to setup demo data: %w", err)
-			}
-		}
-		return nil
-	})
-
-	runner.AddPlugin(NewTask("purge-tokens", 24*time.Hour, func(ctx context.Context) {
-		_, err := app.repos.AuthTokens.PurgeExpiredTokens(ctx)
-		if err != nil {
-			log.Error().Err(err).Msg("failed to purge expired tokens")
-		}
-	}))
-
-	runner.AddPlugin(NewTask("purge-invitations", 24*time.Hour, func(ctx context.Context) {
-		_, err := app.repos.Groups.InvitationPurge(ctx)
-		if err != nil {
-			log.Error().Err(err).Msg("failed to purge expired invitations")
-		}
-	}))
-
-	runner.AddPlugin(NewTask("send-notifications", time.Hour, func(ctx context.Context) {
-		now := time.Now()
-		if now.Hour() == 8 {
-			fmt.Println("run notifiers")
-			err := app.services.BackgroundService.SendNotifiersToday(context.Background())
-			if err != nil {
-				log.Error().Err(err).Msg("failed to send notifiers")
-			}
-		}
-	}))
-
-	if cfg.Thumbnail.Enabled {
-		runner.AddFunc("create-thumbnails-subscription", func(ctx context.Context) error {
-			pubsubString, err := utils.GenerateSubPubConn(cfg.Database.PubSubConnString, "thumbnails")
-			if err != nil {
-				log.Error().Err(err).Msg("failed to generate pubsub connection string")
-				return err
-			}
-			topic, err := pubsub.OpenTopic(ctx, pubsubString)
-			if err != nil {
-				return err
-			}
-			defer func(topic *pubsub.Topic, ctx context.Context) {
-				err := topic.Shutdown(ctx)
-				if err != nil {
-					log.Err(err).Msg("fail to shutdown pubsub topic")
-				}
-			}(topic, ctx)
-
-			subscription, err := pubsub.OpenSubscription(ctx, pubsubString)
-			if err != nil {
-				log.Err(err).Msg("failed to open pubsub topic")
-				return err
-			}
-			defer func(topic *pubsub.Subscription, ctx context.Context) {
-				err := topic.Shutdown(ctx)
-				if err != nil {
-					log.Err(err).Msg("fail to shutdown pubsub topic")
-				}
-			}(subscription, ctx)
-
-			for {
-				select {
-				case <-ctx.Done():
-					return ctx.Err()
-				default:
-					msg, err := subscription.Receive(ctx)
-					log.Debug().Msg("received thumbnail generation request from pubsub topic")
-					if err != nil {
-						log.Err(err).Msg("failed to receive message from pubsub topic")
-						continue
-					}
-					if msg == nil {
-						log.Warn().Msg("received nil message from pubsub topic")
-						continue
-					}
-					groupId, err := uuid.Parse(msg.Metadata["group_id"])
-					if err != nil {
-						log.Error().Err(err).Str("group_id", msg.Metadata["group_id"]).Msg("failed to parse group ID from message metadata")
-					}
-					attachmentId, err := uuid.Parse(msg.Metadata["attachment_id"])
-					if err != nil {
-						log.Error().Err(err).Str("attachment_id", msg.Metadata["attachment_id"]).Msg("failed to parse attachment ID from message metadata")
-					}
-					err = app.repos.Attachments.CreateThumbnail(ctx, groupId, attachmentId, msg.Metadata["title"], msg.Metadata["path"])
-					if err != nil {
-						log.Err(err).Msg("failed to create thumbnail")
-					}
-					msg.Ack()
-				}
-			}
-		})
-	}
-
-	if cfg.Options.GithubReleaseCheck {
-		runner.AddPlugin(NewTask("get-latest-github-release", time.Hour, func(ctx context.Context) {
-			log.Debug().Msg("running get latest github release")
-			err := app.services.BackgroundService.GetLatestGithubRelease(context.Background())
-			if err != nil {
-				log.Error().Err(err).Msg("failed to get latest github release")
-			}
-		}))
-	}
-
-	if cfg.Debug.Enabled {
-		runner.AddFunc("debug", func(ctx context.Context) error {
-			debugserver := http.Server{
-				Addr:         fmt.Sprintf("%s:%s", cfg.Web.Host, cfg.Debug.Port),
-				Handler:      app.debugRouter(),
-				ReadTimeout:  cfg.Web.ReadTimeout,
-				WriteTimeout: cfg.Web.WriteTimeout,
-				IdleTimeout:  cfg.Web.IdleTimeout,
-			}
-
-			go func() {
-				<-ctx.Done()
-				_ = debugserver.Shutdown(context.Background())
-			}()
-
-			log.Info().Msgf("Debug server is running on %s:%s", cfg.Web.Host, cfg.Debug.Port)
-			return debugserver.ListenAndServe()
-		})
-		// Print the configuration to the console
-		cfg.Print()
-	}
-}

backend/app/api/routes.go

@@ -10,15 +10,12 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/go-chi/chi/v5"
-	"github.com/hay-kot/httpkit/errchain"
-	httpSwagger "github.com/swaggo/http-swagger/v2" // http-swagger middleware
-	"github.com/sysadminsmedia/homebox/backend/app/api/handlers/debughandlers"
-	v1 "github.com/sysadminsmedia/homebox/backend/app/api/handlers/v1"
-	"github.com/sysadminsmedia/homebox/backend/app/api/providers"
-	_ "github.com/sysadminsmedia/homebox/backend/app/api/static/docs"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/ent/authroles"
-	"github.com/sysadminsmedia/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/app/api/handlers/debughandlers"
+	v1 "github.com/hay-kot/homebox/backend/app/api/handlers/v1"
+	_ "github.com/hay-kot/homebox/backend/app/api/static/docs"
+	"github.com/hay-kot/homebox/backend/internal/data/repo"
+	"github.com/hay-kot/homebox/backend/pkgs/server"
+	httpSwagger "github.com/swaggo/http-swagger" // http-swagger middleware
 )
 
 const prefix = "/api"
@@ -38,159 +35,78 @@ func (a *app) debugRouter() *http.ServeMux {
 }
 
 // registerRoutes registers all the routes for the API
-func (a *app) mountRoutes(r *chi.Mux, chain *errchain.ErrChain, repos *repo.AllRepos) {
+func (a *app) mountRoutes(repos *repo.AllRepos) {
 	registerMimes()
 
-	r.Get("/swagger/*", httpSwagger.Handler(
-		httpSwagger.URL("/swagger/doc.json"),
-	))
+	a.server.Get("/swagger/*", server.ToHandler(httpSwagger.Handler(
+		httpSwagger.URL(fmt.Sprintf("%s://%s/swagger/doc.json", a.conf.Swagger.Scheme, a.conf.Swagger.Host)),
+	)))
 
 	// =========================================================================
 	// API Version 1
 
+	v1Base := v1.BaseUrlFunc(prefix)
+
 	v1Ctrl := v1.NewControllerV1(
 		a.services,
 		a.repos,
-		a.bus,
-		a.conf,
 		v1.WithMaxUploadSize(a.conf.Web.MaxUploadSize),
-		v1.WithRegistration(a.conf.Options.AllowRegistration),
+		v1.WithRegistration(a.conf.AllowRegistration),
 		v1.WithDemoStatus(a.conf.Demo), // Disable Password Change in Demo Mode
-		v1.WithURL(fmt.Sprintf("%s:%s", a.conf.Web.Host, a.conf.Web.Port)),
 	)
 
-	r.Route(prefix+"/v1", func(r chi.Router) {
-		r.Get("/status", chain.ToHandlerFunc(v1Ctrl.HandleBase(func() bool { return true }, v1.Build{
-			Version:   version,
-			Commit:    commit,
-			BuildTime: buildTime,
-		})))
+	a.server.Get(v1Base("/status"), v1Ctrl.HandleBase(func() bool { return true }, v1.Build{
+		Version:   version,
+		Commit:    commit,
+		BuildTime: buildTime,
+	}))
 
-		r.Get("/currencies", chain.ToHandlerFunc(v1Ctrl.HandleCurrency()))
+	a.server.Post(v1Base("/users/register"), v1Ctrl.HandleUserRegistration())
+	a.server.Post(v1Base("/users/login"), v1Ctrl.HandleAuthLogin())
 
-		providers := []v1.AuthProvider{
-			providers.NewLocalProvider(a.services.User),
-		}
+	// Attachment download URl needs a `token` query param to be passed in the request.
+	// and also needs to be outside of the `auth` middleware.
+	a.server.Get(v1Base("/items/{id}/attachments/download"), v1Ctrl.HandleItemAttachmentDownload())
 
-		r.Post("/users/register", chain.ToHandlerFunc(v1Ctrl.HandleUserRegistration()))
-		r.Post("/users/login", chain.ToHandlerFunc(v1Ctrl.HandleAuthLogin(providers...)))
+	a.server.Get(v1Base("/users/self"), v1Ctrl.HandleUserSelf(), a.mwAuthToken)
+	a.server.Put(v1Base("/users/self"), v1Ctrl.HandleUserSelfUpdate(), a.mwAuthToken)
+	a.server.Delete(v1Base("/users/self"), v1Ctrl.HandleUserSelfDelete(), a.mwAuthToken)
+	a.server.Post(v1Base("/users/logout"), v1Ctrl.HandleAuthLogout(), a.mwAuthToken)
+	a.server.Get(v1Base("/users/refresh"), v1Ctrl.HandleAuthRefresh(), a.mwAuthToken)
+	a.server.Put(v1Base("/users/self/change-password"), v1Ctrl.HandleUserSelfChangePassword(), a.mwAuthToken)
 
-		if a.conf.OIDC.Enabled {
-			r.Get("/users/login/oidc", chain.ToHandlerFunc(v1Ctrl.HandleOIDCLogin()))
-			r.Get("/users/login/oidc/callback", chain.ToHandlerFunc(v1Ctrl.HandleOIDCCallback()))
-		}
+	a.server.Post(v1Base("/groups/invitations"), v1Ctrl.HandleGroupInvitationsCreate(), a.mwAuthToken)
+	a.server.Get(v1Base("/groups/statistics"), v1Ctrl.HandleGroupStatistics(), a.mwAuthToken)
 
-		userMW := []errchain.Middleware{
-			a.mwAuthToken,
-			a.mwRoles(RoleModeOr, authroles.RoleUser.String()),
-		}
+	// TODO: I don't like /groups being the URL for users
+	a.server.Get(v1Base("/groups"), v1Ctrl.HandleGroupGet(), a.mwAuthToken)
+	a.server.Put(v1Base("/groups"), v1Ctrl.HandleGroupUpdate(), a.mwAuthToken)
 
-		r.Get("/ws/events", chain.ToHandlerFunc(v1Ctrl.HandleCacheWS(), userMW...))
-		r.Get("/users/self", chain.ToHandlerFunc(v1Ctrl.HandleUserSelf(), userMW...))
-		r.Put("/users/self", chain.ToHandlerFunc(v1Ctrl.HandleUserSelfUpdate(), userMW...))
-		r.Delete("/users/self", chain.ToHandlerFunc(v1Ctrl.HandleUserSelfDelete(), userMW...))
-		r.Post("/users/logout", chain.ToHandlerFunc(v1Ctrl.HandleAuthLogout(), userMW...))
-		r.Get("/users/refresh", chain.ToHandlerFunc(v1Ctrl.HandleAuthRefresh(), userMW...))
-		r.Put("/users/self/change-password", chain.ToHandlerFunc(v1Ctrl.HandleUserSelfChangePassword(), userMW...))
+	a.server.Get(v1Base("/locations"), v1Ctrl.HandleLocationGetAll(), a.mwAuthToken)
+	a.server.Post(v1Base("/locations"), v1Ctrl.HandleLocationCreate(), a.mwAuthToken)
+	a.server.Get(v1Base("/locations/{id}"), v1Ctrl.HandleLocationGet(), a.mwAuthToken)
+	a.server.Put(v1Base("/locations/{id}"), v1Ctrl.HandleLocationUpdate(), a.mwAuthToken)
+	a.server.Delete(v1Base("/locations/{id}"), v1Ctrl.HandleLocationDelete(), a.mwAuthToken)
 
-		r.Post("/groups/invitations", chain.ToHandlerFunc(v1Ctrl.HandleGroupInvitationsCreate(), userMW...))
-		r.Get("/groups/statistics", chain.ToHandlerFunc(v1Ctrl.HandleGroupStatistics(), userMW...))
-		r.Get("/groups/statistics/purchase-price", chain.ToHandlerFunc(v1Ctrl.HandleGroupStatisticsPriceOverTime(), userMW...))
-		r.Get("/groups/statistics/locations", chain.ToHandlerFunc(v1Ctrl.HandleGroupStatisticsLocations(), userMW...))
-		r.Get("/groups/statistics/labels", chain.ToHandlerFunc(v1Ctrl.HandleGroupStatisticsLabels(), userMW...))
+	a.server.Get(v1Base("/labels"), v1Ctrl.HandleLabelsGetAll(), a.mwAuthToken)
+	a.server.Post(v1Base("/labels"), v1Ctrl.HandleLabelsCreate(), a.mwAuthToken)
+	a.server.Get(v1Base("/labels/{id}"), v1Ctrl.HandleLabelGet(), a.mwAuthToken)
+	a.server.Put(v1Base("/labels/{id}"), v1Ctrl.HandleLabelUpdate(), a.mwAuthToken)
+	a.server.Delete(v1Base("/labels/{id}"), v1Ctrl.HandleLabelDelete(), a.mwAuthToken)
 
-		// TODO: I don't like /groups being the URL for users
-		r.Get("/groups", chain.ToHandlerFunc(v1Ctrl.HandleGroupGet(), userMW...))
-		r.Put("/groups", chain.ToHandlerFunc(v1Ctrl.HandleGroupUpdate(), userMW...))
+	a.server.Get(v1Base("/items"), v1Ctrl.HandleItemsGetAll(), a.mwAuthToken)
+	a.server.Post(v1Base("/items/import"), v1Ctrl.HandleItemsImport(), a.mwAuthToken)
+	a.server.Post(v1Base("/items"), v1Ctrl.HandleItemsCreate(), a.mwAuthToken)
+	a.server.Get(v1Base("/items/{id}"), v1Ctrl.HandleItemGet(), a.mwAuthToken)
+	a.server.Put(v1Base("/items/{id}"), v1Ctrl.HandleItemUpdate(), a.mwAuthToken)
+	a.server.Delete(v1Base("/items/{id}"), v1Ctrl.HandleItemDelete(), a.mwAuthToken)
 
-		r.Post("/actions/ensure-asset-ids", chain.ToHandlerFunc(v1Ctrl.HandleEnsureAssetID(), userMW...))
-		r.Post("/actions/zero-item-time-fields", chain.ToHandlerFunc(v1Ctrl.HandleItemDateZeroOut(), userMW...))
-		r.Post("/actions/ensure-import-refs", chain.ToHandlerFunc(v1Ctrl.HandleEnsureImportRefs(), userMW...))
-		r.Post("/actions/set-primary-photos", chain.ToHandlerFunc(v1Ctrl.HandleSetPrimaryPhotos(), userMW...))
-		r.Post("/actions/create-missing-thumbnails", chain.ToHandlerFunc(v1Ctrl.HandleCreateMissingThumbnails(), userMW...))
+	a.server.Post(v1Base("/items/{id}/attachments"), v1Ctrl.HandleItemAttachmentCreate(), a.mwAuthToken)
+	a.server.Get(v1Base("/items/{id}/attachments/{attachment_id}"), v1Ctrl.HandleItemAttachmentToken(), a.mwAuthToken)
+	a.server.Put(v1Base("/items/{id}/attachments/{attachment_id}"), v1Ctrl.HandleItemAttachmentUpdate(), a.mwAuthToken)
+	a.server.Delete(v1Base("/items/{id}/attachments/{attachment_id}"), v1Ctrl.HandleItemAttachmentDelete(), a.mwAuthToken)
 
-		r.Get("/locations", chain.ToHandlerFunc(v1Ctrl.HandleLocationGetAll(), userMW...))
-		r.Post("/locations", chain.ToHandlerFunc(v1Ctrl.HandleLocationCreate(), userMW...))
-		r.Get("/locations/tree", chain.ToHandlerFunc(v1Ctrl.HandleLocationTreeQuery(), userMW...))
-		r.Get("/locations/{id}", chain.ToHandlerFunc(v1Ctrl.HandleLocationGet(), userMW...))
-		r.Put("/locations/{id}", chain.ToHandlerFunc(v1Ctrl.HandleLocationUpdate(), userMW...))
-		r.Delete("/locations/{id}", chain.ToHandlerFunc(v1Ctrl.HandleLocationDelete(), userMW...))
-
-		r.Get("/labels", chain.ToHandlerFunc(v1Ctrl.HandleLabelsGetAll(), userMW...))
-		r.Post("/labels", chain.ToHandlerFunc(v1Ctrl.HandleLabelsCreate(), userMW...))
-		r.Get("/labels/{id}", chain.ToHandlerFunc(v1Ctrl.HandleLabelGet(), userMW...))
-		r.Put("/labels/{id}", chain.ToHandlerFunc(v1Ctrl.HandleLabelUpdate(), userMW...))
-		r.Delete("/labels/{id}", chain.ToHandlerFunc(v1Ctrl.HandleLabelDelete(), userMW...))
-
-		r.Get("/items", chain.ToHandlerFunc(v1Ctrl.HandleItemsGetAll(), userMW...))
-		r.Post("/items", chain.ToHandlerFunc(v1Ctrl.HandleItemsCreate(), userMW...))
-		r.Post("/items/import", chain.ToHandlerFunc(v1Ctrl.HandleItemsImport(), userMW...))
-		r.Get("/items/export", chain.ToHandlerFunc(v1Ctrl.HandleItemsExport(), userMW...))
-		r.Get("/items/fields", chain.ToHandlerFunc(v1Ctrl.HandleGetAllCustomFieldNames(), userMW...))
-		r.Get("/items/fields/values", chain.ToHandlerFunc(v1Ctrl.HandleGetAllCustomFieldValues(), userMW...))
-
-		r.Get("/items/{id}", chain.ToHandlerFunc(v1Ctrl.HandleItemGet(), userMW...))
-		r.Get("/items/{id}/path", chain.ToHandlerFunc(v1Ctrl.HandleItemFullPath(), userMW...))
-		r.Put("/items/{id}", chain.ToHandlerFunc(v1Ctrl.HandleItemUpdate(), userMW...))
-		r.Patch("/items/{id}", chain.ToHandlerFunc(v1Ctrl.HandleItemPatch(), userMW...))
-		r.Delete("/items/{id}", chain.ToHandlerFunc(v1Ctrl.HandleItemDelete(), userMW...))
-		r.Post("/items/{id}/duplicate", chain.ToHandlerFunc(v1Ctrl.HandleItemDuplicate(), userMW...))
-
-		r.Post("/items/{id}/attachments", chain.ToHandlerFunc(v1Ctrl.HandleItemAttachmentCreate(), userMW...))
-		r.Put("/items/{id}/attachments/{attachment_id}", chain.ToHandlerFunc(v1Ctrl.HandleItemAttachmentUpdate(), userMW...))
-		r.Delete("/items/{id}/attachments/{attachment_id}", chain.ToHandlerFunc(v1Ctrl.HandleItemAttachmentDelete(), userMW...))
-
-		r.Get("/items/{id}/maintenance", chain.ToHandlerFunc(v1Ctrl.HandleMaintenanceLogGet(), userMW...))
-		r.Post("/items/{id}/maintenance", chain.ToHandlerFunc(v1Ctrl.HandleMaintenanceEntryCreate(), userMW...))
-
-		r.Get("/assets/{id}", chain.ToHandlerFunc(v1Ctrl.HandleAssetGet(), userMW...))
-
-		// Item Templates
-		r.Get("/templates", chain.ToHandlerFunc(v1Ctrl.HandleItemTemplatesGetAll(), userMW...))
-		r.Post("/templates", chain.ToHandlerFunc(v1Ctrl.HandleItemTemplatesCreate(), userMW...))
-		r.Get("/templates/{id}", chain.ToHandlerFunc(v1Ctrl.HandleItemTemplatesGet(), userMW...))
-		r.Put("/templates/{id}", chain.ToHandlerFunc(v1Ctrl.HandleItemTemplatesUpdate(), userMW...))
-		r.Delete("/templates/{id}", chain.ToHandlerFunc(v1Ctrl.HandleItemTemplatesDelete(), userMW...))
-		r.Post("/templates/{id}/create-item", chain.ToHandlerFunc(v1Ctrl.HandleItemTemplatesCreateItem(), userMW...))
-
-		// Maintenance
-		r.Get("/maintenance", chain.ToHandlerFunc(v1Ctrl.HandleMaintenanceGetAll(), userMW...))
-		r.Put("/maintenance/{id}", chain.ToHandlerFunc(v1Ctrl.HandleMaintenanceEntryUpdate(), userMW...))
-		r.Delete("/maintenance/{id}", chain.ToHandlerFunc(v1Ctrl.HandleMaintenanceEntryDelete(), userMW...))
-
-		// Notifiers
-		r.Get("/notifiers", chain.ToHandlerFunc(v1Ctrl.HandleGetUserNotifiers(), userMW...))
-		r.Post("/notifiers", chain.ToHandlerFunc(v1Ctrl.HandleCreateNotifier(), userMW...))
-		r.Put("/notifiers/{id}", chain.ToHandlerFunc(v1Ctrl.HandleUpdateNotifier(), userMW...))
-		r.Delete("/notifiers/{id}", chain.ToHandlerFunc(v1Ctrl.HandleDeleteNotifier(), userMW...))
-		r.Post("/notifiers/test", chain.ToHandlerFunc(v1Ctrl.HandlerNotifierTest(), userMW...))
-
-		// Asset-Like endpoints
-		assetMW := []errchain.Middleware{
-			a.mwAuthToken,
-			a.mwRoles(RoleModeOr, authroles.RoleUser.String(), authroles.RoleAttachments.String()),
-		}
-
-		r.Get("/products/search-from-barcode", chain.ToHandlerFunc(v1Ctrl.HandleProductSearchFromBarcode(a.conf.Barcode), userMW...))
-
-		r.Get("/qrcode", chain.ToHandlerFunc(v1Ctrl.HandleGenerateQRCode(), assetMW...))
-		r.Get(
-			"/items/{id}/attachments/{attachment_id}",
-			chain.ToHandlerFunc(v1Ctrl.HandleItemAttachmentGet(), assetMW...),
-		)
-
-		// Labelmaker
-		r.Get("/labelmaker/location/{id}", chain.ToHandlerFunc(v1Ctrl.HandleGetLocationLabel(), userMW...))
-		r.Get("/labelmaker/item/{id}", chain.ToHandlerFunc(v1Ctrl.HandleGetItemLabel(), userMW...))
-		r.Get("/labelmaker/asset/{id}", chain.ToHandlerFunc(v1Ctrl.HandleGetAssetLabel(), userMW...))
-
-		// Reporting Services
-		r.Get("/reporting/bill-of-materials", chain.ToHandlerFunc(v1Ctrl.HandleBillOfMaterialsExport(), userMW...))
-
-		r.NotFound(http.NotFound)
-	})
-
-	r.NotFound(chain.ToHandlerFunc(notFoundHandler()))
+	a.server.NotFound(notFoundHandler())
 }
 
 func registerMimes() {
@@ -207,13 +123,13 @@ func registerMimes() {
 
 // notFoundHandler perform the main logic around handling the internal SPA embed and ensuring that
 // the client side routing is handled correctly.
-func notFoundHandler() errchain.HandlerFunc {
+func notFoundHandler() server.HandlerFunc {
 	tryRead := func(fs embed.FS, prefix, requestedPath string, w http.ResponseWriter) error {
 		f, err := fs.Open(path.Join(prefix, requestedPath))
 		if err != nil {
 			return err
 		}
-		defer func() { _ = f.Close() }()
+		defer f.Close()
 
 		stat, _ := f.Stat()
 		if stat.IsDir() {

backend/app/api/setup.go

@@ -1,103 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/rs/zerolog/log"
-	"github.com/sysadminsmedia/homebox/backend/internal/core/currencies"
-	"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
-)
-
-// setupStorageDir handles the creation and validation of the storage directory.
-func setupStorageDir(cfg *config.Config) error {
-	if strings.HasPrefix(cfg.Storage.ConnString, "file:///./") {
-		raw := strings.TrimPrefix(cfg.Storage.ConnString, "file:///./")
-		clean := filepath.Clean(raw)
-		absBase, err := filepath.Abs(clean)
-		if err != nil {
-			log.Error().Err(err).Msg("failed to get absolute path for storage connection string")
-			return fmt.Errorf("failed to get absolute path for storage connection string: %w", err)
-		}
-		absBase = strings.ReplaceAll(absBase, "\\", "/")
-		storageDir := filepath.Join(absBase, cfg.Storage.PrefixPath)
-		storageDir = strings.ReplaceAll(storageDir, "\\", "/")
-		if !strings.HasPrefix(storageDir, absBase+"/") && storageDir != absBase {
-			log.Error().Str("path", storageDir).Msg("invalid storage path: you tried to use a prefix that is not a subdirectory of the base path")
-			return fmt.Errorf("invalid storage path: you tried to use a prefix that is not a subdirectory of the base path")
-		}
-		if err := os.MkdirAll(storageDir, 0o750); err != nil {
-			log.Error().Err(err).Msg("failed to create data directory")
-			return fmt.Errorf("failed to create data directory: %w", err)
-		}
-	}
-	return nil
-}
-
-// setupDatabaseURL returns the database URL and ensures any required directories exist.
-func setupDatabaseURL(cfg *config.Config) (string, error) {
-	databaseURL := ""
-	switch strings.ToLower(cfg.Database.Driver) {
-	case "sqlite3":
-		databaseURL = cfg.Database.SqlitePath
-		dbFilePath := strings.Split(cfg.Database.SqlitePath, "?")[0]
-		dbDir := filepath.Dir(dbFilePath)
-		if err := os.MkdirAll(dbDir, 0o755); err != nil {
-			log.Error().Err(err).Str("path", dbDir).Msg("failed to create SQLite database directory")
-			return "", fmt.Errorf("failed to create SQLite database directory: %w", err)
-		}
-	case "postgres":
-		databaseURL = fmt.Sprintf("host=%s port=%s dbname=%s sslmode=%s", cfg.Database.Host, cfg.Database.Port, cfg.Database.Database, cfg.Database.SslMode)
-		if cfg.Database.Username != "" {
-			databaseURL += fmt.Sprintf(" user=%s", cfg.Database.Username)
-		}
-		if cfg.Database.Password != "" {
-			databaseURL += fmt.Sprintf(" password=%s", cfg.Database.Password)
-		}
-		if cfg.Database.SslRootCert != "" {
-			if _, err := os.Stat(cfg.Database.SslRootCert); err != nil {
-				log.Error().Err(err).Str("path", cfg.Database.SslRootCert).Msg("SSL root certificate file is not accessible")
-				return "", fmt.Errorf("SSL root certificate file is not accessible: %w", err)
-			}
-			databaseURL += fmt.Sprintf(" sslrootcert=%s", cfg.Database.SslRootCert)
-		}
-		if cfg.Database.SslCert != "" {
-			if _, err := os.Stat(cfg.Database.SslCert); err != nil {
-				log.Error().Err(err).Str("path", cfg.Database.SslCert).Msg("SSL certificate file is not accessible")
-				return "", fmt.Errorf("SSL certificate file is not accessible: %w", err)
-			}
-			databaseURL += fmt.Sprintf(" sslcert=%s", cfg.Database.SslCert)
-		}
-		if cfg.Database.SslKey != "" {
-			if _, err := os.Stat(cfg.Database.SslKey); err != nil {
-				log.Error().Err(err).Str("path", cfg.Database.SslKey).Msg("SSL key file is not accessible")
-				return "", fmt.Errorf("SSL key file is not accessible: %w", err)
-			}
-			databaseURL += fmt.Sprintf(" sslkey=%s", cfg.Database.SslKey)
-		}
-	default:
-		log.Error().Str("driver", cfg.Database.Driver).Msg("unsupported database driver")
-		return "", fmt.Errorf("unsupported database driver: %s", cfg.Database.Driver)
-	}
-	return databaseURL, nil
-}
-
-// loadCurrencies loads currency data from config if provided.
-func loadCurrencies(cfg *config.Config) ([]currencies.CollectorFunc, error) {
-	collectFuncs := []currencies.CollectorFunc{
-		currencies.CollectDefaults(),
-	}
-	if cfg.Options.CurrencyConfig != "" {
-		log.Info().Str("path", cfg.Options.CurrencyConfig).Msg("loading currency config file")
-		content, err := os.ReadFile(cfg.Options.CurrencyConfig)
-		if err != nil {
-			log.Error().Err(err).Str("path", cfg.Options.CurrencyConfig).Msg("failed to read currency config file")
-			return nil, err
-		}
-		collectFuncs = append(collectFuncs, currencies.CollectJSON(bytes.NewReader(content)))
-	}
-	return collectFuncs, nil
-}

backend/app/tools/migrations/main.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"context"
+	"log"
+	"os"
+
+	"github.com/hay-kot/homebox/backend/internal/data/ent/migrate"
+
+	atlas "ariga.io/atlas/sql/migrate"
+	_ "ariga.io/atlas/sql/sqlite"
+	"entgo.io/ent/dialect"
+	"entgo.io/ent/dialect/sql/schema"
+	_ "github.com/mattn/go-sqlite3"
+)
+
+func main() {
+	ctx := context.Background()
+	// Create a local migration directory able to understand Atlas migration file format for replay.
+	dir, err := atlas.NewLocalDir("internal/data/migrations/migrations")
+	if err != nil {
+		log.Fatalf("failed creating atlas migration directory: %v", err)
+	}
+	// Migrate diff options.
+	opts := []schema.MigrateOption{
+		schema.WithDir(dir),                         // provide migration directory
+		schema.WithMigrationMode(schema.ModeReplay), // provide migration mode
+		schema.WithDialect(dialect.SQLite),          // Ent dialect to use
+		schema.WithFormatter(atlas.DefaultFormatter),
+		schema.WithDropIndex(true),
+		schema.WithDropColumn(true),
+	}
+	if len(os.Args) != 2 {
+		log.Fatalln("migration name is required. Use: 'go run -mod=mod ent/migrate/main.go <name>'")
+	}
+
+	// Generate migrations using Atlas support for MySQL (note the Ent dialect option passed above).
+	err = migrate.NamedDiff(ctx, "sqlite://.data/homebox.migration.db?_fk=1", os.Args[1], opts...)
+	if err != nil {
+		log.Fatalf("failed generating migration file: %v", err)
+	}
+}

backend/app/tools/typegen/main.go

@@ -1,81 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"regexp"
-)
-
-type ReReplace struct {
-	Regex *regexp.Regexp
-	Text  string
-}
-
-func NewReReplace(regex string, replace string) ReReplace {
-	return ReReplace{
-		Regex: regexp.MustCompile(regex),
-		Text:  replace,
-	}
-}
-
-func NewReDate(dateStr string) ReReplace {
-	return ReReplace{
-		Regex: regexp.MustCompile(fmt.Sprintf(`%s: string`, dateStr)),
-		Text:  fmt.Sprintf(`%s: Date | string`, dateStr),
-	}
-}
-
-func main() {
-	if len(os.Args) != 2 {
-		fmt.Println("Please provide a file path as an argument")
-		os.Exit(1)
-	}
-
-	path := os.Args[1]
-
-	fmt.Printf("Processing %s\n", path)
-
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		fmt.Printf("File %s does not exist\n", path)
-		os.Exit(1)
-	}
-
-	text := "/* post-processed by ./scripts/process-types.go */\n"
-	data, err := os.ReadFile(path)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-	text += string(data)
-
-	replaces := [...]ReReplace{
-		NewReReplace(` Repo`, " "),
-		NewReReplace(` PaginationResultRepo`, " PaginationResult"),
-		NewReReplace(` Services`, " "),
-		NewReReplace(` V1`, " "),
-		NewReReplace(`\?:`, ":"),
-		NewReReplace(`(\w+):\s(.*null.*)`, "$1?: $2"), // make null union types optional
-		NewReDate("createdAt"),
-		NewReDate("updatedAt"),
-		NewReDate("soldTime"),
-		NewReDate("purchaseTime"),
-		NewReDate("warrantyExpires"),
-		NewReDate("expiresAt"),
-		NewReDate("date"),
-		NewReDate("completedDate"),
-		NewReDate("scheduledDate"),
-	}
-
-	for _, replace := range replaces {
-		fmt.Printf("Replacing '%v' -> '%s'\n", replace.Regex, replace.Text)
-		text = replace.Regex.ReplaceAllString(text, replace.Text)
-	}
-
-	err = os.WriteFile(path, []byte(text), 0644)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-
-	os.Exit(0)
-}

backend/cosign.key

@@ -1,11 +0,0 @@
------BEGIN ENCRYPTED SIGSTORE PRIVATE KEY-----
-eyJrZGYiOnsibmFtZSI6InNjcnlwdCIsInBhcmFtcyI6eyJOIjo2NTUzNiwiciI6
-OCwicCI6MX0sInNhbHQiOiJ3bmU3TTd2dndlL2FBS1piUEE2QktsdFNzMkhkSk9v
-eXlvOTNLMnByRXdJPSJ9LCJjaXBoZXIiOnsibmFtZSI6Im5hY2wvc2VjcmV0Ym94
-Iiwibm9uY2UiOiJoOWdIMHRsYk9zMnZIbVBTYk5zaGxBQU5TYUlkcVZoQiJ9LCJj
-aXBoZXJ0ZXh0IjoiTERiQk5ac3ZlVnRMbTlQdkRTa2t6bzRrWGExVGRTTEY5VzVO
-cGd6M05GNVJLRWlGRmJQRDJDYzhnTWNkRmkrTU8xd2FTUzFGWWdXU3BIdnI3QXZ3
-K0tUTXVWLzhSZ1pnOE9ieHNJY2xKSlZldHRLTzdzWXY2aWgxM09iZlVBV0lQcGpS
-ZUQ5UmE3WjJwbWd0SkpBdjl2dlk1RGNNeGRKcFFrOEY1UStLZytSbnhLRUd6Z1ZN
-MWUxdjF3UGhsOWhVRGRMSFVSTzE5Z0w3aFE9PSJ9
------END ENCRYPTED SIGSTORE PRIVATE KEY-----

backend/cosign.pub

@@ -1,4 +0,0 @@
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE2DXKcerPznDayM+rMJ/25w+ubI8g
-e3ZTbm07VqLFz6uI2vXqN8X7/72dygtJlUw07FpR0oLXaSia0adaywz1JA==
------END PUBLIC KEY-----