chore: release v1.4.9

* fix

* fix

* fix

* fix

* Update docker.yml

* Update auto-release.yml

* Update pr-checker.yml

* Update pr-checker.yml

* fix: citation version

---------

Co-authored-by: Théo LAGACHE <theo.lagache@soluce-technologies.com>

.env.example

@@ -1,10 +1,10 @@
-# Environnement
+# Environment
 NODE_ENV=development
 
-# Base de données
+# Database
 DATABASE_URL=postgresql://devuser:changeme@localhost:5433/devdb?schema=public
 
-# Projet
+# Project
 PROJECT_NAME="Portabase"
 PROJECT_DESCRIPTION="Portabase is a powerful database manager"
 PROJECT_URL=http://localhost:8887
@@ -21,11 +21,41 @@ SMTP_FROM=
 #Port 465 -> secure: true
 #By default : true
 
-# Google
-AUTH_GOOGLE_ID=
-AUTH_GOOGLE_SECRET=
-AUTH_GOOGLE_METHOD=
+# OIDC SSO Authentification
+AUTH_OIDC_ID=""
+AUTH_OIDC_TITLE=""
+AUTH_OIDC_DESC=""
+AUTH_OIDC_ICON=""
+AUTH_OIDC_CLIENT=""
+AUTH_OIDC_SECRET=""
+AUTH_OIDC_ISSUER_URL=""
+AUTH_OIDC_HOST=""
+AUTH_OIDC_SCOPES=""
+AUTH_OIDC_DISCOVERY_ENDPOINT=""
+AUTH_OIDC_JWKS_ENDPOINT=""
+AUTH_OIDC_PKCE=true
+ALLOWED_GROUP="admin"
+AUTH_OIDC_ROLE_MAP=""
+
+AUTH_ALLOW_LINKING=true
+AUTH_ALLOW_UNLINKING=true
+
+
+# Social OAuth2 Authentification
+AUTH_SOCIAL_ID=""
+AUTH_SOCIAL_TITLE=""
+AUTH_SOCIAL_DESC=""
+AUTH_SOCIAL_ICON=""
+AUTH_SOCIAL_CLIENT=""
+AUTH_SOCIAL_SECRET=""
+AUTH_SOCIAL_APPLE_APP_BUNDLE_IDENTIFIER=""
+
+# If true, the user's role will be updated from OIDC claims on every login.
+# If false, the role is only set when the user is first created.
+AUTH_SYNC_OIDC_ROLES_ON_LOGIN=true
+AUTH_EMAIL_PASSWORD_ENABLED=true
+AUTH_SIGNUP_ENABLED=true
+AUTH_PASSKEY_ENABLED=true
 
 # Retention
 RETENTION_CRON="* * * * *"
-

.github/workflows/auto-release.yml

@@ -0,0 +1,46 @@
+name: Auto Release bot
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - main
+
+jobs:
+  release:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+          ref: ${{ github.base_ref }}
+
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: "pnpm"
+
+      - run: pnpm install --frozen-lockfile
+
+      - run: git config --global user.name 'github-actions[bot]'
+      - run: git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Run release-it
+        run: |
+          git pull origin main
+          pnpm exec release-it --ci
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/discord.yml

@@ -1,16 +1,8 @@
-name: GitHub Release
+name: Discord Notification
 
 on:
   workflow_call:
     inputs:
-      prerelease:
-        required: false
-        type: boolean
-        default: false
-      make_latest:
-        required: false
-        type: boolean
-        default: false
       discord_title:
         required: true
         type: string
@@ -27,74 +19,24 @@ on:
         required: true
 
 jobs:
-  create-release:
+  notify-discord:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Build Changelog
-        id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v5
-        with:
-          mode: "COMMIT"
-          configurationJson: |
-            {
-              "template": "#{{CHANGELOG}}",
-              "categories": [
-                {
-                    "title": "## Feature",
-                    "labels": ["feat", "feature"]
-                },
-                {
-                    "title": "## Fix",
-                    "labels": ["fix", "bug"]
-                },
-                {
-                    "title": "## Other",
-                    "labels": []
-                }
-              ],
-              "label_extractor": [
-                {
-                  "pattern": "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test){1}(\([\w\-\.]+\))?(!)?: ([\w ])+([\s\S]*)",
-                  "on_property": "title",
-                  "target": "$1"
-                }
-              ]
-            }
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          generate_release_notes: false
-          body: ${{ steps.build_changelog.outputs.changelog }}
-          prerelease: ${{ inputs.prerelease }}
-          make_latest: ${{ inputs.make_latest }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-
       - name: Send Discord Notification
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
         run: |
           RELEASE_INFO=$(gh release view "${{ github.ref_name }}" -R ${{ github.repository }} --json name,url,body,author)
-          
+
           RELEASE_TITLE=$(echo "$RELEASE_INFO" | jq -r .name)
           if [ -z "$RELEASE_TITLE" ] || [ "$RELEASE_TITLE" = "null" ]; then RELEASE_TITLE="${{ github.ref_name }}"; fi
-          
+
           RELEASE_URL=$(echo "$RELEASE_INFO" | jq -r .url)
           RELEASE_BODY=$(echo "$RELEASE_INFO" | jq -r .body)
-          
+
           AUTHOR_NAME="Portabase"
-          AUTHOR_ICON="https://github.com/Portabase.png" 
+          AUTHOR_ICON="https://github.com/Portabase.png"
 
           PAYLOAD=$(jq -n \
             --arg title "$RELEASE_TITLE" \
@@ -105,7 +47,7 @@ jobs:
             --arg discord_title "${{ inputs.discord_title }}" \
             --arg discord_footer "${{ inputs.discord_footer }}" \
             --argjson discord_color ${{ inputs.discord_color }} \
-            '{ 
+            '{
               content: $discord_title,
               embeds: [{
                 title: $title,
@@ -121,8 +63,8 @@ jobs:
                 }
               }]
             }'
-          ) 
-          
+          )
+
           curl -H "Content-Type: application/json" \
                -d "$PAYLOAD" \
                "$DISCORD_WEBHOOK"

.github/workflows/docker.yml

@@ -6,11 +6,7 @@ on:
       image_name:
         required: false
         type: string
-        default: 'solucetechnologies/portabase'
-      image_name2:
-        required: false
-        type: string
-        default: 'portabase/portabase'
+        default: "portabase/portabase"
       add_latest:
         required: false
         type: boolean
@@ -18,80 +14,101 @@ on:
       target:
         required: false
         type: string
-        default: 'prod'
+        default: "prod"
       dockerfile:
         required: false
         type: string
-        default: './docker/dockerfile/Dockerfile'
+        default: "./docker/dockerfile/Dockerfile"
     secrets:
       DOCKER_USERNAME:
         required: true
       DOCKER_PASSWORD:
         required: true
-      DOCKER_USERNAME_2:
-        required: true
-      DOCKER_PASSWORD_2:
-        required: true
 
 jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
+  build:
+    name: Build architectures
+    runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'ubuntu-24.04-arm' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [linux/amd64, linux/arm64]
     steps:
-      - name: Check out the repo
+      - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set tags
-        id: set-tags
-        run: |
-          REF_NAME=${GITHUB_REF#refs/tags/}
-          TAGS="${{ inputs.image_name }}:$REF_NAME"
-          TAGS2="${{ inputs.image_name2 }}:$REF_NAME"
-          if [[ "${{ inputs.add_latest }}" == "true" ]]; then
-            TAGS="$TAGS,${{ inputs.image_name }}:latest"
-            TAGS2="$TAGS2,${{ inputs.image_name2 }}:latest"
-          fi
-          echo "tags=$TAGS" >> $GITHUB_OUTPUT
-          echo "tags2=$TAGS2" >> $GITHUB_OUTPUT
-
-      - name: Set up QEMU (enables multi-arch emulation)
-        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Log in to Docker Hub account 1
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+      - name: Login to Docker
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and push to solucetechnologies/portabase
+      - name: Prepare Image Tags
+        id: prep
+        run: |
+          ARCH=${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
+          echo "image=${{ inputs.image_name }}:${GITHUB_REF#refs/tags/}-$ARCH" >> $GITHUB_OUTPUT
+          echo "safe_platform=${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}" >> $GITHUB_OUTPUT
+
+      - name: Build and push image
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ${{ inputs.dockerfile }}
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.platform }}
           push: true
-          tags: ${{ steps.set-tags.outputs.tags }}
+          tags: ${{ steps.prep.outputs.image }}
           target: ${{ inputs.target }}
+          cache-from: type=gha,scope=build-${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=build-${{ matrix.platform }}
 
-      - name: Log in to Docker Hub account 2
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          username: ${{ secrets.DOCKER_USERNAME_2 }}
-          password: ${{ secrets.DOCKER_PASSWORD_2 }}
+      - name: Save image name for manifest
+        run: echo "${{ steps.prep.outputs.image }}" > image.txt
 
-      - name: Build and push to portabase/portabase
-        uses: docker/build-push-action@v6
+      - uses: actions/upload-artifact@v4
         with:
-          context: .
-          file: ${{ inputs.dockerfile }}
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.set-tags.outputs.tags2 }}
-          target: ${{ inputs.target }}
+          name: image-${{ steps.prep.outputs.safe_platform }}
+          path: image.txt
+          retention-days: 1
+
+  create-manifest:
+    name: Create multi-arch manifest
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: image-linux-amd64
+          path: /tmp/digests/amd64
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: image-linux-arm64
+          path: /tmp/digests/arm64
+
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ inputs.image_name }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=raw,value=latest,enable=${{ inputs.add_latest }}
+
+      - name: Create and push manifest list
+        working-directory: /tmp/digests
+        run: |
+          DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
+          TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
+          docker buildx imagetools create $DOCKER_IMAGES $TAG_ARGS

.github/workflows/pr-checker.yml

@@ -0,0 +1,47 @@
+name: PR Checker
+
+on:
+  pull_request:
+    branches:
+      - main
+      - dev
+
+jobs:
+  validate-code:
+    name: Code Integrity Check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Check code formatting
+        run: pnpm run format:check
+        continue-on-error: true
+
+      - name: Run Linter
+        run: pnpm run lint
+        continue-on-error: true
+
+      - name: Type Check
+        run: pnpm run typecheck
+        continue-on-error: true
+
+      - name: Run Tests
+        run: pnpm run test
+        continue-on-error: true
+
+      - name: Test Application Build
+        run: pnpm run build

.github/workflows/release-candidate.yml

@@ -3,31 +3,28 @@ name: Publish Docker image for release candidate
 on:
   push:
     tags:
-      - '*-rc*'
+      - "*.*.*-rc*"
+      - "!*-*-rc*"
 
 permissions:
-  contents: write
+  contents: read
   packages: write
 
 jobs:
   docker_publish:
     uses: ./.github/workflows/docker.yml
     with:
-      add_latest: false
+      add_latest: true
     secrets:
-      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      DOCKER_USERNAME_2: ${{ secrets.DOCKER_USERNAME_2 }}
-      DOCKER_PASSWORD_2: ${{ secrets.DOCKER_PASSWORD_2 }}
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
 
-  github_release:
+  discord_notification:
     needs: docker_publish
-    uses: ./.github/workflows/github.yml
+    uses: ./.github/workflows/discord.yml
     with:
-      prerelease: true
-      make_latest: false
-      discord_title: "||@release-dashboard|| New release candidate published"
-      discord_color: 16776960
+      discord_title: "New Release Candidate: ${{ github.ref_name }}"
+      discord_color: 2044800
       discord_footer: "Portabase"
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/release.yml

@@ -3,11 +3,11 @@ name: Publish Docker image for release
 on:
   push:
     tags:
-      - '*.*.*'
-      - '!*-*'
+      - "*.*.*"
+      - "!*-*"
 
 permissions:
-  contents: write
+  contents: read
   packages: write
 
 jobs:
@@ -16,20 +16,16 @@ jobs:
     with:
       add_latest: true
     secrets:
-      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      DOCKER_USERNAME_2: ${{ secrets.DOCKER_USERNAME_2 }}
-      DOCKER_PASSWORD_2: ${{ secrets.DOCKER_PASSWORD_2 }}
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
 
-  github_release:
+  discord_notification:
     needs: docker_publish
-    uses: ./.github/workflows/github.yml
+    uses: ./.github/workflows/discord.yml
     with:
-      prerelease: false
-      make_latest: true
-      discord_title: "||@release-dashboard|| New release published"
-      discord_color: 5814783
+      discord_title: "New Release: ${{ github.ref_name }}"
+      discord_color: 3066993
       discord_footer: "Portabase"
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/security.yml

@@ -5,7 +5,7 @@ on:
     branches: [ main ]
 
 jobs:
-  sca-deps: # Dependency & container scan
+  sca-deps:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -17,15 +17,16 @@ jobs:
           ignore-unfixed: true
 
 
-  secrets-gitleaks: # Secrets exposure
+  secrets-gitleaks:
+    if: github.event.pull_request.head.repo.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0   # Fetch full history for gitleaks
+          fetch-depth: 0
       - uses: gitleaks/gitleaks-action@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITLEAKS_LICENSE: ${{ secrets.GITLEAKS_LICENSE }}
         with:
-          config-path: .gitleaks.toml  # Optional, if you have a custom config
+          config-path: .gitleaks.toml

.gitignore

@@ -40,7 +40,10 @@ public/uploads/*
 !public/uploads/
 
 private/uploads/*
+private/keys/*
 
 /.env
 
-certificates
+seeds/pocket-id/*.db
+
+certificates

.gitleaks.toml

@@ -2,9 +2,7 @@ title = "Custom gitleaks config"
 
 [allowlist]
 # Global allowlist patterns (won’t be flagged)
-regexes = [
-    "s3SecretAccessKey: env.S3_SECRET_KEY ?? null",
-]
+regexes = []
 paths = [
     "src/utils/init.ts"
 ]

.release-it.json

@@ -0,0 +1,22 @@
+{
+  "git": {
+    "commit": true,
+    "commitMessage": "chore: release v${version}",
+    "requireCleanWorkingDir": true,
+    "tag": true,
+    "tagName": "${version}",
+    "push": true
+  },
+  "github": {
+    "release": true,
+    "tokenRef": "GITHUB_TOKEN"
+  },
+  "plugins": {
+    "@release-it/conventional-changelog": {
+      "preset": "angular"
+    },
+    "@release-it/bumper": {
+      "out": "CITATION.cff"
+    }
+  }
+}

CITATION.cff

@@ -26,5 +26,5 @@ keywords:
   - web-ui
   - agent
 license: Apache-2.0
-version: 1.2.5-rc.5
-date-released: "2026-02-01"
+version: 1.4.3
+date-released: "2026-03-02"

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Soluce Technologies
+   Copyright 2024 Portabase
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -1,4 +1,48 @@
 CLUSTER_SCRIPT=docker/entrypoints/app-dev-entrypoint.sh
 
 up:
-	@bash $(CLUSTER_SCRIPT)
+	@bash $(CLUSTER_SCRIPT)
+
+seed-keycloak:
+	@[ $$(ls -1 seeds/keycloak/*.json 2>/dev/null | wc -l) -gt 0 ] || (echo "No realm export found in seeds/keycloak. Add an export from Keycloak first."; exit 1)
+	@docker compose -f docker-compose.func.yml stop keycloak >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml rm -f -s keycloak >/dev/null 2>&1 || true
+	@docker volume rm portabase-dev-func_keycloak-data >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml up -d keycloak
+	@echo "Keycloak seed import triggered from seeds/keycloak/*.json"
+
+seed-pocket:
+	@[ -f seeds/pocket-id/portabase.zip ] || (echo "No export found in seeds/pocket-id. Add an export from Pocket ID first."; exit 1)
+	@docker compose -f docker-compose.func.yml stop pocket-id >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml rm -f -s pocket-id >/dev/null 2>&1 || true
+	@docker volume rm portabase-dev-func_pocket-id-data >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml run --rm -v ./seeds/pocket-id/portabase.zip:/tmp/portabase.zip pocket-id ./pocket-id import --yes --path /tmp/portabase.zip >/dev/null
+	@docker compose -f docker-compose.func.yml up -d pocket-id
+	@sleep 2
+	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id one-time-access-token admin
+	@echo "Pocket ID data restored from seeds/pocket-id/portabase.zip"
+
+seed-auth: seed-keycloak seed-pocket
+
+pocket-token:
+	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id one-time-access-token admin
+
+export-pocket:
+	@echo "Exporting Pocket ID data to seeds/pocket-id/portabase.zip..."
+	@mkdir -p ./seeds/pocket-id
+	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id export --path /tmp/portabase-export.zip
+	@docker compose -f docker-compose.func.yml cp pocket-id:/tmp/portabase-export.zip ./seeds/pocket-id/portabase.zip
+	@docker compose -f docker-compose.func.yml exec pocket-id rm /tmp/portabase-export.zip
+	@echo "Pocket ID data exported to seeds/pocket-id/portabase.zip"
+
+export-keycloak:
+	@echo "Exporting Keycloak configuration and users to seeds/keycloak/*.json..."
+	@mkdir -p ./seeds/keycloak
+	@rm -f ./seeds/keycloak/*.json
+	@docker compose -f docker-compose.func.yml stop keycloak >/dev/null 2>&1
+	@docker rm -f kc-exporter >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml run --name kc-exporter keycloak export --dir /tmp/kc-export --users realm_file
+	@docker cp kc-exporter:/tmp/kc-export/. ./seeds/keycloak/
+	@docker rm -f kc-exporter >/dev/null 2>&1
+	@docker compose -f docker-compose.func.yml start keycloak >/dev/null 2>&1
+	@echo "Keycloak configuration and users exported to seeds/keycloak/*.json"

README.md

@@ -7,7 +7,7 @@
 <h3 align="center">Portabase</h3>
 
   <p align="center" style="margin-top: 20px; font-style: italic;">
-  <i>Portabase is a tool designed to simplify the backup and restoration of your database instances. It integrates seamlessly with <a href="https://github.com/Portabase/agent">Portabase agents</a> for managing operations securely and efficiently.</i>
+  <i>Portabase is a tool designed to simplify the backup and restoration of your database instances. It integrates seamlessly with <a href="https://github.com/Portabase/agent-rust">Portabase agents</a> for managing operations securely and efficiently.</i>
   </p>
 
 
@@ -19,11 +19,11 @@
 [![PostgreSQL](https://img.shields.io/badge/PostgreSQL-336791?logo=postgresql&logoColor=white)](https://www.postgresql.org/)
 [![MySQL](https://img.shields.io/badge/MySQL-4479A1?logo=mysql&logoColor=white)](https://www.mysql.com/)
 [![MariaDB](https://img.shields.io/badge/MariaDB-003545?logo=mariadb&logoColor=white)](https://mariadb.org/)
+[![SQLite](https://img.shields.io/badge/-SQLite-blue?logo=sqlite&logoColor=white)](https://sqlite.org/)
 [![MongoDB](https://img.shields.io/badge/-MongoDB-13aa52?logo=mongodb&logoColor=white)](https://www.mongodb.com/)
 [![Self Hosted](https://img.shields.io/badge/self--hosted-yes-brightgreen)](https://github.com/Portabase/portabase)
 [![Open Source](https://img.shields.io/badge/open%20source-❤️-red)](https://github.com/Portabase/portabase)
 
-
 [![NextJS][NextJS]][NextJS-url]
 [![BetterAuth][BetterAuth]][BetterAuth-url]
 [![Drizzle][Drizzle]][Drizzle-url]
@@ -34,14 +34,14 @@
     <strong>
         <a href="https://portabase.io">Website</a> •
         <a href="https://portabase.io/docs">Documentation</a> •
-        <a href="https://www.youtube.com/watch?v=hvLbX5LN1UE">Demo</a> •
+        <a href="https://www.youtube.com/watch?v=nSTzT27GgAg">Demo</a> •
         <a href="https://portabase.io/docs/dashboard/setup">Installation</a> •
         <a href="https://github.com/Portabase/portabase/issues/new?labels=bug&template=bug-report---.md">Report Bug</a> •
         <a href="https://github.com/Portabase/portabase/issues/new?labels=enhancement&template=feature-request---.md">Request Feature</a>
     </strong>
   </p>
 
-![portabase-dashboard](https://github.com/user-attachments/assets/f5ec7204-79c0-43ac-ba17-f2ed682c39d6)
+![portabase-dashboard](https://github.com/user-attachments/assets/8f2c69d6-f1f9-4b80-b51c-01f6f13b9b62)
 
 
 </div>
@@ -51,14 +51,13 @@
 You have 4 ways to install Portabase:
 
 - Automated CLI (recommended) - [details](https://portabase.io/docs/dashboard/setup#cli)
-- Docker Compose setup - [details](https://portabase.io/docs/dashboard/setup#docker)
+- Docker Run - [details](https://portabase.io/docs/dashboard/setup#docker)
+- Docker Compose setup - [details](https://portabase.io/docs/dashboard/setup#docker-compose)
 - Kubernetes with Helm (soon)
 - Development setup - [details](https://portabase.io/docs/dashboard/setup#development)
 
 **Ensure Docker is installed on your machine before getting started.**
 
-
-
 ## Contributors
 
 [![Contributors](https://contrib.rocks/image?repo=Portabase/portabase)](https://github.com/Portabase/portabase/graphs/contributors)
@@ -89,4 +88,3 @@ Distributed under the Apache License. See `LICENSE.txt` for more details.
 [ShadcnUI-url]: https://ui.shadcn.com/
 
 [Docker-url]: https://www.docker.com/
-

app/(auth)/forgot-password/page.tsx

@@ -1,10 +1,15 @@
-import {CardContent, CardHeader} from "@/components/ui/card";
+import { CardContent, CardHeader } from "@/components/ui/card";
 
-import {TooltipProvider} from "@/components/ui/tooltip";
-import {ForgotPasswordForm} from "@/components/wrappers/auth/login/forgot-password-form/forgot-password-form";
-import {CardAuth} from "@/features/layout/card-auth";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import { ForgotPasswordForm } from "@/components/wrappers/auth/login/forgot-password-form/forgot-password-form";
+import { env } from "@/env.mjs";
+import { CardAuth } from "@/features/layout/card-auth";
+import { redirect } from "next/navigation";
 
 export default async function RoutePage(props: { searchParams: Promise<{ callbackUrl: string | undefined }> }) {
+    if (env.AUTH_EMAIL_PASSWORD_ENABLED !== "true") {
+        redirect("/login");
+    }
 
     return (
         <TooltipProvider>
@@ -12,12 +17,11 @@ export default async function RoutePage(props: { searchParams: Promise<{ callbac
                 <CardHeader>
                     <div className="grid gap-2 text-center mb-2">
                         <h1 className="text-3xl font-bold">Reset password</h1>
-                        <p className="text-balance text-muted-foreground">Enter your email address and we'll send you a
-                            link to reset your password.</p>
+                        <p className="text-balance text-muted-foreground">Enter your email address and we'll send you a link to reset your password.</p>
                     </div>
                 </CardHeader>
                 <CardContent>
-                    <ForgotPasswordForm/>
+                    <ForgotPasswordForm />
                 </CardContent>
             </CardAuth>
         </TooltipProvider>

app/(auth)/guard/page.tsx

@@ -16,7 +16,7 @@ export default async function GuardPage() {
 
     return (
         <TooltipProvider>
-            <CardAuth className="w-full max-w-md">
+            <CardAuth className="w-full">
                 <CardHeader>
                     <div className="grid gap-2 text-center mb-2">
                         <h1 className="text-3xl font-bold">Two-factor verification</h1>

app/(auth)/layout.tsx

@@ -1,25 +1,38 @@
-import React from "react";
-import {redirect} from "next/navigation";
-import {currentUser} from "@/lib/auth/current-user";
-import {AuthLogoSection} from "@/components/wrappers/auth/auth-logo-section";
+import React, { Suspense } from "react";
+import { redirect } from "next/navigation";
+import { currentUser } from "@/lib/auth/current-user";
+import { AuthLogoSection } from "@/components/wrappers/auth/auth-logo-section";
+import { env } from "@/env.mjs";
+import { Heart } from "lucide-react";
+import { ErrorLayout } from "@/components/wrappers/common/error-layout";
 
-export default async function Layout({children}: { children: React.ReactNode }) {
+export default async function Layout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const user = await currentUser();
 
-    const user = await currentUser();
+  if (user && !user.banned && user.role !== "pending") {
+    redirect("/dashboard/home");
+  }
 
-    if (user && !user.banned && user.role !== "pending") {
-        redirect("/dashboard/home");
-    }
-
-    return (
-        <div className="flex min-h-full flex-1 flex-col justify-center py-12 sm:px-6 lg:px-8 ">
-            <div className="mx-auto w-full max-w-md">
-                <AuthLogoSection/>
-                <div>{children}</div>
-            </div>
-            <footer className="py-4 text-center text-xs justify-items-end text-muted-foreground">
-                Powered by <span className="font-medium">Soluce Technologies</span>
-            </footer>
+  return (
+    <div className="flex min-h-screen flex-col justify-between py-10 sm:px-6 lg:px-8 ">
+      <div className="flex flex-col items-center justify-center flex-1">
+        <div className="mx-auto w-full max-w-md">
+          <AuthLogoSection />
+          <div className="mt-4">{children}</div>
         </div>
-    )
-}
+      </div>
+      <footer className="mt-8 text-center text-xs text-muted-foreground flex flex-col gap-1">
+        <p className="flex items-center justify-center gap-1">
+          Made with{" "}
+          <Heart className="size-3 fill-red-500 text-red-500 animate-pulse" />{" "}
+          by <span className="font-medium text-foreground">Portabase</span>
+        </p>
+        <p>v{env.NEXT_PUBLIC_PROJECT_VERSION}</p>
+      </footer>
+    </div>
+  );
+}

app/(auth)/login/page.tsx

@@ -1,52 +1,60 @@
-import {LoginForm} from "@/components/wrappers/auth/login/login-form/login-form";
-import {Metadata} from "next";
-import {SUPPORTED_PROVIDERS} from "../../../portabase.config";
-import {SocialAuthButtons} from "@/components/wrappers/auth/social-buttons";
-import {TooltipProvider} from "@/components/ui/tooltip";
-import {CardContent, CardHeader} from "@/components/ui/card";
+import { LoginForm } from "@/components/wrappers/auth/login/login-form/login-form";
+import { Metadata } from "next";
+import { SUPPORTED_PROVIDERS } from "@/lib/auth/config";
+import { SocialAuthButtons } from "@/components/wrappers/auth/social-buttons";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import { CardContent, CardHeader } from "@/components/ui/card";
 import Link from "next/link";
-import {Separator} from "@/components/ui/separator";
-import {CardAuth} from "@/features/layout/card-auth";
+import { Separator } from "@/components/ui/separator";
+import { CardAuth } from "@/features/layout/card-auth";
+import { env } from "@/env.mjs";
+import { en } from "zod/v4/locales";
 
 export const metadata: Metadata = {
-    title: "Login",
+  title: "Login",
 };
 
 export default async function SignInPage() {
+  return (
+    <TooltipProvider>
+      <CardAuth className="w-full">
+        <CardHeader>
+          <div className="grid gap-2 text-center mb-2">
+            <h1 className="text-3xl font-bold">Login</h1>
+            <p className="text-balance text-muted-foreground">
+              Fill your login informations
+            </p>
+          </div>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          {env.AUTH_EMAIL_PASSWORD_ENABLED === "true" && (
+            <LoginForm isPasskeyEnabled={env.AUTH_PASSKEY_ENABLED === "true"} />
+          )}
 
-    return (
-        <TooltipProvider>
-            <CardAuth className="w-full">
-                <CardHeader>
-                    <div className="grid gap-2 text-center mb-2">
-                        <h1 className="text-3xl font-bold">Login</h1>
-                        <p className="text-balance text-muted-foreground">Fill your login informations</p>
-                    </div>
-                </CardHeader>
-                <CardContent className="space-y-4">
-                    <LoginForm/>
+          {env.AUTH_EMAIL_PASSWORD_ENABLED === "true" &&
+            SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive)
+              .length > 0 && (
+              <div className="relative my-4 flex items-center justify-center overflow-hidden">
+                <Separator />
+                <div className="px-2 text-center  text-sm">OR</div>
+                <Separator />
+              </div>
+            )}
 
-                    {SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive).length > 0 && (
-                        <>
-                            <div className="relative my-4 flex items-center justify-center overflow-hidden">
-                                <Separator/>
-                                <div className="px-2 text-center  text-sm">OR</div>
-                                <Separator/>
-                            </div>
-                            <SocialAuthButtons providers={SUPPORTED_PROVIDERS}/>
-                        </>
-                    )}
+          {SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive).length >
+            0 && <SocialAuthButtons providers={SUPPORTED_PROVIDERS} />}
 
-                    <div className="mt-4 text-center text-sm">
-                        Don&apos;t have an account ?{" "}
-                        <Link href="/register" className="underline">
-                            Sign up
-                        </Link>
-                    </div>
-                </CardContent>
-            </CardAuth>
-        </TooltipProvider>
-
-
-    )
+          {env.AUTH_SIGNUP_ENABLED !== "true" ||
+            (env.AUTH_EMAIL_PASSWORD_ENABLED === "true" && (
+              <div className="mt-4 text-center text-sm">
+                Don&apos;t have an account ?{" "}
+                <Link href="/register" className="underline">
+                  Sign up
+                </Link>
+              </div>
+            ))}
+        </CardContent>
+      </CardAuth>
+    </TooltipProvider>
+  );
 }

app/(auth)/register/page.tsx

@@ -1,15 +1,24 @@
-import {PageParams} from "@/types/next";
-import {RegisterForm} from "@/components/wrappers/auth/register/register-form/register-form";
-import {Metadata} from "next";
+import { PageParams } from "@/types/next";
+import { RegisterForm } from "@/components/wrappers/auth/register/register-form/register-form";
+import { Metadata } from "next";
+import { redirect } from "next/navigation";
+import { env } from "@/env.mjs";
 
 export const metadata: Metadata = {
-    title: "Register",
+  title: "Register",
 };
 
 export default async function RoutePage(props: PageParams<{}>) {
-    return (
-        <div className="mx-auto grid w-full gap-6">
-            <RegisterForm/>
-        </div>
-    )
-}
+  if (
+    env.AUTH_SIGNUP_ENABLED !== "true" ||
+    env.AUTH_EMAIL_PASSWORD_ENABLED !== "true"
+  ) {
+    redirect("/login");
+  }
+
+  return (
+    <div className="mx-auto grid w-full gap-6">
+      <RegisterForm />
+    </div>
+  );
+}

app/(auth)/reset-password/page.tsx

@@ -1,11 +1,16 @@
-import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import { CardContent, CardHeader } from "@/components/ui/card";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { ResetPasswordForm } from "@/components/wrappers/auth/login/reset-password-form/reset-password-form";
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth/auth";
 import { Avatar, AvatarImage, AvatarFallback } from "@radix-ui/react-avatar";
+import { CardAuth } from "@/features/layout/card-auth";
+import { env } from "@/env.mjs";
 
 export default async function RoutePage(props: { searchParams: Promise<{ token: string | undefined }> }) {
+    if (env.AUTH_EMAIL_PASSWORD_ENABLED !== "true") {
+        return redirect("/login");
+    }
 
     const { token } = await props.searchParams;
 
@@ -23,7 +28,7 @@ export default async function RoutePage(props: { searchParams: Promise<{ token:
 
     return (
         <TooltipProvider>
-            <Card className="w-full max-w-md shadow-lg">
+            <CardAuth className="w-full">
                 <CardHeader className="space-y-4">
                     <div className="space-y-1 text-center">
                         <h1 className="text-2xl font-bold tracking-tight">Set a new password</h1>
@@ -53,7 +58,7 @@ export default async function RoutePage(props: { searchParams: Promise<{ token:
                 <CardContent>
                     <ResetPasswordForm />
                 </CardContent>
-            </Card>
+            </CardAuth>
         </TooltipProvider>
     );
 }

app/(customer)/dashboard/(admin)/admin/settings/_email/page.tsx

@@ -1,30 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {db} from "@/db";
-import {SettingsEmailSection} from "@/components/wrappers/dashboard/admin/settings/email/settings-email-section";
-import {notFound} from "next/navigation";
-
-export default async function RoutePage(props: PageParams<{}>) {
-
-    const settings = await db.query.setting.findFirst({
-        where: (fields, {eq}) => eq(fields.name, "system"),
-    });
-
-    if (!settings) {
-        notFound()
-    }
-
-
-    return (
-        <Page>
-            <PageHeader className="flex flex-col">
-                <div className="flex justify-between">
-                    <PageTitle className="mb-3">System email</PageTitle>
-                </div>
-            </PageHeader>
-            <PageContent className="flex flex-col gap-5">
-                <SettingsEmailSection settings={settings}/>
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(admin)/admin/settings/_storage/page.tsx

@@ -1,29 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {SettingsStorageSection} from "@/components/wrappers/dashboard/admin/settings/storage/settings-storage-section";
-import {db} from "@/db";
-import {notFound} from "next/navigation";
-
-export default async function RoutePage(props: PageParams<{}>) {
-
-    const settings = await db.query.setting.findFirst({
-        where: (fields, {eq}) => eq(fields.name, "system"),
-    });
-
-    if (!settings) {
-        notFound()
-    }
-
-    return (
-        <Page>
-            <PageHeader className="flex flex-col">
-                <div className="flex justify-between">
-                    <PageTitle className="mb-3">System storage</PageTitle>
-                </div>
-            </PageHeader>
-            <PageContent className="flex flex-col gap-5">
-                <SettingsStorageSection settings={settings}/>
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(admin)/admin/users/page.tsx

@@ -4,6 +4,7 @@ import {db} from "@/db";
 import {desc, isNull} from "drizzle-orm";
 import {AdminUserList} from "@/components/wrappers/dashboard/admin/users/admin-user-list";
 import {AdminUserAddModal} from "@/components/wrappers/dashboard/admin/users/admin-user-add-modal";
+import {SUPPORTED_PROVIDERS} from "@/lib/auth/config";
 
 export default async function RoutePage(props: PageParams<{}>) {
 
@@ -21,6 +22,9 @@ export default async function RoutePage(props: PageParams<{}>) {
         },
     });
 
+    const credentialProvider = SUPPORTED_PROVIDERS.find(p => p.id === 'credential');
+    const isPasswordAuthEnabled = credentialProvider?.isActive || false;
+
     return (
         <Page>
             <PageHeader className="flex flex-col">
@@ -32,7 +36,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 </div>
             </PageHeader>
             <PageContent className="flex flex-col gap-5">
-                <AdminUserList users={users}/>
+                <AdminUserList users={users} isPasswordAuthEnabled={isPasswordAuthEnabled}/>
             </PageContent>
         </Page>
     );

app/(customer)/dashboard/(admin)/agents/[agentId]/page.tsx

@@ -1,61 +1,69 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
-import {db} from "@/db";
+import { PageParams } from "@/types/next";
+import {
+  Page,
+  PageContent,
+  PageDescription,
+  PageTitle,
+} from "@/features/layout/page";
+import { db } from "@/db";
 import * as drizzleDb from "@/db";
-import {eq} from "drizzle-orm";
-import {notFound} from "next/navigation";
-import {ButtonDeleteAgent} from "@/components/wrappers/dashboard/agent/button-delete-agent/button-delete-agent";
-import {capitalizeFirstLetter} from "@/utils/text";
-import {generateEdgeKey} from "@/utils/edge_key";
-import {getServerUrl} from "@/utils/get-server-url";
-import {AgentContentPage} from "@/components/wrappers/dashboard/agent/agent-content";
-import {AgentDialog} from "@/features/agents/components/agent.dialog";
-import {AgentType} from "@/features/agents/agents.schema";
+import { eq } from "drizzle-orm";
+import { notFound } from "next/navigation";
+import { ButtonDeleteAgent } from "@/components/wrappers/dashboard/agent/button-delete-agent/button-delete-agent";
+import { capitalizeFirstLetter } from "@/utils/text";
+import { generateEdgeKey } from "@/utils/edge_key";
+import { getServerUrl } from "@/utils/get-server-url";
+import { AgentContentPage } from "@/components/wrappers/dashboard/agent/agent-content";
+import { AgentDialog } from "@/features/agents/components/agent.dialog";
+import { AgentType } from "@/features/agents/agents.schema";
 
-export default async function RoutePage(props: PageParams<{ agentId: string }>) {
+export default async function RoutePage(
+  props: PageParams<{ agentId: string }>,
+) {
+  const { agentId } = await props.params;
 
-    const {agentId} = await props.params
+  const agent = await db.query.agent.findFirst({
+    where: eq(drizzleDb.schemas.agent.id, agentId),
+    with: {
+      databases: true,
+    },
+  });
 
-    const agent = await db.query.agent.findFirst({
-        where: eq(drizzleDb.schemas.agent.id, agentId),
-        with: {
-            databases: true
-        }
-    })
+  if (!agent) {
+    notFound();
+  }
 
-    if (!agent) {
-        notFound()
-    }
+  const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
 
-    const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
-
-    return (
-        <Page>
-            <div className="justify-between gap-2 sm:flex">
-                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-                    <div className="min-w-full md:min-w-fit ">
-                        {capitalizeFirstLetter(agent.name)}
-                    </div>
-                    <div className="flex items-center gap-2 md:justify-between w-full ">
-                        <div className="flex items-center gap-2">
-                            <AgentDialog agent={agent as AgentType & { id: string }} typeTrigger={"edit"}/>
-                        </div>
-                        <div className="flex items-center gap-2">
-                            <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"}/>
-                        </div>
-                    </div>
-                </PageTitle>
+  return (
+    <Page>
+      <div className="justify-between gap-2 sm:flex">
+        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+          <div className="min-w-full md:min-w-fit ">
+            {capitalizeFirstLetter(agent.name)}
+          </div>
+          <div className="flex items-center gap-2 md:justify-between w-full ">
+            <div className="flex items-center gap-2">
+              <AgentDialog
+                agent={agent as AgentType & { id: string }}
+                typeTrigger={"edit"}
+              />
             </div>
+            <div className="flex items-center gap-2">
+              <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"} />
+            </div>
+          </div>
+        </PageTitle>
+      </div>
 
-            {agent.description && (
-                <PageDescription className="mt-5 sm:mt-0">{agent.description}</PageDescription>
-            )}
-            <PageContent className="flex flex-col w-full h-full justify-between gap-6">
-                <AgentContentPage
-                    agent={agent}
-                    edgeKey={edgeKey}
-                />
-            </PageContent>
-        </Page>
-    )
-}
+      {agent.description && (
+        <PageDescription className="mt-5 sm:mt-0">
+          {agent.description}
+        </PageDescription>
+      )}
+      <PageContent className="flex flex-col w-full h-full justify-between gap-6">
+        <AgentContentPage agent={agent} edgeKey={edgeKey} />
+      </PageContent>
+    </Page>
+  );
+}

app/(customer)/dashboard/(admin)/notifications/channels/page.tsx

@@ -35,12 +35,10 @@ export default async function RoutePage(props: PageParams<{}>) {
             <PageHeader>
                 <PageTitle>Notification channels</PageTitle>
                 <PageActions>
-                    {/*<NotifierAddEditModal adminView={false}/>*/}
                     <ChannelAddEditModal kind="notification" adminView={false}/>
                 </PageActions>
             </PageHeader>
             <PageContent>
-                {/*<NotificationChannelsSection organizations={organizations} notificationChannels={notificationChannels}/>*/}
                 <ChannelsSection kind="notification" organizations={organizations}
                                  channels={notificationChannels}/>
             </PageContent>

app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/edit/page.tsx

@@ -1,36 +0,0 @@
-import { PageParams } from "@/types/next";
-import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { notFound } from "next/navigation";
-import { DatabaseForm } from "@/components/wrappers/dashboard/database/database-form/database-form";
-
-import { db } from "@/db";
-import * as drizzleDb from "@/db";
-
-import { eq } from "drizzle-orm";
-
-export default async function RoutePage(props: PageParams<{ databaseId: string }>) {
-    const { databaseId } = await props.params;
-
-    const dbItem = await db.query.database.findFirst({
-        where: eq(drizzleDb.schemas.database.id, databaseId),
-    });
-
-    if (!dbItem) {
-        notFound();
-    }
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Edit {dbItem.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <DatabaseForm
-                    databaseId={databaseId}
-                    // @ts-ignore
-                    defaultValues={{ ...dbItem, dbms: dbItem.dbms ?? "inactive", description: dbItem.description ?? undefined }}
-                />
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx

@@ -1,21 +1,11 @@
 import {PageParams} from "@/types/next";
 import {notFound, redirect} from "next/navigation";
-import {Page, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
-import {BackupButton} from "@/components/wrappers/dashboard/backup/backup-button/backup-button";
-import {DatabaseKpi} from "@/components/wrappers/dashboard/projects/database/database-kpi";
-import {CronButton} from "@/components/wrappers/dashboard/database/cron-button/cron-button";
+import {Page} from "@/features/layout/page";
 import {db} from "@/db";
 import {eq, and, inArray} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {getOrganizationProjectDatabases} from "@/lib/services";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
-import {RetentionPolicySheet} from "@/components/wrappers/dashboard/database/retention-policy/retention-policy-sheet";
-import {capitalizeFirstLetter} from "@/utils/text";
-import {getOrganizationChannels} from "@/db/services/notification-channel";
-import {ImportModal} from "@/components/wrappers/dashboard/database/import/import-modal";
-import {getOrganizationStorageChannels} from "@/db/services/storage-channel";
-import {ChannelPoliciesModal} from "@/components/wrappers/dashboard/database/channels-policy/policy-modal";
-import {HardDrive, Megaphone} from "lucide-react";
 import {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
 import {DatabaseContent} from "@/components/wrappers/dashboard/projects/database/database-content";
 
@@ -93,12 +83,6 @@ export default async function RoutePage(props: PageParams<{
         notFound();
     }
 
-    const organizationChannels = await getOrganizationChannels(organization.id);
-    const activeOrganizationChannels = organizationChannels.filter(channel => channel.enabled);
-
-    const organizationStorageChannels = await getOrganizationStorageChannels(organization.id);
-    const activeOrganizationStorageChannels = organizationStorageChannels.filter(channel => channel.enabled);
-
 
     const successRate = totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null;
 
@@ -106,60 +90,22 @@ export default async function RoutePage(props: PageParams<{
 
     return (
         <Page>
-
-            <div className="justify-between gap-2 sm:flex">
-                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-                    <div className="min-w-full md:min-w-fit ">
-                        {capitalizeFirstLetter(dbItem.name)}
-                    </div>
-                    {!isMember && (
-                        <div className="flex items-center gap-2 md:justify-between w-full ">
-                            <div className="flex items-center gap-2">
-                                <RetentionPolicySheet database={dbItem}/>
-                                <CronButton database={dbItem}/>
-                                <ChannelPoliciesModal
-                                    database={dbItem}
-                                    kind={"notification"}
-                                    icon={<Megaphone/>}
-                                    channels={activeOrganizationChannels}
-                                    organizationId={organization.id}
-                                />
-                                <ChannelPoliciesModal
-                                    database={dbItem}
-                                    icon={<HardDrive/>}
-                                    kind={"storage"}
-                                    channels={activeOrganizationStorageChannels}
-                                    organizationId={organization.id}
-                                />
-                                <ImportModal database={dbItem}/>
-                            </div>
-                            <div className="flex items-center gap-2">
-                                <BackupButton disable={isAlreadyBackup} databaseId={databaseId}/>
-                            </div>
-                        </div>
-                    )}
-                </PageTitle>
-
-
-            </div>
-
-            {dbItem.description && (
-                <PageDescription className="mt-5 sm:mt-0">{dbItem.description}</PageDescription>
-            )}
-            <PageContent className="flex flex-col w-full h-full">
-                <DatabaseKpi successRate={successRate} database={dbItem} availableBackups={availableBackups}
-                             totalBackups={totalBackups}/>
-                <BackupModalProvider>
-                    <DatabaseContent
-                        activeMember={activeMember}
-                        settings={settings}
-                        database={dbItem}
-                        isAlreadyRestore={isAlreadyRestore}
-                        restorations={restorations}
-                        backups={backups}
-                    />
-                </BackupModalProvider>
-            </PageContent>
+            <BackupModalProvider>
+                <DatabaseContent
+                    activeMember={activeMember}
+                    settings={settings}
+                    database={dbItem}
+                    isAlreadyRestore={isAlreadyRestore}
+                    restorations={restorations}
+                    backups={backups}
+                    totalBackups={totalBackups}
+                    availableBackups={availableBackups}
+                    successRate={successRate}
+                    organizationId={organization.id}
+                    activeOrganizationChannels={[]}
+                    activeOrganizationStorageChannels={[]}
+                />
+            </BackupModalProvider>
         </Page>
     );
-}
+}

app/(customer)/dashboard/(organization)/projects/page.tsx

@@ -66,7 +66,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                         organizationSlug={organization.slug}
                         data={projects}
                         cardItem={ProjectCard}
-                        cardsPerPage={6}
+                        cardsPerPage={9}
                         numberOfColumns={3}
                     />
                 ) : isMember ? (

app/(customer)/dashboard/(organization)/settings/page.tsx

@@ -1,89 +1,95 @@
-import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {currentUser} from "@/lib/auth/current-user";
-import {getActiveMember, getOrganization} from "@/lib/auth/auth";
-import {notFound} from "next/navigation";
-import {Metadata} from "next";
-import {OrganizationTabs} from "@/components/wrappers/dashboard/organization/tabs/organization-tabs";
-import {getOrganizationChannels} from "@/db/services/notification-channel";
-import {computeOrganizationPermissions} from "@/lib/acl/organization-acl";
-import {getOrganizationStorageChannels} from "@/db/services/storage-channel";
-import {DeleteOrganizationButton} from "@/components/wrappers/dashboard/organization/delete-organization-button";
-import {EditOrganizationDialog} from "@/features/organization/components/edit-organization.dialog";
-import {Button} from "@/components/ui/button";
-import {GearIcon} from "@radix-ui/react-icons";
-import {db} from "@/db";
-import {isNull} from "drizzle-orm";
+import { PageParams } from "@/types/next";
+import {
+  Page,
+  PageActions,
+  PageContent,
+  PageHeader,
+  PageTitle,
+} from "@/features/layout/page";
+import { currentUser } from "@/lib/auth/current-user";
+import { getActiveMember, getOrganization } from "@/lib/auth/auth";
+import { notFound } from "next/navigation";
+import { Metadata } from "next";
+import { OrganizationTabs } from "@/components/wrappers/dashboard/organization/tabs/organization-tabs";
+import { getOrganizationChannels } from "@/db/services/notification-channel";
+import { computeOrganizationPermissions } from "@/lib/acl/organization-acl";
+import { getOrganizationStorageChannels } from "@/db/services/storage-channel";
+import { DeleteOrganizationButton } from "@/components/wrappers/dashboard/organization/delete-organization-button";
+import { EditOrganizationDialog } from "@/features/organization/components/edit-organization.dialog";
+import { db } from "@/db";
+import { isNull } from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import {eq} from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 export const metadata: Metadata = {
-    title: "Settings",
+  title: "Settings",
 };
 
 export default async function RoutePage(props: PageParams<{ slug: string }>) {
-    const organization = await getOrganization({});
-    const user = await currentUser();
-    const activeMember = await getActiveMember()
+  const organization = await getOrganization({});
+  const user = await currentUser();
+  const activeMember = await getActiveMember();
 
-    if (!organization || !activeMember || !user) {
-        notFound();
-    }
+  if (!organization || !activeMember || !user) {
+    notFound();
+  }
 
-    const notificationChannels = await getOrganizationChannels(organization.id)
-    const storageChannels = await getOrganizationStorageChannels(organization.id)
-    const permissions = computeOrganizationPermissions(activeMember);
+  const notificationChannels = await getOrganizationChannels(organization.id);
+  const storageChannels = await getOrganizationStorageChannels(organization.id);
+  const permissions = computeOrganizationPermissions(activeMember);
 
-    const users = await db.query.user.findMany({
-        where: (fields) => isNull(fields.deletedAt)
-    });
+  const users = await db.query.user.findMany({
+    where: (fields) => isNull(fields.deletedAt),
+  });
 
-    const organizationWithMembers = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.id, organization.id),
+  const organizationWithMembers = await db.query.organization.findFirst({
+    where: eq(drizzleDb.schemas.organization.id, organization.id),
+    with: {
+      members: {
         with: {
-            members: {
-                with: {
-                    user: true
-                }
-            }
-        }
-    });
+          user: true,
+        },
+      },
+    },
+  });
 
-    if (!organizationWithMembers) notFound();
+  if (!organizationWithMembers) notFound();
 
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-                    <div className="min-w-full md:min-w-fit ">
-                        Organization settings
-                    </div>
-                        <div className="flex items-center gap-2 md:justify-between w-full ">
-                            <div className="flex items-center gap-2">
-                                {permissions.canManageSettings && organization.slug !== "default" && (
-                                    <EditOrganizationDialog 
-                                        organization={organizationWithMembers} 
-                                        users={users} 
-                                        currentUser={user}
-                                    />
-                                )}
-                            </div>
-                            <div className="flex items-center gap-2">
-                                {permissions.canManageDangerZone && organization.slug !== "default" && (
-                                    <DeleteOrganizationButton organizationSlug={organization.slug}/>
-                                )}
-                            </div>
-                        </div>
-                </PageTitle>
-            </PageHeader>
-            <PageContent>
-                <OrganizationTabs
-                    activeMember={activeMember}
-                    organization={organization}
-                    notificationChannels={notificationChannels}
-                    storageChannels={storageChannels}
-                />
-            </PageContent>
-        </Page>
-    )
+  return (
+    <Page>
+      <PageHeader>
+        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+          <div className="min-w-full md:min-w-fit ">Organization settings</div>
+          <div className="flex items-center gap-2 md:justify-between w-full ">
+            <div className="flex items-center gap-2">
+              {permissions.canManageSettings &&
+                organization.slug !== "default" && (
+                  <EditOrganizationDialog
+                    organization={organizationWithMembers}
+                    users={users}
+                    currentUser={user}
+                  />
+                )}
+            </div>
+            <div className="flex items-center gap-2">
+              {permissions.canManageDangerZone &&
+                organization.slug !== "default" && (
+                  <DeleteOrganizationButton
+                    organizationSlug={organization.slug}
+                  />
+                )}
+            </div>
+          </div>
+        </PageTitle>
+      </PageHeader>
+      <PageContent>
+        <OrganizationTabs
+          activeMember={activeMember}
+          organization={organization}
+          notificationChannels={notificationChannels}
+          storageChannels={storageChannels}
+        />
+      </PageContent>
+    </Page>
+  );
 }

app/(customer)/dashboard/layout.tsx

@@ -1,27 +1,26 @@
-import React, {ReactNode} from "react";
-import {redirect} from "next/navigation";
+import { ReactNode } from "react";
+import { redirect } from "next/navigation";
 
-import {SidebarInset, SidebarProvider} from "@/components/ui/sidebar";
-import {AppSidebar} from "@/components/wrappers/dashboard/common/sidebar/app-sidebar";
-import {Header} from "@/features/layout/Header";
-import {currentUser} from "@/lib/auth/current-user";
-import {ThemeMetaUpdater} from "@/features/browser/theme-meta-updater";
-import {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
+import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
+import { AppSidebar } from "@/components/wrappers/dashboard/common/sidebar/app-sidebar";
+import { Header } from "@/features/layout/Header";
+import { currentUser } from "@/lib/auth/current-user";
+import { ThemeMetaUpdater } from "@/features/browser/theme-meta-updater";
 
-export default async function Layout({children}: { children: ReactNode }) {
-    const user = await currentUser();
-    if (!user) redirect("/login");
+export default async function Layout({ children }: { children: ReactNode }) {
+  const user = await currentUser();
+  if (!user) redirect("/login");
 
-    return (
-        <SidebarProvider>
-            <div className="flex flex-col lg:flex-row w-full">
-                <ThemeMetaUpdater/>
-                <AppSidebar/>
-                <SidebarInset>
-                    <Header/>
-                    <main className="h-full">{children}</main>
-                </SidebarInset>
-            </div>
-        </SidebarProvider>
-    );
+  return (
+    <SidebarProvider>
+      <div className="flex flex-col lg:flex-row w-full">
+        <ThemeMetaUpdater />
+        <AppSidebar />
+        <SidebarInset>
+          <Header />
+          <main className="h-full">{children}</main>
+        </SidebarInset>
+      </div>
+    </SidebarProvider>
+  );
 }

app/api/agent/[agentId]/backup/helpers.ts

@@ -1,53 +1,52 @@
-import fs from "node:fs";
-import forge from "node-forge";
+import { NextResponse } from "next/server";
+import { eq } from "drizzle-orm";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+
+export function withAgentCheck(handler: Function) {
+    return async (request: Request, context: { params: Promise<{ agentId: string }> }) => {
+        try {
+            const agentId = (await context.params).agentId;
+
+            const agent = await db.query.agent.findFirst({
+                where: eq(drizzleDb.schemas.agent.id, agentId),
+            });
+
+            if (!agent) {
+                return NextResponse.json(
+                    { error: "Agent not found" },
+                    { status: 404 }
+                );
+            }
+
+            return handler(request, { ...context, agent });
+        } catch (err) {
+            console.error("Error in agent middleware:", err);
+            return NextResponse.json(
+                { error: "Internal server error" },
+                { status: 500 }
+            );
+        }
+    };
+}
 
 
-export async function decryptedDump(file: File, aesKeyHex: string, ivHex: string, fileExtension: string): Promise<File> {
-    const privateKeyPem = fs.readFileSync("private/keys/server_private.pem", "utf8");
-    const privateKey = forge.pki.privateKeyFromPem(privateKeyPem);
-
-    // Decrypt AES key with RSA-OAEP
-    const encryptedAesKey = forge.util.hexToBytes(aesKeyHex);
-    const aesKey = privateKey.decrypt(encryptedAesKey, "RSA-OAEP", {
-        md: forge.md.sha256.create(),
-        mgf1: {md: forge.md.sha256.create()},
+export async function getDatabaseOrThrow(generatedId: string) {
+    const database = await db.query.database.findFirst({
+        where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
+        with: {
+            project: true,
+            alertPolicies: true,
+            storagePolicies: true
+        }
     });
 
-    // Read encrypted file content
-    const encryptedBuffer = Buffer.from(await file.arrayBuffer());
-    const iv = forge.util.hexToBytes(ivHex);
-
-    // AES decryption
-    const decipher = forge.cipher.createDecipher("AES-CBC", aesKey);
-    decipher.start({iv});
-    decipher.update(forge.util.createBuffer(encryptedBuffer.toString("binary")));
-    const success = decipher.finish();
-
-    if (!success) {
-        throw new Error("Decryption failed");
+    if (!database) {
+        throw NextResponse.json(
+            { error: "Database associated with generatedId not found" },
+            { status: 404 }
+        );
     }
 
-    const decryptedBytes = decipher.output.getBytes();
-    const decryptedBuffer = Buffer.from(decryptedBytes, "binary");
-
-    // Return a File so you can use file.arrayBuffer() later
-    return new File(
-        [decryptedBuffer],
-        file.name.replace(/\.enc$/, fileExtension),
-        {type: "application/octet-stream"}
-    );
-}
-
-
-export function getFileExtension(dbType: string) {
-    switch (dbType) {
-        case "postgresql":
-            return ".dump";
-        case "mysql":
-            return ".sql";
-        default:
-            return ".dump";
-    }
-}
-
-
+    return database;
+}

app/api/agent/[agentId]/backup/route.ts

@@ -1,89 +1,63 @@
 import {NextResponse} from "next/server";
-import {isUuidv4} from "@/utils/verify-uuid";
-import {v4 as uuidv4} from "uuid";
-import * as drizzleDb from "@/db";
-import {db} from "@/db";
-import {Backup} from "@/db/schema/07_database";
 import {and, eq} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {db as dbClient, db} from "@/db";
+import {getDatabaseOrThrow, withAgentCheck} from "./helpers";
+import {Backup} from "@/db/schema/07_database";
 import {withUpdatedAt} from "@/db/utils";
-import {decryptedDump, getFileExtension} from "./helpers";
-import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
-import {storeBackupFiles} from "@/features/storages/helpers";
 import {eventEmitter} from "@/features/shared/event";
+import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
+import {EventKind} from "@/features/notifications/types";
 
-export async function POST(
-    request: Request,
-    {params}: { params: Promise<{ agentId: string }> }
-) {
+export type BodyPost = {
+    method: "manual" | "automatic"
+    generatedId: string
+}
+
+export type BodyPatch = {
+    backupId: string
+    status: "success" | "failed"
+    size: number
+    generatedId: string
+}
+
+export const POST = withAgentCheck(async (request: Request, {params, agent}: {
+    params: Promise<{ agentId: string }>,
+    agent: any
+}) => {
     try {
-        const contentType = request.headers.get("Content-Type");
-
-        if (!contentType || !contentType.includes("multipart/form-data")) {
-            return NextResponse.json(
-                {error: "Unsupported or missing Content-Type"},
-                {status: 400}
-            );
-        }
-
-        eventEmitter.emit('modification', {update: true});
-
-        const agentId = (await params).agentId;
-        const formData = await request.formData();
-        const aesKeyHex = formData.get("aes_key") as string;
-        const ivHex = formData.get("iv") as string;
-        const generatedId = formData.get("generatedId") as string | null;
-        const method = formData.get("method") as string | null;
-
-
-        if (!generatedId || !isUuidv4(generatedId)) {
-            return NextResponse.json(
-                {error: "generatedId is not a valid UUID"},
-                {status: 400}
-            );
-        }
-
-        const agent = await db.query.agent.findFirst({
-            where: eq(drizzleDb.schemas.agent.id, agentId),
-        });
-
-        if (!agent) {
-            return NextResponse.json(
-                {error: "Agent not found"},
-                {status: 404}
-            );
-        }
-
-        const database = await db.query.database.findFirst({
-            where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
-            with: {
-                project: true,
-                alertPolicies: true,
-                storagePolicies: true
-            }
-        });
-
-        if (!database) {
-            return NextResponse.json(
-                {error: "Database associated with generatedId not found"},
-                {status: 404}
-            );
-        }
+        const body: BodyPost = await request.json();
+        const method = body.method
+        const database = await getDatabaseOrThrow(body.generatedId);
 
         let backup: Backup | null | undefined = null;
 
         if (method === "automatic") {
-            [backup] = await db
-                .insert(drizzleDb.schemas.backup)
-                .values({
-                    status: 'ongoing',
-                    databaseId: database.id,
-                })
-                .returning();
 
+            const ongoingBackup = await db.query.backup.findFirst({
+                where: and(
+                    eq(drizzleDb.schemas.backup.status, 'ongoing'),
+                    eq(drizzleDb.schemas.backup.databaseId, database.id),
+                ),
+            });
 
-            if (!backup) {
+            if (!ongoingBackup) {
+                [backup] = await db
+                    .insert(drizzleDb.schemas.backup)
+                    .values({
+                        status: 'ongoing',
+                        databaseId: database.id,
+                    })
+                    .returning();
+                if (!backup) {
+                    return NextResponse.json(
+                        {error: "Unable to create an automatic backup"},
+                        {status: 500}
+                    );
+                }
+            } else {
                 return NextResponse.json(
-                    {error: "Unable to create an automatic backup"},
+                    {error: "A backup is already ongoing"},
                     {status: 500}
                 );
             }
@@ -95,7 +69,6 @@ export async function POST(
                 ),
             });
 
-
             if (!backup) {
                 return NextResponse.json(
                     {error: "Unable to find the corresponding backup"},
@@ -104,66 +77,78 @@ export async function POST(
             }
         }
 
-        const status = formData.get("status") as string | null;
 
-        if (status === "success") {
-            const file = formData.get("file") as File | null;
-            const extension = formData.get("extension") as string | null;
-            if (!aesKeyHex || !ivHex) {
-                return NextResponse.json({error: "Missing fields"}, {status: 400});
-            }
+        eventEmitter.emit('modification', {update: true});
 
-
-            if (!file) {
-                return NextResponse.json(
-                    {error: "File is required for successful backup"},
-                    {status: 400}
-                );
-            }
-            const fileSizeBytes = file.size;
-            // const fileExtension = '.' + (file.name.split('.').pop()?.toLowerCase() || '');
-            const fileExtension = extension ? extension : getFileExtension(database.dbms)
-            const decryptedFile = await decryptedDump(file, aesKeyHex, ivHex, fileExtension);
-            const uuid = uuidv4();
-            const fileName = `${uuid}${fileExtension}`;
-            const buffer = Buffer.from(await decryptedFile.arrayBuffer());
-
-
-            const storageResults = await storeBackupFiles(backup, database, buffer, fileName)
-            eventEmitter.emit('modification', {update: true});
-
-            await sendNotificationsBackupRestore(database, "success_backup");
-
-            return NextResponse.json(
-                {
-                    message: "Backup successfully uploaded",
-                },
-                {status: 200}
-            );
-        } else {
-
-            await db
-                .update(drizzleDb.schemas.backup)
-                .set(withUpdatedAt({status: 'failed'}))
-                .where(eq(drizzleDb.schemas.backup.id, backup.id));
-
-            eventEmitter.emit('modification', {update: true});
-
-            await sendNotificationsBackupRestore(database, "error_backup");
-
-
-            return NextResponse.json(
-                {
-                    message: "Backup successfully updated with status failed",
-                },
-                {status: 200}
-            );
-        }
+        return NextResponse.json(
+            {
+                message: "Init backup success",
+                backup: backup,
+            },
+            {status: 200}
+        );
     } catch (error) {
-        console.error("Error in POST handler:", error);
+        console.error("Error in POST for INIT backup:", error);
         return NextResponse.json(
             {error: "Internal server error"},
             {status: 500}
         );
     }
-}
+});
+
+export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
+    params: Promise<{ agentId: string }>,
+    agent: any
+}) => {
+    try {
+        const body: BodyPatch = await request.json();
+        console.log("body", body);
+
+        const status = body.status
+        const backupId = body.backupId
+        const backupSize = body.size
+
+        const database = await getDatabaseOrThrow(body.generatedId);
+
+        const backup = await db.query.backup.findFirst({
+            where: eq(drizzleDb.schemas.backup.id, backupId),
+        });
+
+        if (!backup) {
+            return NextResponse.json(
+                {error: "No backup found"},
+                {status: 500}
+            );
+        }
+
+        const [backupUpdated] = await dbClient
+            .update(drizzleDb.schemas.backup)
+            .set(withUpdatedAt({
+                status: status,
+                fileSize: backupSize
+            }))
+            .where(eq(drizzleDb.schemas.backup.id, backup.id))
+            .returning();
+
+
+        eventEmitter.emit('modification', {update: true});
+        await sendNotificationsBackupRestore(database, status == "failed" ? "error_backup" : "success_backup" as EventKind);
+
+        return NextResponse.json(
+            {
+                message: "Backup successfully updated",
+                backup: backupUpdated,
+            },
+            {status: 200}
+        );
+    } catch (error) {
+
+
+        console.error("Error in PATCH backup:", error);
+        return NextResponse.json(
+            {error: "Internal server error"},
+            {status: 500}
+        );
+    }
+});
+

app/api/agent/[agentId]/backup/upload/init/route.ts

@@ -0,0 +1,76 @@
+import {NextResponse} from "next/server";
+import {and, eq} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {db} from "@/db";
+import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
+import {isUuidv4} from "@/utils/verify-uuid";
+import {eventEmitter} from "@/features/shared/event";
+
+export type Body = {
+    generatedId: string
+    storageChannelId: string
+    backupId: string
+}
+export const POST = withAgentCheck(async (request: Request, {params, agent}: {
+    params: Promise<{ agentId: string }>,
+    agent: any
+}) => {
+    try {
+        const body: Body = await request.json();
+
+        console.log("body", body);
+
+        const generatedId = body.generatedId;
+        const storageChannelId = body.storageChannelId;
+        const backupId = body.backupId;
+
+        if (!generatedId || !isUuidv4(generatedId)) {
+            return NextResponse.json(
+                {error: "generatedId is not a valid UUID"},
+                {status: 400}
+            );
+        }
+
+        const database = await getDatabaseOrThrow(generatedId);
+
+        const backup = await db.query.backup.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.backup.id, backupId),
+                eq(drizzleDb.schemas.backup.databaseId, database.id),
+            ),
+        });
+
+        if (!backup) {
+            return NextResponse.json(
+                {error: "Unable to find the corresponding backup"},
+                {status: 404}
+            );
+        }
+
+        const [backupStorage] = await db
+            .insert(drizzleDb.schemas.backupStorage)
+            .values({
+                backupId: backup.id,
+                storageChannelId: storageChannelId,
+                status: "pending",
+            })
+            .returning();
+
+        eventEmitter.emit('modification', {update: true});
+
+        return NextResponse.json(
+            {
+                message: "Backup storage successfully created",
+                backupStorage: backupStorage
+            },
+            {status: 200}
+        );
+    } catch (error) {
+        console.error("Error in POST for INIT backup:", error);
+        return NextResponse.json(
+            {error: "Internal server error"},
+            {status: 500}
+        );
+    }
+});
+

app/api/agent/[agentId]/backup/upload/status/route.ts

@@ -0,0 +1,95 @@
+import {NextResponse} from "next/server";
+import {and, eq} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {db as dbClient, db} from "@/db";
+import {withUpdatedAt} from "@/db/utils";
+import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
+import {eventEmitter} from "@/features/shared/event";
+
+export type Body = {
+    generatedId: string
+    status: "success" | "failed"
+    backupStorageId: string
+    path: string
+    size: number
+    backupId: string
+}
+export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
+    params: Promise<{ agentId: string }>,
+    agent: any
+}) => {
+    try {
+        const body: Body = await request.json();
+        const generatedId = body.generatedId;
+        const status = body.status;
+        const filePath = body.path;
+        const fileSize = body.size;
+        const backupStorageId = body.backupStorageId;
+        const backupId = body.backupId;
+
+
+        console.log("body", body);
+
+        const database = await getDatabaseOrThrow(generatedId);
+
+        const backup = await db.query.backup.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.backup.id, backupId),
+                eq(drizzleDb.schemas.backup.databaseId, database.id),
+            ),
+            with: {
+                storages: true
+            }
+        });
+
+        if (!backup) {
+            return NextResponse.json(
+                {error: "Unable to find the corresponding backup"},
+                {status: 404}
+            );
+        }
+
+        const [backupStorage] = await dbClient
+            .update(drizzleDb.schemas.backupStorage)
+            .set(withUpdatedAt({
+                status: status,
+                path: filePath,
+                size: fileSize
+            }))
+            .where(eq(drizzleDb.schemas.backupStorage.id, backupStorageId))
+            .returning();
+
+
+        if (backup.storages.length > 0) {
+            const hasSuccessfulStorage = backup.storages.some(
+                (storage) => storage.status === "success"
+            );
+
+            if (hasSuccessfulStorage && backup.status !== "success") {
+                await db
+                    .update(drizzleDb.schemas.backup)
+                    .set({
+                        status: "success",
+                        fileSize: fileSize,
+                    })
+                    .where(eq(drizzleDb.schemas.backup.id, backup.id));
+            }
+        }
+
+        eventEmitter.emit('modification', {update: true});
+
+        return NextResponse.json({
+                message: "Backup status successfully updated",
+                backupStorage: backupStorage
+            },
+            {status: 200}
+        );
+    } catch (error) {
+        console.error("Error in POST for INIT backup:", error);
+        return NextResponse.json(
+            {error: "Internal server error"},
+            {status: 500}
+        );
+    }
+});
+

app/api/agent/[agentId]/restore/route.ts

@@ -19,7 +19,6 @@ export async function POST(
 ) {
 
     try {
-        eventEmitter.emit('modification', {update: true});
 
         const agentId = (await params).agentId
         const body: BodyResultRestore = await request.json();
@@ -64,15 +63,13 @@ export async function POST(
             .set({status: body.status as RestorationStatus})
             .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
 
-
-        await sendNotificationsBackupRestore(database, body.status == "error" ? "error_restore" : "success_restore");
+        await sendNotificationsBackupRestore(database, body.status == "failed" ? "error_restore" : "success_restore");
 
         const response = {
             message: true,
             details: "Restoration successfully updated"
         }
 
-        eventEmitter.emit('modification', {update: true});
 
         return Response.json(response, {status: 200})
     } catch (error) {

app/api/agent/[agentId]/status/helpers.ts

@@ -2,21 +2,24 @@ import {NextResponse} from "next/server";
 import {Body} from "./route";
 import {isUuidv4} from "@/utils/verify-uuid";
 import {Agent} from "@/db/schema/08_agent";
-import {Database} from "@/db/schema/07_database";
+import {Database, DatabaseWith} from "@/db/schema/07_database";
 import * as drizzleDb from "@/db";
-import {db as dbClient} from "@/db";
+import {db, db as dbClient} from "@/db";
 import {and, eq, inArray} from "drizzle-orm";
 import {dbmsEnumSchema, EDbmsSchema} from "@/db/schema/types";
 import {withUpdatedAt} from "@/db/utils";
 import type {StorageInput} from "@/features/storages/types";
 import {dispatchStorage} from "@/features/storages/dispatch";
+import {Setting} from "@/db/schema/01_setting";
 
-export async function handleDatabases(body: Body, agent: Agent, lastContact: Date) {
+export async function handleDatabases(body: Body, agent: Agent, lastContact: Date, settings: Setting) {
     const databasesResponse = [];
 
-    const formatDatabase = (database: Database, backupAction: boolean, restoreAction: boolean, UrlBackup: string) => ({
+    const formatDatabase = (database: DatabaseWith, backupAction: boolean, restoreAction: boolean, UrlBackup: string | null, storages: PingDatabaseStorageChannels[], urlMeta: string | null) => ({
         generatedId: database.agentDatabaseId,
         dbms: database.dbms,
+        storages: storages,
+        encrypt: settings.encryption,
         data: {
             backup: {
                 action: backupAction,
@@ -25,6 +28,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
             restore: {
                 action: restoreAction,
                 file: UrlBackup,
+                metaFile: urlMeta
             },
         },
     });
@@ -32,12 +36,16 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
     for (const db of body.databases) {
 
         const existingDatabase = await dbClient.query.database.findFirst({
-            where: eq(drizzleDb.schemas.database.agentDatabaseId, db.generatedId)
+            where: eq(drizzleDb.schemas.database.agentDatabaseId, db.generatedId),
+            with: {
+                project: true
+            }
         });
 
         let backupAction: boolean = false
         let restoreAction: boolean = false
-        let urlBackup: string = ""
+        let urlBackup: string | null = null;
+        let urlMeta: string | null = null
 
         if (!existingDatabase) {
             if (!isUuidv4(db.generatedId)) {
@@ -63,8 +71,11 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 })
                 .returning();
 
+
             if (databaseCreated) {
-                databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup));
+                const storages = await getDatabaseStorageChannels(databaseCreated.id)
+
+                databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null));
             }
         } else {
 
@@ -78,7 +89,6 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 .where(eq(drizzleDb.schemas.database.id, existingDatabase.id))
                 .returning();
 
-
             const activeBackup = await dbClient.query.backup.findFirst({
                 where: and(
                     eq(drizzleDb.schemas.backup.databaseId, databaseUpdated.id),
@@ -86,7 +96,6 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 )
             })
 
-
             const restoration = await dbClient.query.restoration.findFirst({
                 where: and(eq(drizzleDb.schemas.restoration.databaseId, databaseUpdated.id), eq(drizzleDb.schemas.restoration.status, "waiting")),
                 with: {
@@ -94,7 +103,6 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 }
             })
 
-
             if (activeBackup && activeBackup.status == "waiting") {
                 backupAction = true
 
@@ -107,13 +115,11 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
             if (restoration) {
                 restoreAction = true
 
-
                 if (!restoration.backupStorage || restoration.backupStorage.status != "success" || !restoration.backupStorage.path) {
                     restoreAction = false
                     continue;
                 }
 
-
                 const input: StorageInput = {
                     action: "get",
                     data: {
@@ -126,12 +132,26 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                     }
                 };
 
+                const inputMeta: StorageInput = {
+                    action: "get",
+                    data: {
+                        path: `${restoration.backupStorage.path}.meta`,
+                        signedUrl: true,
+                    },
+                    metadata: {
+                        storageId: restoration.backupStorage.storageChannelId,
+                        fileKind: "backups"
+                    }
+                };
+
 
                 try {
                     const result = await dispatchStorage(input, undefined, restoration.backupStorage.storageChannelId);
+                    const resultMeta = await dispatchStorage(inputMeta, undefined, restoration.backupStorage.storageChannelId);
 
                     if (result.success) {
-                        urlBackup = result.url ?? "";
+                        urlBackup = result.url ?? null;
+                        urlMeta = resultMeta.url ?? null
                     } else {
                         await dbClient
                             .update(drizzleDb.schemas.restoration)
@@ -151,53 +171,78 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                     continue;
                 }
 
-
-                // const fileName = backupToRestore?.file
-                //
-                // let data: SafeActionResult<string, ZodString, readonly [], {
-                //     _errors?: string[] | undefined;
-                // }, readonly [], ServerActionResult<string>, object> | undefined
-                //
-                // try {
-                //
-                //     if (settings.storage == "local") {
-                //         data = await getFileUrlPresignedLocal({fileName: fileName!})
-                //     } else if (settings.storage == "s3") {
-                //
-                //         data = await getFileUrlPreSignedS3Action(`backups/${backupToRestore?.database.project?.slug}/${fileName}`);
-                //     }
-                //
-                //     if (data?.data?.success) {
-                //         urlBackup = data.data.value ?? "";
-                //     } else {
-                //         await dbClient
-                //             .update(drizzleDb.schemas.restoration)
-                //             .set({status: "failed"})
-                //             .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
-                //
-                //         // @ts-ignore
-                //         const errorMessage = data?.data?.actionError?.message || "Failed to get presigned URL";
-                //         console.error("Restoration failed: ", errorMessage);
-                //
-                //         continue;
-                //     }
-                // } catch (err) {
-                //     console.error("Restoration crashed unexpectedly:", err);
-                //     await dbClient
-                //         .update(drizzleDb.schemas.restoration)
-                //         .set({status: "failed"})
-                //         .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
-                //
-                //     continue;
-                // }
                 await dbClient
                     .update(drizzleDb.schemas.restoration)
                     .set({status: "ongoing"})
                     .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
             }
-            databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, urlBackup));
+            const storages = await getDatabaseStorageChannels(databaseUpdated.id)
+            databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, urlBackup, storages, urlMeta));
         }
     }
+
     return databasesResponse;
 }
 
+
+type PingDatabaseStorageChannels = {
+    id: string;
+    config: any
+    provider: string
+}
+
+async function getDatabaseStorageChannels(databaseId: string): Promise<PingDatabaseStorageChannels[]> {
+
+    const database = await db.query.database.findFirst({
+        where: eq(drizzleDb.schemas.database.id, databaseId),
+        with: {
+            project: true,
+            retentionPolicy: true,
+            alertPolicies: true,
+            storagePolicies: true
+        }
+    });
+
+    if (!database) {
+        return []
+    }
+
+    const settings = await db.query.setting.findFirst({
+        where: eq(drizzleDb.schemas.setting.name, "system"),
+        with: {storageChannel: true},
+    });
+
+    const defaultStorageChannel: PingDatabaseStorageChannels[] = settings?.storageChannel
+        ? [{
+            id: settings.storageChannel.id,
+            provider: settings.storageChannel.provider,
+            config: settings.storageChannel.config,
+        }]
+        : [];
+
+
+    const enabledDatabaseStorageChannels = await Promise.all(
+        (database.storagePolicies ?? [])
+            .filter(p => p.enabled)
+            .map(async policy => {
+                const storageChannel = await db.query.storageChannel.findFirst({
+                    where: eq(drizzleDb.schemas.storageChannel.id, policy.storageChannelId),
+                });
+
+                if (!storageChannel) return null;
+
+                return {
+                    id: storageChannel.id,
+                    config: storageChannel.config,
+                    provider: storageChannel.provider,
+                } as PingDatabaseStorageChannels;
+            })
+    );
+
+    const filteredChannels: PingDatabaseStorageChannels[] = enabledDatabaseStorageChannels.filter(
+        (c): c is PingDatabaseStorageChannels => c !== null
+    );
+
+    return filteredChannels.length > 0 ? filteredChannels : defaultStorageChannel;
+}
+

app/api/agent/[agentId]/status/route.ts

@@ -7,6 +7,7 @@ import {eq} from "drizzle-orm";
 import {isUuidv4} from "@/utils/verify-uuid";
 import {withUpdatedAt} from "@/db/utils";
 import {eventEmitter} from "@/features/shared/event";
+import {notFound} from "next/navigation";
 
 export type databaseAgent = {
     name: string,
@@ -26,12 +27,14 @@ export async function POST(
 ) {
     try {
         const agentId = (await params).agentId
+        console.log(agentId)
         const body: Body = await request.json();
         const lastContact = new Date();
         let message: string
 
         if (!isUuidv4(agentId)) {
             message = "agentId is not a valid uuid"
+            console.error(message)
             return NextResponse.json(
                 {error: "agentId is not a valid uuid"},
                 {status: 500}
@@ -46,7 +49,14 @@ export async function POST(
             message = "Agent not found"
             return NextResponse.json({error: message}, {status: 404})
         }
-        const databasesResponse = await handleDatabases(body, agent, lastContact)
+
+        const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
+        if (!settings) {
+            return NextResponse.json({error: "An error occured"}, {status: 404})
+        }
+
+
+        const databasesResponse = await handleDatabases(body, agent, lastContact, settings)
 
         await db
             .update(drizzleDb.schemas.agent)
@@ -56,7 +66,6 @@ export async function POST(
             }))
             .where(eq(drizzleDb.schemas.agent.id, agentId));
 
-        eventEmitter.emit('modification', {update: true});
 
         const response = {
             agent: {
@@ -66,6 +75,7 @@ export async function POST(
             databases: databasesResponse
         }
 
+
         return Response.json(response)
     } catch (error) {
         console.error('Error in POST handler:', error);

app/api/config/route.ts

@@ -1,9 +1,9 @@
-import {NextResponse} from "next/server";
+import { NextResponse } from "next/server";
 
 export async function GET() {
-    return NextResponse.json({
-        PROJECT_URL: process.env.PROJECT_URL,
-        PROJECT_NAME: process.env.PROJECT_NAME,
-        PROJECT_DESCRIPTION: process.env.PROJECT_DESCRIPTION,
-    });
+  return NextResponse.json({
+    PROJECT_URL: process.env.PROJECT_URL,
+    PROJECT_NAME: process.env.PROJECT_NAME,
+    PROJECT_DESCRIPTION: process.env.PROJECT_DESCRIPTION,
+  });
 }

app/api/events/route.ts

@@ -1,11 +1,8 @@
-import {EventEmitter} from 'events';
 import {auth} from "@/lib/auth/auth";
 import {headers} from "next/headers";
 import {NextResponse} from "next/server";
 import {eventEmitter} from "@/features/shared/event";
 
-// export const eventEmitter = new EventEmitter();
-
 export async function GET(request: Request) {
 
     const session = await auth.api.getSession({
@@ -28,7 +25,6 @@ export async function GET(request: Request) {
 
                 eventEmitter.on('modification', handleModification);
 
-                // Handle client disconnect
                 request.signal.addEventListener('abort', () => {
                     console.log('Client disconnected');
                     controller.close();

app/api/tus/hooks/route.ts

@@ -0,0 +1,80 @@
+import {NextResponse} from "next/server";
+import fs from "fs";
+import path from "path";
+import {env} from "@/env.mjs";
+
+
+export async function POST(request: Request) {
+    try {
+        const body = await request.json();
+        const event = body.Event
+        const headers = event.HTTPRequest.Header
+        const uploadLength = headers["X-File-Size"]?.[0];
+        const uploadOffset = headers["Upload-Offset"]?.[0];
+        const status = headers["X-Status"]?.[0];
+
+        console.log(`Upload ID : ${event.Upload.ID} (${uploadOffset}/${uploadLength})`);
+
+        if (status === "success") {
+            if (
+                body.Type === "post-receive" &&
+                event.Upload.SizeIsDeferred === false &&
+                event.Upload.Offset === event.Upload.Size
+            ) {
+                const id = event.Upload.ID;
+                const fileName = headers["X-File-Name"]?.[0];
+                const filePath = headers["X-File-Path"]?.[0];
+
+                if (!filePath) {
+                    return NextResponse.json({error: "Missing X-File-Path"}, {status: 500});
+                }
+
+
+                // const uploadDir = path.join(process.cwd(), "/private/uploads/");
+                const uploadDir = path.join(env.PRIVATE_PATH, "/uploads/");
+
+                const oldFilePath = path.join(uploadDir, "tmp", id);
+                const newFilePath = path.join(uploadDir, filePath);
+
+                fs.mkdirSync(path.dirname(newFilePath), {recursive: true});
+
+                let retries = 10;
+                while (!fs.existsSync(oldFilePath)) {
+                    if (retries-- === 0) {
+                        return NextResponse.json({error: `Upload file not found: ${oldFilePath}`}, {status: 500});
+                    }
+                    await new Promise(r => setTimeout(r, 200));
+                }
+
+                fs.renameSync(oldFilePath, newFilePath);
+
+                const infoFilePath = `${oldFilePath}.info`;
+                if (fs.existsSync(infoFilePath)) {
+                    fs.unlinkSync(infoFilePath);
+                }
+
+                const metadataHeaderB64 = headers["Upload-Metadata"]?.[0];
+
+                if (metadataHeaderB64) {
+                    const metadataHeader = Buffer.from(metadataHeaderB64, "base64").toString("utf-8");
+                    if (metadataHeader) {
+                        const tomlContent = metadataHeader
+                            .split(",")
+                            .map((pair) => {
+                                const [key, value] = pair.split(" ");
+                                const escapedValue = value.replace(/"/g, '\\"');
+                                return `${key} = "${escapedValue}"`;
+                            })
+                            .join("\n");
+                        const metaFilePath = `${newFilePath}.meta`;
+                        fs.writeFileSync(metaFilePath, tomlContent, "utf-8");
+                    }
+                }
+            }
+        }
+        return NextResponse.json({});
+    } catch (error) {
+        console.error("Hook error:", error);
+        return NextResponse.json({error: "Internal server error"}, {status: 500});
+    }
+}

app/error/page.tsx

@@ -1,85 +1,33 @@
-// "use client"
-//
-// import {useSearchParams} from "next/navigation"
-//
-// enum Error {
-//     Configuration = "Configuration",
-// }
-//
-// const errorMap = {
-//     [Error.Configuration]: (
-//         <p>
-//             There was a problem when trying to authenticate. Please contact us if this
-//             error persists. Unique error code:{" "}
-//             <code className="rounded-sm bg-slate-100 p-1 text-xs">Configuration</code>
-//         </p>
-//     ),
-// }
-//
-// export default function AuthErrorPage() {
-//     const search = useSearchParams()
-//     const error = search.get("error") as Error
-//
-//     return (
-//         <div className="flex h-screen w-full flex-col items-center justify-center">
-//             <a
-//                 href="#"
-//                 className="block max-w-sm rounded-lg border border-gray-200 bg-white p-6 text-center shadow-sm hover:bg-gray-100 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700"
-//             >
-//                 <h5 className="mb-2 flex flex-row items-center justify-center gap-2 text-xl font-bold tracking-tight text-gray-900 dark:text-white">
-//                     Something went wrong
-//                 </h5>
-//                 <div className="font-normal text-gray-700 dark:text-gray-400">
-//                     {errorMap[error] || "Please contact us if this error persists."}
-//                 </div>
-//             </a>
-//         </div>
-//     )
-// }
-"use client"
+"use client";
 
-import { useSearchParams } from "next/navigation"
-import React, { Suspense } from "react"
+import { Loader2 } from "lucide-react";
+import { useRouter, useSearchParams } from "next/navigation";
+import { useEffect } from "react";
+import { useSession } from "@/lib/auth/auth-client";
 
-enum Error {
-    Configuration = "Configuration",
+export default function ErrorPage() {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const { data: session, isPending } = useSession();
+
+  useEffect(() => {
+    if (isPending) {
+      return;
+    }
+
+    const error = searchParams.get("error");
+    const params = new URLSearchParams();
+    if (error) {
+      params.set("error", error);
+    }
+
+    const destination = session ? "/dashboard/home" : "/login";
+    router.replace(`${destination}?${params.toString()}`);
+  }, [isPending, session, router, searchParams]);
+
+  return (
+    <div className="flex h-screen w-full items-center justify-center">
+      <Loader2 className="h-8 w-8 animate-spin" />
+    </div>
+  );
 }
-
-const errorMap = {
-    [Error.Configuration]: (
-        <p>
-            There was a problem when trying to authenticate. Please contact us if this
-            error persists. Unique error code:{" "}
-            <code className="rounded-sm bg-slate-100 p-1 text-xs">Configuration</code>
-        </p>
-    ),
-}
-
-function AuthErrorPageContent() {
-    const search = useSearchParams()
-    const error = search.get("error") as Error
-
-    return (
-        <div className="flex h-screen w-full flex-col items-center justify-center">
-            <a
-                href="#"
-                className="block max-w-sm rounded-lg border border-gray-200 bg-white p-6 text-center shadow-sm hover:bg-gray-100 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700"
-            >
-                <h5 className="mb-2 flex flex-row items-center justify-center gap-2 text-xl font-bold tracking-tight text-gray-900 dark:text-white">
-                    Something went wrong
-                </h5>
-                <div className="font-normal text-gray-700 dark:text-gray-400">
-                    {errorMap[error] || "Please contact us if this error persists."}
-                </div>
-            </a>
-        </div>
-    )
-}
-
-export default function AuthErrorPage() {
-    return (
-        <Suspense fallback={<div>Loading...</div>}>
-            <AuthErrorPageContent />
-        </Suspense>
-    )
-}

app/globals.css

@@ -6,8 +6,11 @@
 @theme inline {
     --color-background: var(--background);
     --color-foreground: var(--foreground);
-    --font-sans: var(--font-geist-sans);
+    --font-sans: var(--font-poppins), ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    --font-title: var(--font-poppins), var(--font-poppins), sans-serif;
     --font-mono: var(--font-geist-mono);
+    --font-author: var(--font-author);
+    --font-poppins: var(--font-poppins);
     --color-sidebar-ring: var(--sidebar-ring);
     --color-sidebar-border: var(--sidebar-border);
     --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
@@ -71,7 +74,7 @@
     --card-foreground: oklch(0.145 0 0);
     --popover: oklch(1 0 0);
     --popover-foreground: oklch(0.145 0 0);
-    --primary: oklch(0.205 0 0);
+    --primary: oklch(0.611 0.204 42.149);
     --primary-foreground: oklch(0.985 0 0);
     --secondary: oklch(0.97 0 0);
     --secondary-foreground: oklch(0.205 0 0);
@@ -82,7 +85,7 @@
     --destructive: oklch(0.577 0.245 27.325);
     --border: oklch(0.922 0 0);
     --input: oklch(0.922 0 0);
-    --ring: oklch(0.708 0 0);
+    --ring: oklch(0.611 0.204 42.149);
     --chart-1: oklch(0.646 0.222 41.116);
     --chart-2: oklch(0.6 0.118 184.704);
     --chart-3: oklch(0.398 0.07 227.392);
@@ -90,12 +93,12 @@
     --chart-5: oklch(0.769 0.188 70.08);
     --sidebar: oklch(0.985 0 0);
     --sidebar-foreground: oklch(0.145 0 0);
-    --sidebar-primary: oklch(0.205 0 0);
+    --sidebar-primary: oklch(0.611 0.204 42.149);
     --sidebar-primary-foreground: oklch(0.985 0 0);
     --sidebar-accent: oklch(0.97 0 0);
     --sidebar-accent-foreground: oklch(0.205 0 0);
     --sidebar-border: oklch(0.922 0 0);
-    --sidebar-ring: oklch(0.708 0 0);
+    --sidebar-ring: oklch(0.611 0.204 42.149);
 }
 
 .dark {
@@ -105,8 +108,8 @@
     --card-foreground: oklch(0.985 0 0);
     --popover: oklch(0.205 0 0);
     --popover-foreground: oklch(0.985 0 0);
-    --primary: oklch(0.922 0 0);
-    --primary-foreground: oklch(0.205 0 0);
+    --primary: oklch(0.704 0.191 47.132);
+    --primary-foreground: oklch(0.985 0 0);
     --secondary: oklch(0.269 0 0);
     --secondary-foreground: oklch(0.985 0 0);
     --muted: oklch(0.269 0 0);
@@ -116,7 +119,7 @@
     --destructive: oklch(0.704 0.191 22.216);
     --border: oklch(1 0 0 / 10%);
     --input: oklch(1 0 0 / 15%);
-    --ring: oklch(0.556 0 0);
+    --ring: oklch(0.704 0.191 47.132);
     --chart-1: oklch(0.488 0.243 264.376);
     --chart-2: oklch(0.696 0.17 162.48);
     --chart-3: oklch(0.769 0.188 70.08);
@@ -124,12 +127,12 @@
     --chart-5: oklch(0.645 0.246 16.439);
     --sidebar: oklch(0.205 0 0);
     --sidebar-foreground: oklch(0.985 0 0);
-    --sidebar-primary: oklch(0.488 0.243 264.376);
+    --sidebar-primary: oklch(0.704 0.191 47.132);
     --sidebar-primary-foreground: oklch(0.985 0 0);
     --sidebar-accent: oklch(0.269 0 0);
     --sidebar-accent-foreground: oklch(0.985 0 0);
     --sidebar-border: oklch(1 0 0 / 10%);
-    --sidebar-ring: oklch(0.556 0 0);
+    --sidebar-ring: oklch(0.704 0.191 47.132);
 }
 
 @layer base {
@@ -137,6 +140,18 @@
         @apply border-border outline-ring/50;
     }
     body {
-        @apply bg-background text-foreground;
+        @apply bg-background text-foreground font-sans;
+    }
+    h1, h2, h3, h4, h5, h6 {
+        @apply font-title;
+    }
+
+    .scrollbar-hide {
+        -ms-overflow-style: none;
+        scrollbar-width: none;
+    }
+
+    .scrollbar-hide::-webkit-scrollbar {
+        display: none;
     }
 }

app/layout.tsx

@@ -1,38 +1,42 @@
-import React from "react";
-import type {Metadata} from "next";
+import type { Metadata } from "next";
+import type React from "react";
 import "./globals.css";
-import {Providers} from "./providers";
-import {cn} from "@/lib/utils";
-import {ConsoleSilencer} from "@/components/wrappers/common/console-silencer";
-import {inter} from "@/fonts/fonts";
+import { ConsoleSilencer } from "@/components/wrappers/common/console-silencer";
+import { author, geistMono, poppins } from "@/fonts/fonts";
+import { cn } from "@/lib/utils";
+import { Providers } from "./providers";
 
 const title = process.env.PROJECT_NAME ?? "App Title";
 
 export const metadata: Metadata = {
-    title: {
-        default: title,
-        template: `%s - ${title}`
-    },
-    description: process.env.PROJECT_DESCRIPTION ?? undefined,
+  title: {
+    default: title,
+    template: `%s - ${title}`,
+  },
+  description: process.env.PROJECT_DESCRIPTION ?? undefined,
 };
 
 export default async function RootLayout({
-                                             children,
-                                         }: Readonly<{
-    children: React.ReactNode;
+  children,
+}: Readonly<{
+  children: React.ReactNode;
 }>) {
-
-    return (
-        <html lang="en" suppressHydrationWarning>
-        <head>
-            <meta name="apple-mobile-web-app-title" content={title}/>
-        </head>
-        <body className={cn(inter.className, "h-full")}>
-        <ConsoleSilencer/>
-        <Providers>
-            {children}
-        </Providers>
-        </body>
-        </html>
-    );
+  return (
+    <html lang="en" suppressHydrationWarning>
+      <head>
+        <meta name="apple-mobile-web-app-title" content={title} />
+      </head>
+      <body
+        className={cn(
+          poppins.variable,
+          author.variable,
+          geistMono.variable,
+          "font-sans h-full",
+        )}
+      >
+        <ConsoleSilencer />
+        <Providers>{children}</Providers>
+      </body>
+    </html>
+  );
 }

app/not-found.tsx

@@ -1,15 +1,19 @@
 import BackButton from "@/components/wrappers/common/button/back-button";
 
 export default async function NotFound() {
-    return(
-        <div className="flex items-center min-h-screen px-4 py-12 sm:px-6 md:px-8 lg:px-12 xl:px-16">
-            <div className="w-full space-y-6 text-center">
-                <div className="space-y-3">
-                    <h1 className="scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl">Not found</h1>
-                    <p className="leading-7 [&:not(:first-child)]:mt-6">The content you are trying to view is not available.</p>
-                </div>
-                <BackButton>Go home</BackButton>
-            </div>
+  return (
+    <div className="flex items-center min-h-screen px-4 py-12 sm:px-6 md:px-8 lg:px-12 xl:px-16">
+      <div className="w-full space-y-6 text-center">
+        <div className="space-y-3">
+          <h1 className="scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl">
+            Not found
+          </h1>
+          <p className="leading-7 not-first:mt-6">
+            The content you are trying to view is not available.
+          </p>
         </div>
-    )
+        <BackButton>Go home</BackButton>
+      </div>
+    </div>
+  );
 }

app/providers.tsx

@@ -1,31 +1,28 @@
 "use client";
 
-import {PropsWithChildren, Suspense} from "react";
-import {ThemeProvider} from "@/features/theme/theme-provider";
-
-import {Toaster} from "@/components/ui/sonner";
-import {QueryClient, QueryClientProvider} from "@tanstack/react-query";
-import {ThemeMetaUpdaterRoot} from "@/features/browser/theme-meta-updater-root";
-import {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { type PropsWithChildren, Suspense } from "react";
 
+import { Toaster } from "@/components/ui/sonner";
+import { ErrorLayout } from "@/components/wrappers/common/error-layout";
+import { ThemeMetaUpdaterRoot } from "@/features/browser/theme-meta-updater-root";
+import { ThemeProvider } from "@/features/theme/theme-provider";
 
 export type ProviderProps = PropsWithChildren<{}>;
 const queryClient = new QueryClient();
 
 export const Providers = (props: ProviderProps) => {
-    return (
-        <Suspense fallback={null}>
-            <ThemeProvider
-                attribute="class"
-                defaultTheme="system"
-                enableSystem
-            >
-                <ThemeMetaUpdaterRoot/>
-                <QueryClientProvider client={queryClient}>
-                        <Toaster/>
-                        {props.children}
-                </QueryClientProvider>
-            </ThemeProvider>
-        </Suspense>
-    );
+  return (
+    <Suspense fallback={null}>
+      <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
+        <ThemeMetaUpdaterRoot />
+        <QueryClientProvider client={queryClient}>
+          <ErrorLayout>
+            <Toaster />
+            {props.children}
+          </ErrorLayout>
+        </QueryClientProvider>
+      </ThemeProvider>
+    </Suspense>
+  );
 };

docker-compose.func.yml

@@ -0,0 +1,35 @@
+name: portabase-dev-func
+
+services:
+  keycloak:
+    image: quay.io/keycloak/keycloak:latest
+    command: start-dev --import-realm
+    # environment:
+    #   KC_BOOTSTRAP_ADMIN_USERNAME: admin
+    #   KC_BOOTSTRAP_ADMIN_PASSWORD: admin
+    ports:
+      - "3056:8080"
+    volumes:
+      - keycloak-data:/opt/keycloak/data
+      - ./seeds/keycloak:/opt/keycloak/data/import:ro
+      - ./export:/tmp/export
+  pocket-id:
+    image: ghcr.io/pocket-id/pocket-id
+    restart: unless-stopped
+    environment:
+      - APP_URL=http://localhost:3055
+      - ENCRYPTION_KEY=QwHyjbZvSsDUAcjpdmSPsuYxaH6vET6OeBaeLwXccCb43L6Om3W1AoU5pKIJTzYr
+    ports:
+      - 3055:1411
+    volumes:
+      - pocket-id-data:/app/data
+      - ./seeds/pocket-id:/seed:ro
+    healthcheck:
+      test: "curl -f http://localhost:1411/healthz"
+      interval: 1m30s
+      timeout: 5s
+      retries: 2
+      start_period: 10s
+volumes:
+  keycloak-data:
+  pocket-id-data:

docker-compose.prod.yml

@@ -1,19 +1,18 @@
-name: portabase-prod
-
 services:
-
   app:
-    build:
-      context: .
-      dockerfile: docker/dockerfile/Dockerfile
-      target: prod
-#    image: solucetechnologies/portabase:latest
+#        build:
+#          context: .
+#          dockerfile: docker/dockerfile/Dockerfile
+#          target: prod
+    image: portabase/portabase:1.4.0
     ports:
       - '8887:80'
     environment:
       TZ: "Europe/Paris"
     env_file:
       - .env
+    volumes:
+      - portabase-data:/data
     depends_on:
       db:
         condition: service_healthy
@@ -36,4 +35,5 @@ services:
       retries: 5
 
 volumes:
+  portabase-data:
   postgres-data:

docker-compose.yml

@@ -12,10 +12,25 @@ services:
       - POSTGRES_USER=devuser
       - POSTGRES_PASSWORD=changeme
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U devuser -d devdb" ]
+      test: ["CMD-SHELL", "pg_isready -U devuser -d devdb"]
       interval: 10s
       timeout: 5s
       retries: 5
 
+  tusd:
+    image: tusproject/tusd:v2.8.0
+    ports:
+      - "1080:8080"
+    command: >
+      -upload-dir /data/uploads/tmp
+      -hooks-http http://localhost:8887/api/tus/hooks
+      -max-size 21474836480
+      -base-path /tus/files/
+    extra_hosts:
+      - "localhost:host-gateway"
+    volumes:
+      - ./private/uploads/tmp:/data/uploads/tmp
+    user: "1000:1000"
+
 volumes:
   postgres-data:

docker/dockerfile/Dockerfile

@@ -1,53 +1,79 @@
-FROM node:22-alpine AS base
+FROM --platform=$BUILDPLATFORM node:22-bullseye AS base
+
+RUN apt-get update && apt-get install -y \
+    curl \
+    ca-certificates \
+    bash \
+    tzdata \
+    libc6 \
+    build-essential \
+    g++ \
+    make \
+    autoconf \
+    automake \
+    libtool \
+    git \
+    nginx \
+    && rm -rf /var/lib/apt/lists/*
+
+
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    | gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" \
+    > /etc/apt/sources.list.d/pgdg.list
+
+RUN apt-get update && apt-get install -y \
+    postgresql-18 \
+    postgresql-client-18 \
+    postgresql-contrib-18 \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV PATH="/usr/lib/postgresql/18/bin:${PATH}"
+
+
+FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS tusd-base
+
+ARG TUSD_VERSION=2.8.0
+
+RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build
+
+RUN git clone https://github.com/tus/tusd.git . \
+    && git checkout v${TUSD_VERSION}
+
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
+    go build -ldflags="-s -w" -o /tusddist/tusd ./cmd/tusd
+
+FROM scratch AS tusd-dist
+COPY --from=tusd-base /tusddist/tusd /tusd
 
-RUN apk add --update --no-cache \
-    libc6-compat \
-    openssl \
-    tzdata
 
 FROM base AS build-env
 
-RUN apk add --update --no-cache \
-    build-base \
-    g++ \
-    make \
-    libtool \
-    autoconf \
-    automake
-
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
-
-
-
 FROM build-env AS deps
 
 WORKDIR /app
 
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
-
 RUN pnpm i --frozen-lockfile
 
-
-
-
 FROM build-env AS dev
 
-WORKDIR /app
-
 COPY --from=deps /app/node_modules ./node_modules
+COPY --from=tusd-base /usr/local/bin/tusd /usr/local/bin/tusd
+WORKDIR /app
 COPY . .
 
 USER root
-
 RUN chmod +x /app/docker/entrypoints/app-dev-entrypoint.sh
+
 ENTRYPOINT ["sh","/app/docker/entrypoints/app-dev-entrypoint.sh"]
 
-
-
-
-
-
 FROM build-env AS builder
 
 WORKDIR /app
@@ -55,57 +81,44 @@ COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
 ENV NEXT_TELEMETRY_DISABLED=1
-
 RUN pnpm run build
 
-
-
-
-
 FROM base AS prod
 
 WORKDIR /app
-
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
-
-RUN corepack enable && corepack prepare pnpm@latest --activate
+ENV PORT=80
+ENV HOSTNAME="0.0.0.0"
+ENV PGDATA=/data/postgres
+ENV PRIVATE_PATH=/data/private
 
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
 COPY --from=builder /app/public ./public
-
-RUN mkdir .next
-RUN chown nextjs:nodejs .next
-RUN mkdir -p /app/private/uploads
-RUN chown -R nextjs:nodejs /app/private
-RUN chown -R nextjs:nodejs /app/public
-
 COPY --from=builder /app/next.config.ts ./
-COPY --from=builder /app/server ./server
-COPY --from=builder /app/src ./src
-
 COPY --from=builder /app/portabase.config.ts ./
 COPY --from=builder /app/drizzle.config.ts ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-COPY --chown=nextjs:nodejs src/db ./src/db
-
+COPY --from=builder --chown=1001:1001 /app/.next/standalone ./
+COPY --from=builder --chown=1001:1001 /app/.next/static ./.next/static
+COPY --chown=1001:1001 src/db ./src/db
 COPY --from=deps /app/node_modules ./node_modules
 
-USER root
+COPY --from=tusd-dist /tusd /usr/local/bin/tusd
+RUN chmod +x /usr/local/bin/tusd
 
+COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
+
+
+RUN mkdir -p .next /data/private/uploads \
+    && chown -R nextjs:nodejs .next /data/private /app/public
+
+
+USER root
 COPY ./docker/entrypoints/app-prod-entrypoint.sh /app/app-prod-entrypoint.sh
 RUN chmod +x /app/app-prod-entrypoint.sh
 
 EXPOSE 80
-
-ENV PORT=80
-
-ENV HOSTNAME="0.0.0.0"
-
-USER nextjs
-
 ENTRYPOINT ["sh","/app/app-prod-entrypoint.sh"]

docker/entrypoints/app-prod-entrypoint.sh

@@ -7,8 +7,77 @@ else
     echo "[WARN] No TZ provided, using default container timezone"
 fi
 
-pnpm run start
-#node server.js
+POSTGRES_BIN=$(ls -d /usr/lib/postgresql/*/bin | head -n 1)
+
+if [ -z "$POSTGRES_BIN" ]; then
+    echo "PostgreSQL binaries not found"
+    exit 1
+fi
+
+export PATH="$POSTGRES_BIN:$PATH"
+
+if [ -z "$DATABASE_URL" ]; then
+    echo "[INFO] No DATABASE_URL provided, starting internal Postgres..."
+
+    mkdir -p "$PGDATA"
+    chown -R postgres:postgres "$PGDATA"
+
+    if [ ! -f "$PGDATA/PG_VERSION" ]; then
+        echo "[INFO] Initializing database cluster..."
+        if ! su postgres -c "initdb -D '$PGDATA'" > /dev/null 2>&1; then
+            echo "[ERROR] initdb failed"
+            exit 1
+        fi
+    fi
+
+    if ! su postgres -c "pg_ctl -D '$PGDATA' \
+        -o \"-c listen_addresses='localhost' -c logging_collector=on\" \
+        -l $PGDATA/postgres.log -w start" > /dev/null 2>&1; then
+        echo "[ERROR] PostgreSQL failed to start"
+        exit 1
+    fi
+
+    until su postgres -c "pg_isready -h 127.0.0.1 -p 5432" > /dev/null 2>&1; do
+        sleep 1
+    done
+
+    echo "[INFO] PostgreSQL server is up and accepting connections"
+
+    DB_USER="${POSTGRES_USER:-portabase_user}"
+    DB_PASS="${POSTGRES_PASSWORD:-JaB6b1SUtIWYvt7srnOt}"
+    DB_NAME="${POSTGRES_DB:-portabase_db}"
+
+    USER_EXISTS=$(su postgres -c "psql -tAc \"SELECT 1 FROM pg_roles WHERE rolname='$DB_USER'\"" 2>/dev/null)
+    if [ "$USER_EXISTS" != "1" ]; then
+        if ! su postgres -c "psql -c \"CREATE USER $DB_USER WITH PASSWORD '$DB_PASS';\"" > /dev/null 2>&1; then
+            echo "[ERROR] Failed creating user"
+            exit 1
+        fi
+    fi
+
+    DB_EXISTS=$(su postgres -c "psql -tAc \"SELECT 1 FROM pg_database WHERE datname='$DB_NAME'\"" 2>/dev/null)
+    if [ "$DB_EXISTS" != "1" ]; then
+        if ! su postgres -c "psql -c \"CREATE DATABASE $DB_NAME OWNER $DB_USER;\"" > /dev/null 2>&1; then
+            echo "[ERROR] Failed creating database"
+            exit 1
+        fi
+    fi
+
+    export DATABASE_URL="postgres://$DB_USER:$DB_PASS@127.0.0.1:5432/$DB_NAME"
+
+    echo "[SUCCESS] Internal PostgreSQL started successfully"
+    echo "[SUCCESS] Database: $DB_NAME | User: $DB_USER | Host: 127.0.0.1:5432"
+fi
+
+
+mkdir -p /data/private/uploads/tmp
+echo "▶ Starting tusd server..."
+tusd --base-path /tus/files/ --upload-dir /data/private/uploads/tmp --hooks-http http://127.0.0.1:3000/api/tus/hooks --port 1080 --max-size 21474836480 &
+
+echo "▶ Starting Next.js server..."
+PORT=3000 node server.js &
+
+echo "▶ Starting nginx..."
+exec nginx -g "daemon off;"
 
-exec "$@"
 

docker/nginx/nginx.conf

@@ -0,0 +1,41 @@
+events {}
+
+http {
+    client_max_body_size 20G;
+    ignore_invalid_headers  off;
+
+    server {
+        listen 80;
+
+       location /tus/ {
+            proxy_pass http://127.0.0.1:1080/tus/;
+
+            proxy_pass_request_headers on;
+
+            proxy_request_buffering  off;
+            proxy_buffering          off;
+            proxy_http_version       1.1;
+
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-Host $http_host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+            proxy_set_header         Upgrade $http_upgrade;
+            proxy_set_header         Connection "upgrade";
+        }
+
+        location / {
+            proxy_pass http://127.0.0.1:3000;
+
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-Host $http_host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
+}

next.config.ts

@@ -1,6 +1,8 @@
 import type {NextConfig} from "next";
 import {PORTABASE_DEFAULT_SETTINGS} from "./portabase.config";
 
+const isDev = process.env.NODE_ENV === "development";
+
 
 function buildCSPHeader(): string {
     const {CSP} = PORTABASE_DEFAULT_SETTINGS.SECURITY;
@@ -47,6 +49,17 @@ const nextConfig: NextConfig = {
         },
         proxyClientMaxBodySize: '10gb',
     },
+    async rewrites() {
+        if (!isDev) return [];
+
+        return [
+            {
+                source: "/tus/:path*",
+                destination: "http://localhost:1080/tus/:path*",
+            },
+        ];
+    },
+
     async headers() {
         return [
             {

package.json

@@ -1,132 +1,136 @@
 {
   "name": "portabase",
-  "version": "1.2.5-rc.5",
+  "version": "1.4.9",
   "private": true,
   "scripts": {
-    "dev": "NODE_ENV=development tsx watch server/server.ts",
+    "dev": "next dev --turbopack -p 8887",
     "build": "next build --experimental-build-mode compile",
-    "start": "NODE_ENV=production node server/server.js",
-
+    "start": "next start",
     "lint": "next lint",
     "email": "email dev --dir ./src/components/emails",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "drizzle-kit migrate",
     "db:drop": "drizzle-kit drop",
-    "auth:generate": "npx @better-auth/cli generate --config ./src/lib/auth/auth.ts"
+    "auth:generate": "npx @better-auth/cli generate --config ./src/lib/auth/auth.ts",
+    "release": "release-it"
   },
   "dependencies": {
-    "@hookform/resolvers": "^5.0.1",
-    "@radix-ui/react-accordion": "^1.2.10",
-    "@radix-ui/react-alert-dialog": "^1.1.13",
-    "@radix-ui/react-aspect-ratio": "^1.1.6",
-    "@radix-ui/react-avatar": "^1.1.9",
-    "@radix-ui/react-checkbox": "^1.3.1",
-    "@radix-ui/react-collapsible": "^1.1.10",
-    "@radix-ui/react-context-menu": "^2.2.14",
-    "@radix-ui/react-dialog": "^1.1.13",
-    "@radix-ui/react-dropdown-menu": "^2.1.14",
-    "@radix-ui/react-hover-card": "^1.1.13",
+    "@better-auth/passkey": "^1.4.19",
+    "@better-auth/sso": "^1.4.19",
+    "@hookform/resolvers": "^5.2.2",
+    "@radix-ui/react-accordion": "^1.2.12",
+    "@radix-ui/react-alert-dialog": "^1.1.15",
+    "@radix-ui/react-aspect-ratio": "^1.1.8",
+    "@radix-ui/react-avatar": "^1.1.11",
+    "@radix-ui/react-checkbox": "^1.3.3",
+    "@radix-ui/react-collapsible": "^1.1.12",
+    "@radix-ui/react-context-menu": "^2.2.16",
+    "@radix-ui/react-dialog": "^1.1.15",
+    "@radix-ui/react-dropdown-menu": "^2.1.16",
+    "@radix-ui/react-hover-card": "^1.1.15",
     "@radix-ui/react-icons": "^1.3.2",
-    "@radix-ui/react-label": "^2.1.6",
-    "@radix-ui/react-menubar": "^1.1.14",
-    "@radix-ui/react-navigation-menu": "^1.2.12",
-    "@radix-ui/react-popover": "^1.1.13",
-    "@radix-ui/react-progress": "^1.1.6",
-    "@radix-ui/react-radio-group": "^1.3.6",
-    "@radix-ui/react-scroll-area": "^1.2.8",
-    "@radix-ui/react-select": "^2.2.4",
-    "@radix-ui/react-separator": "^1.1.6",
-    "@radix-ui/react-slider": "^1.3.4",
-    "@radix-ui/react-slot": "^1.2.2",
-    "@radix-ui/react-switch": "^1.2.4",
-    "@radix-ui/react-tabs": "^1.1.11",
-    "@radix-ui/react-toast": "^1.2.13",
-    "@radix-ui/react-toggle": "^1.1.8",
-    "@radix-ui/react-toggle-group": "^1.1.9",
-    "@radix-ui/react-tooltip": "^1.2.6",
+    "@radix-ui/react-label": "^2.1.8",
+    "@radix-ui/react-menubar": "^1.1.16",
+    "@radix-ui/react-navigation-menu": "^1.2.14",
+    "@radix-ui/react-popover": "^1.1.15",
+    "@radix-ui/react-progress": "^1.1.8",
+    "@radix-ui/react-radio-group": "^1.3.8",
+    "@radix-ui/react-scroll-area": "^1.2.10",
+    "@radix-ui/react-select": "^2.2.6",
+    "@radix-ui/react-separator": "^1.1.8",
+    "@radix-ui/react-slider": "^1.3.6",
+    "@radix-ui/react-slot": "^1.2.4",
+    "@radix-ui/react-switch": "^1.2.6",
+    "@radix-ui/react-tabs": "^1.1.13",
+    "@radix-ui/react-toast": "^1.2.15",
+    "@radix-ui/react-toggle": "^1.1.10",
+    "@radix-ui/react-toggle-group": "^1.1.11",
+    "@radix-ui/react-tooltip": "^1.2.8",
     "@react-email/components": "^0.0.41",
-    "@t3-oss/env-nextjs": "^0.13.4",
-    "@tanstack/react-query": "^5.76.1",
+    "@t3-oss/env-nextjs": "^0.13.10",
+    "@tanstack/react-query": "^5.90.21",
     "@tanstack/react-table": "^8.21.3",
     "@types/express": "^5.0.6",
-    "@types/nodemailer": "^6.4.17",
+    "@types/nodemailer": "^6.4.23",
     "@types/ws": "^8.18.1",
     "@zenstackhq/runtime": "2.14.2",
-    "argon2": "^0.43.0",
+    "argon2": "^0.43.1",
     "bcrypt": "^6.0.0",
-    "better-auth": "1.4.5",
+    "better-auth": "1.4.18",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
-    "dockerode": "^4.0.6",
-    "dotenv": "^16.5.0",
+    "dockerode": "^4.0.9",
+    "dotenv": "^16.6.1",
     "drizzle-orm": "^0.43.1",
     "drizzle-zod": "^0.7.1",
     "embla-carousel-react": "^8.6.0",
-    "express": "^5.2.1",
     "googleapis": "^170.1.0",
     "input-otp": "^1.4.2",
     "lucide-react": "^0.553.0",
-    "minio": "^8.0.5",
-    "motion": "^12.23.24",
+    "minio": "^8.0.6",
+    "motion": "^12.34.3",
     "next": "16.1.5",
     "next-safe-action": "^7.10.8",
     "next-themes": "^0.4.6",
     "node-cron": "^4.2.1",
-    "node-forge": "^1.3.1",
-    "nodemailer": "^7.0.3",
-    "npm-check-updates": "^18.0.1",
-    "pg": "^8.16.0",
-    "prettier": "^3.8.0",
-    "react": "^19.2.0",
+    "node-forge": "^1.3.3",
+    "nodemailer": "^7.0.13",
+    "npm-check-updates": "^18.3.1",
+    "pg": "^8.18.0",
+    "prettier": "^3.8.1",
+    "react": "^19.2.4",
     "react-day-picker": "9.7.0",
-    "react-dom": "^19.2.0",
-    "react-dropzone": "^14.3.8",
-    "react-email": "^4.0.13",
-    "react-hook-form": "^7.56.3",
+    "react-dom": "^19.2.4",
+    "react-dropzone": "^14.4.1",
+    "react-email": "^4.3.2",
+    "react-hook-form": "^7.71.2",
     "react-qr-code": "^2.0.18",
-    "react-resizable-panels": "^3.0.2",
-    "react-twc": "^1.4.2",
+    "react-resizable-panels": "^3.0.6",
+    "react-twc": "^1.5.1",
     "react-use-measure": "^2.1.7",
-    "recharts": "^2.15.3",
+    "recharts": "^2.15.4",
     "sharp": "^0.34.5",
-    "socket.io": "^4.8.1",
-    "socket.io-client": "^4.8.1",
-    "sonner": "^2.0.3",
-    "swiper": "^12.0.3",
-    "tailwind-merge": "^3.3.0",
+    "socket.io": "^4.8.3",
+    "socket.io-client": "^4.8.3",
+    "sonner": "^2.0.7",
+    "swiper": "^12.1.2",
+    "tailwind-merge": "^3.5.0",
     "uuid": "^11.1.0",
     "vaul": "^1.1.2",
-    "ws": "^8.18.2",
-    "zod": "^3.24.4"
+    "ws": "^8.19.0",
+    "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@iconify/react": "^6.0.0",
+    "@iconify/react": "^6.0.2",
     "@react-email/preview-server": "4.3.2",
-    "@react-email/render": "^2.0.1",
-    "@tailwindcss/postcss": "^4.1.7",
+    "@react-email/render": "^2.0.4",
+    "@release-it/bumper": "^7.0.5",
+    "@release-it/conventional-changelog": "^10.0.5",
+    "@tailwindcss/postcss": "^4.2.1",
     "@types/eslint-plugin-tailwindcss": "^3.17.0",
-    "@types/node": "^22.15.18",
-    "@types/node-forge": "^1",
-    "@types/pg": "^8.15.2",
-    "@types/react": "^19.1.4",
-    "@types/react-dom": "^19.1.5",
-    "@zenstackhq/openapi": "^2.14.2",
-    "@zenstackhq/tanstack-query": "^2.14.2",
-    "baseline-browser-mapping": "^2.9.19",
-    "drizzle-kit": "^0.31.1",
-    "esbuild": "^0.27.2",
-    "eslint": "^9.39.0",
-    "eslint-config-next": "^16.0.1",
-    "eslint-plugin-tailwindcss": "^3.18.0",
-    "framer-motion": "^12.24.7",
-    "postcss": "^8.5.3",
-    "tailwindcss": "^4.1.7",
-    "tsx": "^4.19.4",
-    "tw-animate-css": "^1.2.9",
-    "typescript": "^5.8.3",
+    "@types/node": "^22.19.11",
+    "@types/node-forge": "^1.3.14",
+    "@types/pg": "^8.16.0",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
+    "@zenstackhq/openapi": "^2.22.1",
+    "@zenstackhq/tanstack-query": "^2.22.2",
+    "baseline-browser-mapping": "^2.10.0",
+    "drizzle-kit": "^0.31.9",
+    "esbuild": "^0.27.3",
+    "eslint": "^9.39.3",
+    "eslint-config-next": "^16.1.6",
+    "eslint-plugin-tailwindcss": "^3.18.2",
+    "framer-motion": "^12.34.3",
+    "postcss": "^8.5.6",
+    "release-it": "^19.2.4",
+    "tailwindcss": "^4.2.1",
+    "tsx": "^4.21.0",
+    "tw-animate-css": "^1.4.0",
+    "typescript": "^5.9.3",
     "zenstack": "2.14.2"
   },
-  "packageManager": "pnpm@10.28.1+sha512.7d7dbbca9e99447b7c3bf7a73286afaaf6be99251eb9498baefa7d406892f67b879adb3a1d7e687fc4ccc1a388c7175fbaae567a26ab44d1067b54fcb0d6a316"
+  "packageManager": "pnpm@10.30.1+sha512.3590e550d5384caa39bd5c7c739f72270234b2f6059e13018f975c313b1eb9fefcc09714048765d4d9efe961382c312e624572c0420762bdc5d5940cdf9be73a"
 }

portabase.config.ts

@@ -1,17 +1,5 @@
 
 
-export interface AuthProviderConfig {
-    id: "google" | "github" | "credential";
-    isActive: boolean;
-    icon: string;
-    isManual?: boolean;
-    credentials?: {
-        clientId: string;
-        clientSecret: string;
-    };
-}
-
-
 export const PORTABASE_DEFAULT_SETTINGS = {
     SECURITY: {
         CSP: {
@@ -64,7 +52,7 @@ export const PORTABASE_DEFAULT_SETTINGS = {
             FORM_ACTION: ["'self'"],
             FRAME_ANCESTORS: ["'none'"],
             BLOCK_ALL_MIXED_CONTENT: false,
-            UPGRADE_INSECURE_REQUESTS: true,
+            UPGRADE_INSECURE_REQUESTS: process.env.PROJECT_URL?.startsWith("https://") || false,
         },
         PERMISSIONS_POLICY: {
             CAMERA: ["()"],
@@ -76,35 +64,3 @@ export const PORTABASE_DEFAULT_SETTINGS = {
     },
 };
 
-
-export const SUPPORTED_PROVIDERS: AuthProviderConfig[] = [
-    {
-        id: "google",
-        icon: "hugeicons:chrome",
-        isActive: Boolean(process.env.AUTH_GOOGLE_METHOD),
-        // isManual: true,
-        credentials: {
-            clientId: process.env.AUTH_GOOGLE_ID || "",
-            clientSecret: process.env.AUTH_GOOGLE_SECRET || "",
-        },
-    },
-    {
-        id: "github",
-        icon: "iconoir:github",
-        isActive: Boolean(process.env.AUTH_GITHUB_METHOD),
-        credentials: {
-            clientId: process.env.AUTH_GITHUB_ID || "",
-            clientSecret: process.env.AUTH_GITHUB_SECRET || "",
-        },
-    },
-    {
-        id: "credential",
-        isActive: true,
-        icon: "proicons:key",
-        isManual: true,
-        credentials: {
-            clientId: "",
-            clientSecret: "",
-        },
-    },
-];

proxy.ts

@@ -1,73 +1,81 @@
-import {NextRequest, NextResponse} from "next/server";
-import {loggingMiddleware} from "@/middleware/loggingMiddleware";
-import {errorHandler} from "@/middleware/errorHandler";
-import {auth} from "@/lib/auth/auth";
-import {headers} from "next/headers";
+import { NextRequest, NextResponse } from "next/server";
+import { loggingMiddleware } from "@/middleware/loggingMiddleware";
+import { errorHandler } from "@/middleware/errorHandler";
+import { auth } from "@/lib/auth/auth";
+import { headers } from "next/headers";
 
 export async function proxy(request: NextRequest) {
-    const url = request.nextUrl.clone();
-    const redirectUrl = encodeURIComponent(request.nextUrl.pathname)
+  const url = request.nextUrl.clone();
+  const redirectUrl = encodeURIComponent(request.nextUrl.pathname);
 
-    if (url.pathname.startsWith("/dashboard")) {
-        const session = await auth.api.getSession({
-            headers: await headers(),
-        });
-        if (!session) {
-            return NextResponse.redirect(new URL(`/login?redirect=${redirectUrl}`, request.url));
-        }
-        if (session.user.banned) {
-            await auth.api.signOut({headers: await headers()});
-            return NextResponse.redirect(new URL("/login?error=banned", request.url));
-        }
-        if (session.user.role === "pending") {
-            await auth.api.signOut({headers: await headers()});
-            return NextResponse.redirect(new URL(`/login?error=pending?redirect=${redirectUrl}`, request.url));
-        }
-        if (url.pathname === "/dashboard") {
-            return NextResponse.redirect(new URL(`/dashboard/home`, request.url));
-        }
-        return NextResponse.next();
+  if (url.pathname.startsWith("/dashboard")) {
+    const session = await auth.api.getSession({
+      headers: await headers(),
+    });
+    if (!session) {
+      return NextResponse.redirect(
+        new URL(`/login?redirect=${redirectUrl}`, request.url),
+      );
     }
+    if (session.user.banned) {
+      await auth.api.signOut({ headers: await headers() });
+      return NextResponse.redirect(new URL("/login?error=banned", request.url));
+    }
+    if (session.user.role === "pending") {
+      await auth.api.signOut({ headers: await headers() });
+      return NextResponse.redirect(
+        new URL(`/login?error=pending?redirect=${redirectUrl}`, request.url),
+      );
+    }
+    if (url.pathname === "/dashboard") {
+      return NextResponse.redirect(new URL(`/dashboard/home`, request.url));
+    }
+    return NextResponse.next();
+  }
 
-    if (url.pathname.startsWith("/api/auth")) {
-        return NextResponse.next();
-    }
+  if (url.pathname.startsWith("/api/auth")) {
+    return NextResponse.next();
+  }
 
-    if (url.pathname.startsWith("/api")) {
-        const routeExists = checkRouteExists(url.pathname);
-        if (!routeExists) {
-            return new NextResponse(JSON.stringify({message: "This API route does not exist.", status: 404}), {
-                status: 404,
-                headers: {"Content-Type": "application/json"},
-            });
-        }
-    }
-    try {
-        loggingMiddleware(request);
-    } catch (err) {
-        errorHandler(err);
+  if (url.pathname.startsWith("/api")) {
+    const routeExists = checkRouteExists(url.pathname);
+    if (!routeExists) {
+      return new NextResponse(
+        JSON.stringify({
+          message: "This API route does not exist.",
+          status: 404,
+        }),
+        {
+          status: 404,
+          headers: { "Content-Type": "application/json" },
+        },
+      );
     }
+  }
+  try {
+    loggingMiddleware(request);
+  } catch (err) {
+    errorHandler(err);
+  }
 }
 
 function checkRouteExists(pathname: string) {
-    const routePatterns = [
-        /^\/api\/agent\/[^/]+\/status\/?$/,
-        /^\/api\/agent\/[^/]+\/backup\/?$/,
-        /^\/api\/agent\/[^/]+\/restore\/?$/,
-        /^\/api\/files\/images\/[^/]+\/?$/,
-        /^\/api\/files\/backups\/?$/,
-        /^\/api\/events\/?$/,
-        /^\/api\/init\/?$/,
-        /^\/api\/config\/?$/,
-        /^\/api\/google\/drive\/callback\/?$/,
-    ];
-    return routePatterns.some((pattern) => pattern.test(pathname));
+  const routePatterns = [
+    /^\/api\/agent\/[^/]+\/status\/?$/,
+    /^\/api\/agent\/[^/]+\/backup\/?$/,
+    /^\/api\/agent\/[^/]+\/backup\/upload\/init\/?$/,
+    /^\/api\/agent\/[^/]+\/backup\/upload\/status\/?$/,
+    /^\/api\/agent\/[^/]+\/restore\/?$/,
+    /^\/api\/files\/images\/[^/]+\/?$/,
+    /^\/api\/files\/backups\/?$/,
+    /^\/api\/tus\/hooks\/?$/,
+    /^\/api\/events\/?$/,
+    /^\/api\/config\/?$/,
+    /^\/api\/google\/drive\/callback\/?$/,
+  ];
+  return routePatterns.some((pattern) => pattern.test(pathname));
 }
 
 export const config = {
-    matcher: [
-        "/api/:path*",
-        "/dashboard/:path*",
-        "/dashboard",
-    ]
+  matcher: ["/api/:path*", "/dashboard/:path*", "/dashboard"],
 };

release

@@ -1,95 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -z "$1" ]; then
-  echo "Usage: ./release <version>"
-  echo "Example: ./release v1.0.0"
-  exit 1
-fi
-
-VERSION=$1
-CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-
-if [ "$CURRENT_BRANCH" = "main" ]; then
-  if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    echo "Error: On 'main' branch, only release tags (X.Y.Z) are allowed."
-    exit 1
-  fi
-else
-  if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ ]]; then
-    echo "Error: On branch '$CURRENT_BRANCH', only RC tags matching X.Y.Z-rc.W are allowed (e.g., 1.0.0-rc.1)."
-    exit 1
-  fi
-fi
-
-CLEAN_VERSION=${VERSION#v}
-CURRENT_DATE=$(date +%Y-%m-%d)
-
-echo "Preparing release $VERSION..."
-
-
-# package.json
-if [ -f package.json ]; then
-  echo "Updating package.json..."
-  if sed --version >/dev/null 2>&1; then
-    sed -i "s/\"version\": \".*\"/\"version\": \"$CLEAN_VERSION\"/" package.json
-  else
-    sed -i '' "s/\"version\": \".*\"/\"version\": \"$CLEAN_VERSION\"/" package.json
-  fi
-fi
-
-# pyproject.toml
-if [ -f pyproject.toml ]; then
-  echo "Updating pyproject.toml..."
-  if sed --version >/dev/null 2>&1; then
-    sed -i "s/^version = \".*\"/version = \"$CLEAN_VERSION\"/" pyproject.toml
-  else
-    sed -i '' "s/^version = \".*\"/version = \"$CLEAN_VERSION\"/" pyproject.toml
-  fi
-fi
-
-# Cargo.toml
-if [ -f Cargo.toml ]; then
-  echo "Updating Cargo.toml..."
-  if sed --version >/dev/null 2>&1; then
-    sed -i "s/^version = \".*\"/version = \"$CLEAN_VERSION\"/" Cargo.toml
-  else
-    sed -i '' "s/^version = \".*\"/version = \"$CLEAN_VERSION\"/" Cargo.toml
-  fi
-fi
-
-# CITATION.cff
-if [ -f CITATION.cff ]; then
-  echo "Updating CITATION.cff..."
-  if sed --version >/dev/null 2>&1; then
-    sed -i "s/^version: .*/version: $CLEAN_VERSION/" CITATION.cff
-    sed -i "s/^date-released: .*/date-released: \"$CURRENT_DATE\"/" CITATION.cff
-  else
-    sed -i '' "s/^version: .*/version: $CLEAN_VERSION/" CITATION.cff
-    sed -i '' "s/^date-released: .*/date-released: \"$CURRENT_DATE\"/" CITATION.cff
-  fi
-fi
-
-git add .
-
-if ! git diff-index --quiet HEAD --; then
-  echo "Committing changes..."
-  git commit -m "chore(release): $VERSION"
-else
-  echo "No changes to commit. Proceeding to tag..."
-fi
-
-if git rev-parse "$VERSION" >/dev/null 2>&1; then
-    echo "Tag $VERSION already exists. Aborting."
-    exit 1
-fi
-
-echo "Creating tag $VERSION..."
-git tag -a "$VERSION" -m "Release $VERSION"
-
-echo "Pushing changes and tags to remote..."
-git push
-git push origin "$VERSION"
-
-echo "Successfully released $VERSION!"

seeds/keycloak/.gitkeep

@@ -0,0 +1 @@
+

seeds/pocket-id/.gitkeep

@@ -0,0 +1 @@
+

server/api.ts

@@ -1,6 +0,0 @@
-import express from "express";
-import router from "../src/features/api/router";
-
-export function mountApi(app: express.Express) {
-    app.use("/services/v1", router);
-}

server/server.ts

@@ -1,42 +0,0 @@
-import next from "next";
-import express from "express";
-import {mountApi} from "./api";
-
-const port = Number(process.env.PORT) || 8887;
-const dev = process.env.NODE_ENV !== "production";
-
-async function start() {
-    const nextApp = next({
-        dev,
-        hostname: "0.0.0.0",
-        turbopack: dev,
-        port
-    });
-
-    const handle = nextApp.getRequestHandler();
-
-    await nextApp.prepare();
-
-    const server = express();
-
-    mountApi(server);
-
-    server.use((req, res, next) => {
-        if (req.path.startsWith('/services/v1')) return next();
-        handle(req, res).catch((err) => {
-            console.error('Next.js App Router error:', err);
-            res.status(500).send('Internal Server Error');
-        });
-    });
-
-    server.listen(port, "0.0.0.0", () => {
-        console.log(
-            `NEXT APP → http://localhost:${port}`
-        );
-        console.log(
-            `API → http://localhost:${port}/services/v1`
-        );
-    });
-}
-
-start();

src/components/emails/email-create-user.tsx

@@ -6,7 +6,7 @@ import {env} from "@/env.mjs";
 
 interface EmailCreateUserProps {
     email: string;
-    password: string;
+    password?: string;
 }
 
 export const EmailCreateUser = ({email, password}: EmailCreateUserProps) => {
@@ -23,9 +23,15 @@ export const EmailCreateUser = ({email, password}: EmailCreateUserProps) => {
                 <strong>Email: </strong>{email}
             </Text>
 
-            <Text className="text-[14px] text-black leading-[24px]">
-                <strong>Default password: </strong>{password}
-            </Text>
+            {password ? (
+                <Text className="text-[14px] text-black leading-[24px]">
+                    <strong>Default password: </strong>{password}
+                </Text>
+            ) : (
+                <Text className="text-[14px] text-black leading-[24px]">
+                    You can log in using one of the single sign-on (SSO) providers configured by your administrator.
+                </Text>
+            )}
 
             <Section className="mt-[32px] mb-[32px] text-center">
                 <Button

src/components/ui/form.tsx

@@ -208,12 +208,14 @@ type UseZodFormProps<Z extends ZodSchema> = Exclude<
   schema: Z;
 };
 
+
 const useZodForm = <Z extends ZodSchema>({
                                            schema,
                                            ...formProps
                                          }: UseZodFormProps<Z>) =>
     useForm({
       ...formProps,
+        // @ts-ignore
       resolver: zodResolver(schema),
     });
 

src/components/ui/github-button.tsx

@@ -7,7 +7,7 @@ import { motion, useInView, type SpringOptions, type UseInViewOptions } from 'mo
 import { cn } from '@/lib/utils';
 
 const githubButtonVariants = cva(
-  'cursor-pointer relative overflow-hidden will-change-transform backface-visibility-hidden transform-gpu transition-transform duration-200 ease-out hover:scale-105 group whitespace-nowrap focus-visible:outline-hidden inline-flex items-center justify-center whitespace-nowrap font-medium ring-offset-background disabled:pointer-events-none disabled:opacity-60 [&_svg]:shrink-0',
+  'cursor-pointer relative overflow-hidden will-change-transform backface-visibility-hidden transform-gpu group whitespace-nowrap focus-visible:outline-hidden inline-flex items-center justify-center whitespace-nowrap font-medium ring-offset-background disabled:pointer-events-none disabled:opacity-60 [&_svg]:shrink-0',
   {
     variants: {
       variant: {

src/components/ui/input.tsx

@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<"input">) {
       type={type}
       data-slot="input"
       className={cn(
-        "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+        "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex w-full min-w-0 rounded-md border bg-transparent px-4 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
         "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
         "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
         className

src/components/ui/sidebar.tsx

@@ -374,7 +374,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
       data-slot="sidebar-content"
       data-sidebar="content"
       className={cn(
-        "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+        "flex min-h-0 flex-1 flex-col gap-2 overflow-auto scrollbar-hide group-data-[collapsible=icon]:overflow-hidden",
         className
       )}
       {...props}

src/components/wrappers/auth/auth-logo-section.tsx

@@ -41,9 +41,6 @@ export const AuthLogoSection = () => {
 
                 />
             )}
-            <span className="absolute bottom-8 right-5 text-sm text-muted-foreground" style={style}>
-                v{env.NEXT_PUBLIC_PROJECT_VERSION}
-            </span>
         </div>
     );
 };

src/components/wrappers/auth/login/forgot-password-form/forgot-password-form.tsx

@@ -68,7 +68,7 @@ export const ForgotPasswordForm = (props: ForgotPasswordFormProps) => {
             />
 
             <div className="flex flex-col items-center gap-y-6 w-full">
-                <ButtonWithLoading className="mt-2 w-full" isPending={mutation.isPending}>
+                <ButtonWithLoading className="mt-2 w-full h-11" isPending={mutation.isPending}>
                     Send reset link
                 </ButtonWithLoading>
                 <Link href="/login" className="group flex items-center text-sm hover:underline">

src/components/wrappers/auth/login/login-form/login-form.tsx

@@ -1,121 +1,133 @@
 "use client";
 
-import {useEffect, useState} from "react";
-import {useMutation} from "@tanstack/react-query";
-import {toast} from "sonner";
-import {FormControl, FormField, FormItem, FormLabel, FormMessage, useZodForm} from "@/components/ui/form";
-import {Input} from "@/components/ui/input";
-import {Form} from "@/components/ui/form";
-import {LoginSchema, LoginType} from "@/components/wrappers/auth/login/login-form/login-form.schema";
-import {signIn} from "@/lib/auth/auth-client";
-import {ButtonWithLoading} from "@/components/wrappers/common/button/button-with-loading";
+import { useMutation } from "@tanstack/react-query";
 import Link from "next/link";
-import {useRouter} from "next/navigation";
-import {PasswordInput} from "@/components/ui/password-input";
+import { useRouter, useSearchParams } from "next/navigation";
+import { useEffect } from "react";
+import { toast } from "sonner";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useZodForm,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { PasswordInput } from "@/components/ui/password-input";
+import {
+  LoginSchema,
+  type LoginType,
+} from "@/components/wrappers/auth/login/login-form/login-form.schema";
+import { ButtonWithLoading } from "@/components/wrappers/common/button/button-with-loading";
+import { signIn } from "@/lib/auth/auth-client";
 
 export type loginFormProps = {
-    defaultValues?: LoginType;
+  defaultValues?: LoginType;
+  isPasskeyEnabled?: boolean;
 };
 
 export const LoginForm = (props: loginFormProps) => {
+  const { isPasskeyEnabled = false } = props;
 
+  const url = useSearchParams();
 
-    const [urlParams, setUrlParams] = useState<URLSearchParams>();
+  const form = useZodForm({
+    schema: LoginSchema,
+  });
 
-    useEffect(() => {
-        const urlParams = new URLSearchParams(window.location.search);
-        setUrlParams(urlParams);
-        const error = urlParams.get("error");
-        if (error?.includes("pending")) {
-            toast.error("Your account is not active.");
-            urlParams.delete("error");
-            window.history.replaceState({}, document.title, window.location.pathname + "?" + urlParams.toString());
-        }
-        if (error?.includes("invalid_or_expired_token")) {
-            toast.error("Password reset invalid token.");
-            urlParams.delete("error");
-            window.history.replaceState({}, document.title, window.location.pathname + "?" + urlParams.toString());
-        }
-    }, []);
+  const router = useRouter();
 
-    const form = useZodForm({
-        schema: LoginSchema,
-    });
-
-    const router = useRouter();
-
-    const mutation = useMutation({
-        mutationFn: async (values: LoginType) => {
-            await signIn.email(
-                {
-                    password: values.password,
-                    email: values.email,
-                    callbackURL: urlParams?.get("redirect") ?? "/dashboard",
-                },
-                {
-                    onSuccess: (context) => {
-                        if (context.data.twoFactorRedirect) {
-                            //@ts-ignore
-                            router.push("/guard?redirect=" + encodeURIComponent(context.data.callbackURL || "/dashboard"));
-                        }
-
-                        toast.success("Login success");
-                    },
-                    onError: (error) => {
-                        toast.error(error.error.message);
-                    },
-                }
-            );
+  const mutation = useMutation({
+    mutationFn: async (values: LoginType) => {
+      await signIn.email(
+        {
+          password: values.password,
+          email: values.email,
+          callbackURL: url?.get("redirect") ?? "/dashboard",
         },
-    });
+        {
+          onSuccess: (context) => {
+            if (context.data.twoFactorRedirect) {
+              router.push(
+                "/guard?redirect=" +
+                  encodeURIComponent(context.data.callbackURL || "/dashboard"),
+              );
+            }
 
-    return (
-        <Form
-            form={form}
-            className="flex flex-col gap-4 mb-1"
-            onSubmit={async (values) => {
-                await mutation.mutateAsync(values);
-            }}
-        >
-            <FormField
-                control={form.control}
-                name="email"
-                defaultValue=""
-                render={({field}) => (
-                    <FormItem>
-                        <FormLabel>Email Address</FormLabel>
-                        <FormControl>
-                            <Input autoComplete="email" autoFocus placeholder="exemple@portabase.io" {...field} />
-                        </FormControl>
-                        <FormMessage/>
-                    </FormItem>
-                )}
-            />
-            <FormField
-                control={form.control}
-                name="password"
-                defaultValue=""
-                render={({field}) => (
-                    <FormItem>
-                        <div className="flex items-center justify-between">
-                            <FormLabel>Password</FormLabel>
-                            <div className="text-center text-sm">
-                                <Link href={"/forgot-password"} className="hover:underline ml-1">
-                                    Forgot your password ?
-                                </Link>
-                            </div>
-                        </div>
-                        <FormControl>
-                            <PasswordInput autoComplete="current-password webauthn"
-                                           placeholder={"Enter your password"} {...field} />
-                        </FormControl>
-                        <FormMessage/>
-                    </FormItem>
-                )}
-            />
-            <ButtonWithLoading className="mt-2" isPending={mutation.isPending}>
-                Login
-            </ButtonWithLoading>
-        </Form>
-    );
+            toast.success("Login success");
+          },
+          onError: (error) => {
+            toast.error(error.error.message);
+          },
+        },
+      );
+    },
+  });
+
+  return (
+    <Form
+      form={form}
+      className="flex flex-col gap-4 mb-1"
+      onSubmit={async (values) => {
+        await mutation.mutateAsync(values);
+      }}
+    >
+      <FormField
+        control={form.control}
+        name="email"
+        defaultValue=""
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>Email Address</FormLabel>
+            <FormControl>
+              <Input
+                autoComplete="email"
+                autoFocus
+                placeholder="example@portabase.io"
+                {...field}
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+      <FormField
+        control={form.control}
+        name="password"
+        defaultValue=""
+        render={({ field }) => (
+          <FormItem>
+            <div className="flex items-center justify-between">
+              <FormLabel>Password</FormLabel>
+              <div className="text-center text-sm">
+                <Link
+                  href={"/forgot-password"}
+                  className="hover:underline ml-1"
+                >
+                  Forgot your password ?
+                </Link>
+              </div>
+            </div>
+            <FormControl>
+              <PasswordInput
+                autoComplete={
+                  isPasskeyEnabled
+                    ? "current-password webauthn"
+                    : "current-password"
+                }
+                placeholder={"Enter your password"}
+                {...field}
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+      <ButtonWithLoading className="mt-2 h-11" isPending={mutation.isPending}>
+        Login
+      </ButtonWithLoading>
+    </Form>
+  );
 };

src/components/wrappers/auth/login/reset-password-form/reset-password-form.tsx

@@ -82,7 +82,7 @@ export const ResetPasswordForm = (props: ResetPasswordFormProps) => {
             />
 
             <div className="flex flex-col items-center gap-y-6 w-full">
-                <ButtonWithLoading className="mt-2 w-full" isPending={mutation.isPending}>
+                <ButtonWithLoading className="mt-2 w-full h-11" isPending={mutation.isPending}>
                     Reset
                 </ButtonWithLoading>
                 <Link href="/login" className="group flex items-center text-sm hover:underline">

src/components/wrappers/auth/register/register-form/register-form.tsx

@@ -1,156 +1,169 @@
 "use client";
 
-import {useRouter} from "next/navigation";
-import {useMutation} from "@tanstack/react-query";
-import {toast} from "sonner";
-import {CardContent, CardHeader} from "@/components/ui/card";
-import {Form} from "@/components/ui/form";
-import {TooltipProvider, TooltipTrigger, Tooltip, TooltipContent} from "@/components/ui/tooltip";
-import {RegisterSchema, RegisterType} from "@/components/wrappers/auth/register/register-form/register-form.schema";
-import {signUp} from "@/lib/auth/auth-client";
-import {useZodForm} from "@/components/ui/form";
-import {CardAuth} from "@/features/layout/card-auth";
-import {FormField} from "@/components/ui/form";
-import {FormItem} from "@/components/ui/form";
-import {FormLabel} from "@/components/ui/form";
-import {FormControl} from "@/components/ui/form";
-import {FormMessage} from "@/components/ui/form";
-import {Input} from "@/components/ui/input";
-import {PasswordInput} from "@/components/ui/password-input";
-import {Button} from "@/components/ui/button";
+import { useRouter } from "next/navigation";
+import { useMutation } from "@tanstack/react-query";
+import { toast } from "sonner";
+import { CardContent, CardHeader } from "@/components/ui/card";
+import { Form } from "@/components/ui/form";
+import {
+  TooltipProvider,
+  TooltipTrigger,
+  Tooltip,
+  TooltipContent,
+} from "@/components/ui/tooltip";
+import {
+  RegisterSchema,
+  RegisterType,
+} from "@/components/wrappers/auth/register/register-form/register-form.schema";
+import { signUp } from "@/lib/auth/auth-client";
+import { useZodForm } from "@/components/ui/form";
+import { CardAuth } from "@/features/layout/card-auth";
+import { FormField } from "@/components/ui/form";
+import { FormItem } from "@/components/ui/form";
+import { FormLabel } from "@/components/ui/form";
+import { FormControl } from "@/components/ui/form";
+import { FormMessage } from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { PasswordInput } from "@/components/ui/password-input";
+import { Button } from "@/components/ui/button";
 import Link from "next/link";
-import {Info} from "lucide-react";
+import { Info } from "lucide-react";
 
 export type registerFormProps = {
-    defaultValues?: RegisterType;
+  defaultValues?: RegisterType;
 };
 
 export const RegisterForm = (props: registerFormProps) => {
+  const form = useZodForm({
+    schema: RegisterSchema,
+  });
 
-    const form = useZodForm({
-        schema: RegisterSchema,
-    });
-
-    const router = useRouter();
-    const mutation = useMutation({
-        mutationFn: async (values: RegisterType) => {
-            // @ts-ignore
-            await signUp.email(values, {
-                onSuccess: () => {
-                    toast.success(`Account successfully created`);
-                    router.refresh();
-                    router.push(`/login`);
-                },
-                onError: (error) => {
-                    toast.error(error.error.message);
-                },
-            });
+  const router = useRouter();
+  const mutation = useMutation({
+    mutationFn: async (values: RegisterType) => {
+      await signUp.email(values, {
+        onSuccess: () => {
+          toast.success(`Account successfully created`);
+          router.refresh();
+          router.push(`/login`);
         },
-    });
+        onError: (error) => {
+          toast.error(error.error.message);
+        },
+      });
+    },
+  });
 
-
-    return (
-        <TooltipProvider>
-            <CardAuth>
-                <CardHeader>
-                    <div className="grid gap-2 text-center mb-2">
-                        <h1 className="text-3xl font-bold">Create an account</h1>
-                        <p className="text-balance text-muted-foreground">Enter your informations bellow to register</p>
-                    </div>
-                </CardHeader>
-                <CardContent>
-                    <Form
-                        form={form}
-                        className="flex flex-col gap-4"
-                        onSubmit={async (values) => {
-                            await mutation.mutateAsync(values);
-                        }}
-                    >
-                        <FormField
-                            control={form.control}
-                            name="name"
-                            defaultValue=""
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Name</FormLabel>
-                                    <FormControl>
-                                        <Input placeholder="Your name" {...field} />
-                                    </FormControl>
-                                    <FormMessage/>
-                                </FormItem>
-                            )}
-                        />
-                        <FormField
-                            control={form.control}
-                            name="email"
-                            defaultValue=""
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Email</FormLabel>
-                                    <FormControl>
-                                        <Input placeholder="exemple@portabase.io" {...field} />
-                                    </FormControl>
-                                    <FormMessage/>
-                                </FormItem>
-                            )}
-                        />
-                        <FormField
-                            control={form.control}
-                            name="password"
-                            defaultValue=""
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel className="flex">
-                                        Password
-                                        <TooltipProvider>
-                                            <Tooltip>
-                                                <TooltipTrigger asChild>
-                                                    <Info className="ml-3" size="15"/>
-                                                </TooltipTrigger>
-                                                <TooltipContent>
-                                                    <p>
-                                                        Min. 8 characters, 1 uppercase (A-Z), 1 lowercase (a-z), 1
-                                                        number (0-9), 1 special character (!, @,
-                                                        etc.)
-                                                    </p>
-                                                </TooltipContent>
-                                            </Tooltip>
-                                        </TooltipProvider>
-                                    </FormLabel>
-                                    <FormControl>
-                                        <PasswordInput placeholder="Your password" {...field} />
-                                    </FormControl>
-                                    <FormMessage/>
-                                </FormItem>
-                            )}
-                        />
-                        <FormField
-                            control={form.control}
-                            name="confirmPassword"
-                            defaultValue=""
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Password Confirmation</FormLabel>
-                                    <FormControl>
-                                        <PasswordInput placeholder="Conform your password" {...field} />
-                                    </FormControl>
-                                    <FormMessage/>
-                                </FormItem>
-                            )}
-                        />
-                        <Button type="submit" disabled={mutation.isPending}>
-                            Sign up
-                        </Button>
-                        <div className="mt-4 text-center text-sm">
-                            Already have an account ?{" "}
-                            <Link href="/login" className="underline">
-                                Sign in
-                            </Link>
-                        </div>
-
-                    </Form>
-                </CardContent>
-            </CardAuth>
-        </TooltipProvider>
-    );
+  return (
+    <TooltipProvider>
+      <CardAuth>
+        <CardHeader>
+          <div className="grid gap-2 text-center mb-2">
+            <h1 className="text-3xl font-bold">Create an account</h1>
+            <p className="text-balance text-muted-foreground">
+              Enter your informations below to register
+            </p>
+          </div>
+        </CardHeader>
+        <CardContent>
+          <Form
+            form={form}
+            className="flex flex-col gap-4"
+            onSubmit={async (values) => {
+              await mutation.mutateAsync(values);
+            }}
+          >
+            <FormField
+              control={form.control}
+              name="name"
+              defaultValue=""
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Name</FormLabel>
+                  <FormControl>
+                    <Input placeholder="Your name" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="email"
+              defaultValue=""
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Email</FormLabel>
+                  <FormControl>
+                    <Input placeholder="example@portabase.io" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="password"
+              defaultValue=""
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel className="flex">
+                    Password
+                    <TooltipProvider>
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <Info size="15" />
+                        </TooltipTrigger>
+                        <TooltipContent>
+                          <p>
+                            Min. 8 characters, 1 uppercase (A-Z), 1 lowercase
+                            (a-z), 1 number (0-9), 1 special character (!, @,
+                            etc.)
+                          </p>
+                        </TooltipContent>
+                      </Tooltip>
+                    </TooltipProvider>
+                  </FormLabel>
+                  <FormControl>
+                    <PasswordInput placeholder="Your password" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="confirmPassword"
+              defaultValue=""
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Password Confirmation</FormLabel>
+                  <FormControl>
+                    <PasswordInput
+                      placeholder="Conform your password"
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <Button
+              type="submit"
+              className="h-11"
+              disabled={mutation.isPending}
+            >
+              Sign up
+            </Button>
+            <div className="mt-4 text-center text-sm">
+              Already have an account ?{" "}
+              <Link href="/login" className="underline">
+                Sign in
+              </Link>
+            </div>
+          </Form>
+        </CardContent>
+      </CardAuth>
+    </TooltipProvider>
+  );
 };

src/components/wrappers/auth/reset-password/reset-password-form.tsx

@@ -47,7 +47,7 @@ export const ResetPasswordForm = ({token}: ResetPasswordFormProps) => {
             <CardHeader>
                 <div className="grid gap-2 text-center mb-2">
                     <h1 className="text-3xl font-bold">Reset Password</h1>
-                    <p className="text-balance text-muted-foreground">Fill information bellow to change your
+                    <p className="text-balance text-muted-foreground">Fill information below to change your
                         password</p>
                 </div>
             </CardHeader>

src/components/wrappers/auth/social-buttons.tsx

@@ -1,29 +1,53 @@
 "use client";
 
-import React, { useState } from "react";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
-import { authClient } from "@/lib/auth/auth-client";
+import { authClient, passkey } from "@/lib/auth/auth-client";
 import { Loader2 } from "lucide-react";
 import { toast } from "sonner";
-import {AuthProviderConfig} from "../../../../portabase.config";
-import {Icon} from "@iconify/react";
+import { Icon } from "@iconify/react";
+import { AuthProviderConfig } from "@/lib/auth/config";
+import Image from "next/image";
+import { useRouter } from "next/navigation";
 
 export function SocialAuthButtons({ providers }: { providers: AuthProviderConfig[] }) {
-    const socialProviders = providers.filter(p => p.isActive && !p.isManual);
+    const socialProviders = providers.filter((p) => p.isActive && p.type !== "credential");
+    const router = useRouter();
 
     const [isLoading, setIsLoading] = useState<string | null>(null);
 
-    const handleSocialSignIn = async (providerId: string) => {
-        setIsLoading(providerId);
+    const handleSocialSignIn = async (provider: AuthProviderConfig) => {
+        setIsLoading(provider.id);
         try {
-            const { error } = await authClient.signIn.social({
-                provider: providerId as "google" | "github",
-                callbackURL: "/dashboard",
-            });
-
-            if (error) {
-                toast.error("An error occurred while signing in with the provider. Please try again.");
+            let result;
+            if (provider.id === "passkey") {
+                result = await authClient.signIn.passkey({
+                    fetchOptions: {
+                        onSuccess() {
+                            router.push("/dashboard");
+                        },
+                        onError() {
+                            toast.error("An error occurred during passkey authentication. Please try again.");
+                        },
+                    },
+                });
+            } else if (provider.type === "sso") {
+                result = await authClient.signIn.sso({
+                    providerId: provider.id,
+                    providerType: "oidc",
+                    callbackURL: "/dashboard",
+                });
             } else {
+                result = await authClient.signIn.social({
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    provider: provider.id as any,
+                    callbackURL: "/dashboard",
+                });
+            }
+
+            if (result?.error) {
+                toast.error("An error occurred while signing in with the provider. Please try again.");
+            } else if (provider.id !== "passkey") {
                 toast.success("Redirecting to provider...");
             }
         } catch (err) {
@@ -38,29 +62,24 @@ export function SocialAuthButtons({ providers }: { providers: AuthProviderConfig
     return (
         <div className="flex flex-col gap-2 w-full">
             {socialProviders.map((provider) => (
-                <Button key={provider.id} variant="outline" className="w-full gap-2" onClick={() => handleSocialSignIn(provider.id)} disabled={!!isLoading}>
-                    {isLoading === provider.id ? <Loader2 className="h-4 w-4 animate-spin" /> :
-                        <Icon icon={provider.icon} className="h-4 w-4"/>
-                     }
-                    <span>{PROVIDERS_TEXT[provider.id].title}</span>
+                <Button key={provider.id} variant="outline" className="w-full gap-2" onClick={() => handleSocialSignIn(provider)} disabled={!!isLoading}>
+                    {isLoading === provider.id ? (
+                        <Loader2 className="h-4 w-4 animate-spin" />
+                    ) : provider.icon.startsWith("/") || provider.icon.startsWith("http") ? (
+                        <Image
+                            src={provider.icon}
+                            alt={provider.id || "icon"}
+                            width={16}
+                            height={16}
+                            className="h-4 w-4"
+                            unoptimized={provider.icon.startsWith("http")}
+                        />
+                    ) : (
+                        <Icon icon={provider.icon} className="h-4 w-4" />
+                    )}
+                    <span>{provider.title || provider.name}</span>
                 </Button>
             ))}
         </div>
     );
 }
-
-
-const PROVIDERS_TEXT = {
-    credential: {
-        title: "Password",
-        description: "Use your email address and password to sign in."
-    },
-    google: {
-        title: "Google",
-        description: "Sign in with your Google account."
-    },
-    github: {
-        title: "GitHub",
-        description: "Sign in with your GitHub account."
-    }
-}

src/components/wrappers/common/button/button-with-confirm.tsx

@@ -1,119 +1,198 @@
-"use client"
-import {Button, ButtonVariantsProps} from "@/components/ui/button";
-import {useState} from "react";
-import {Loader2} from "lucide-react";
-import {Popover, PopoverContent, PopoverTrigger} from "@/components/ui/popover";
-import {cn} from "@/lib/utils";
-import {Tooltip, TooltipContent, TooltipTrigger} from "@/components/ui/tooltip";
+"use client";
+import { Button, ButtonVariantsProps } from "@/components/ui/button";
+import { ReactNode, useState } from "react";
+import { Loader2 } from "lucide-react";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { cn } from "@/lib/utils";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 
 export type ButtonWithConfirmProps = {
-    title: string;
-    description: string;
-    button: {
-        main: {
-            className?: string;
-            type?: "button" | "submit" | "reset" | undefined;
-            text?: string;
-            icon?: any;
-            variant?: ButtonVariantsProps["variant"];
-            size?: ButtonVariantsProps["size"];
-            disabled?: boolean;
-            tooltipText?: string;
-        };
-        confirm: {
-            className?: string;
-            text: string;
-            icon?: any;
-            variant?: ButtonVariantsProps["variant"];
-            size?: ButtonVariantsProps["size"];
-            onClick?: () => void;
-        };
-        cancel: {
-            className?: string;
-            text: string;
-            icon?: any;
-            variant?: ButtonVariantsProps["variant"];
-            size?: ButtonVariantsProps["size"];
-            onClick?: () => void;
-        };
+  title: string;
+  description: string;
+  button?: {
+    main: {
+      className?: string;
+      type?: "button" | "submit" | "reset" | undefined;
+      text?: string;
+      icon?: any;
+      variant?: ButtonVariantsProps["variant"];
+      size?: ButtonVariantsProps["size"];
+      disabled?: boolean;
+      tooltipText?: string;
     };
-    isPending?: boolean;
+    confirm: {
+      className?: string;
+      text: string;
+      icon?: any;
+      variant?: ButtonVariantsProps["variant"];
+      size?: ButtonVariantsProps["size"];
+      onClick?: () => void;
+    };
+    cancel: {
+      className?: string;
+      text: string;
+      icon?: any;
+      variant?: ButtonVariantsProps["variant"];
+      size?: ButtonVariantsProps["size"];
+      onClick?: () => void;
+    };
+  };
+  children?: ReactNode;
+  onConfirm?: (e: React.MouseEvent) => void;
+  onCancel?: (e: React.MouseEvent) => void;
+  confirmButtonText?: string;
+  cancelButtonText?: string;
+  isPending?: boolean;
 };
 
-
 export const ButtonWithConfirm = (props: ButtonWithConfirmProps) => {
-    const [isConfirming, setIsConfirming] = useState(false);
+  const [isConfirming, setIsConfirming] = useState(false);
 
-    return (
-        <Popover open={isConfirming} onOpenChange={!props.button.main.disabled ? setIsConfirming : undefined}>
-            <Tooltip>
-                <TooltipTrigger asChild>
-                    <PopoverTrigger asChild>
-                        <span
-                            className={cn(
-                                "inline-flex",
-                                props.button.main.disabled ? "cursor-not-allowed" : ""
-                            )}
-                            role="button">
-                          <Button
-                              type={props.button.main.type}
-                              disabled={!!props.button.main.disabled}
-                              variant={props.button.main.variant ?? "default"}
-                              size={props.button.main.size ?? "default"}
-                              className={props.button.main.className}
-                              onClick={() => {
-                                  if (!props.button.main.disabled) setIsConfirming(true);
-                              }}
-                          >
-                              {props.isPending && <Loader2 className="animate-spin mr-4" size={16}/>}
-                              {props.button.main.icon}
-                              {props.button.main.text && <span>{props.button.main.text}</span>}
-                          </Button>
-                        </span>
-                    </PopoverTrigger>
-                </TooltipTrigger>
-                {props.button.main.tooltipText && props.button.main.disabled && (
-                    <TooltipContent>
-                        <p>{props.button.main.tooltipText}</p>
-                    </TooltipContent>
-                )}
-            </Tooltip>
-            <PopoverContent className="w-80">
-                <div className="grid gap-4">
-                    <div className="space-y-2">
-                        <h4 className="font-medium leading-none">{props.title}</h4>
-                        <p className="text-sm text-muted-foreground">{props.description}</p>
-                    </div>
-                    <div className="grid gap-2">
-                        <Button
-                            onClick={() => {
-                                if (isConfirming && props.button.confirm.onClick) {
-                                    props.button.confirm.onClick();
-                                    setIsConfirming(false);
-                                } else {
-                                    setIsConfirming(true);
-                                }
-                            }}
-                            variant={props.button.confirm.variant ? props.button.confirm.variant : "default"}
-                            size={props.button.main.size ?? "default"}
-                            className={cn(props.button.main.className, "w-full")}
-                        >
-                            {props.isPending && <Loader2 className="animate-spin mr-4" size={16}/>}
-                            {props.button.confirm.icon ? props.button.confirm.icon : null}
-                            <span>{props.button.confirm.text}</span>
-                        </Button>
-                        <Button
-                            variant={props.button.cancel.variant ? props.button.cancel.variant : "default"}
-                            onClick={props.button.cancel.onClick ? () => props.button.cancel.onClick!() : () => setIsConfirming(false)}
-                            className={cn(props.button.main.className, "w-full")}
-                            size={props.button.main.size ?? "default"}
-                        >
-                            Cancel
-                        </Button>
-                    </div>
-                </div>
-            </PopoverContent>
-        </Popover>
+  const isLegacy = !!props.button;
+  const isDisabled = isLegacy ? !!props.button?.main.disabled : false;
+
+  const handleConfirm = (e: React.MouseEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (isLegacy) {
+      props.button?.confirm.onClick?.();
+    } else {
+      props.onConfirm?.(e);
+    }
+    setIsConfirming(false);
+  };
+
+  const handleCancel = (e: React.MouseEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (isLegacy) {
+      props.button?.cancel.onClick?.();
+    } else {
+      props.onCancel?.(e);
+    }
+    setIsConfirming(false);
+  };
+
+  const triggerContent = isLegacy ? (
+    <Button
+      type={props.button?.main.type}
+      disabled={isDisabled}
+      variant={props.button?.main.variant ?? "default"}
+      size={props.button?.main.size ?? "default"}
+      className={props.button?.main.className}
+      onClick={(e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        if (!isDisabled) setIsConfirming(true);
+      }}
+    >
+      {props.isPending && <Loader2 className="animate-spin mr-4" size={16} />}
+      {props.button?.main.icon}
+      {props.button?.main.text && <span>{props.button.main.text}</span>}
+    </Button>
+  ) : (
+    <div
+      onClick={(e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        setIsConfirming(true);
+      }}
+    >
+      {props.children}
+    </div>
+  );
+
+  const withTooltip =
+    isLegacy && props.button?.main.tooltipText && isDisabled ? (
+      <TooltipProvider>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <div>{triggerContent}</div>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>{props.button?.main.tooltipText}</p>
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
+    ) : (
+      triggerContent
     );
-};
 
+  return (
+    <Popover open={isConfirming} onOpenChange={setIsConfirming}>
+      <PopoverTrigger asChild>{withTooltip}</PopoverTrigger>
+      <PopoverContent
+        className="w-80"
+        onPointerDownOutside={(e) => e.preventDefault()}
+        onInteractOutside={(e) => e.preventDefault()}
+        onClick={(e) => e.stopPropagation()}
+        onMouseMove={(e) => e.stopPropagation()}
+        onMouseEnter={(e) => e.stopPropagation()}
+        onMouseLeave={(e) => e.stopPropagation()}
+        onOpenAutoFocus={(e) => e.preventDefault()}
+      >
+        <div className="grid gap-4">
+          <div className="space-y-2">
+            <h4 className="font-medium leading-none">{props.title}</h4>
+            <p className="text-sm text-muted-foreground">{props.description}</p>
+          </div>
+          <div className="grid gap-2">
+            <Button
+              onClick={handleConfirm}
+              variant={
+                isLegacy
+                  ? (props.button?.confirm.variant ?? "default")
+                  : "default"
+              }
+              size={
+                isLegacy ? (props.button?.confirm.size ?? "default") : "default"
+              }
+              className={cn(
+                isLegacy ? props.button?.confirm.className : "",
+                "w-full",
+              )}
+            >
+              {props.isPending && (
+                <Loader2 className="animate-spin mr-4" size={16} />
+              )}
+              {isLegacy && props.button?.confirm.icon}
+              <span>
+                {isLegacy
+                  ? props.button?.confirm.text
+                  : (props.confirmButtonText ?? "Confirm")}
+              </span>
+            </Button>
+            <Button
+              variant={
+                isLegacy
+                  ? (props.button?.cancel.variant ?? "outline")
+                  : "outline"
+              }
+              onClick={handleCancel}
+              className={cn(
+                isLegacy ? props.button?.cancel.className : "",
+                "w-full",
+              )}
+              size={
+                isLegacy ? (props.button?.cancel.size ?? "default") : "default"
+              }
+            >
+              {isLegacy
+                ? (props.button?.cancel.text ?? "Cancel")
+                : (props.cancelButtonText ?? "Cancel")}
+            </Button>
+          </div>
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+};

src/components/wrappers/common/button/button-with-loading.tsx

@@ -83,7 +83,7 @@ export type ButtonWithLoadingProps = {
     icon?: ReactNode;
     variant?: keyof VariantButton;
     className?: string;
-    onClick?: () => void;
+    onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
     isPending?: boolean;
     size?: keyof SizeButton;
 } & ButtonHTMLAttributes<HTMLButtonElement>;
@@ -100,7 +100,7 @@ export const ButtonWithLoading = ({
                                   }: ButtonWithLoadingProps) => {
     return (
         <Button
-            onClick={() => onClick?.()}
+            onClick={(e) => onClick?.(e)}
             variant={variant}
             className={className}
             size={size}

src/components/wrappers/common/button/copy-button.tsx

@@ -26,7 +26,6 @@ export const CopyButton = (props: CopyButtonProps) => {
 
     return (
         <Button
-            // className={cn(buttonVariants({size: "sm"}))}
             onClick={() => {
                 copyToClipboardWithMeta(value);
                 setHasCopied(true);

src/components/wrappers/common/code-snippet.tsx

@@ -1,21 +1,46 @@
-import { PropsWithChildren } from "react";
-import { Button } from "@/components/ui/button";
+"use client";
+
+import {PropsWithChildren, useState} from "react";
+import {Button} from "@/components/ui/button";
+import {Check, Copy, Terminal} from "lucide-react";
+import {copyToClipboardWithMeta} from "@/components/wrappers/common/button/copy-button";
+import {cn} from "@/lib/utils";
 
 export type CodeSnippetProps = PropsWithChildren<{
     code: string;
+    title?: string;
+    className?: string;
 }>;
 
 export const CodeSnippet = (props: CodeSnippetProps) => {
+    const [isCopied, setIsCopied] = useState(false);
+
+    const handleCopy = async () => {
+        await copyToClipboardWithMeta(props.code);
+        setIsCopied(true);
+        setTimeout(() => setIsCopied(false), 2000);
+    };
+
     return (
-        <div className="rounded-lg border bg-background">
-            <div className="flex items-center justify-between border-b bg-muted px-4 py-2">
-                <div className="text-sm font-medium">.env</div>
-                <Button variant="ghost" size="icon" className="hover:bg-muted/50 text-muted-foreground"></Button>
-            </div>
-            <div className="p-4 font-mono text-sm leading-6 text-foreground truncate">
-                <pre className="language-javascript overflow-x-auto">
-                    <code className="mb-6">{props.code}</code>
+        <div className={cn("relative group rounded-md bg-muted/50 border overflow-hidden", props.className)}>
+            {props.title && (
+                <div className="flex items-center px-4 py-2 text-xs font-medium text-muted-foreground border-b bg-muted/30">
+                    {props.title}
+                </div>
+            )}
+            <div className="flex items-center p-4">
+                 <pre className="flex-1 overflow-x-auto font-mono text-sm leading-relaxed">
+                    <code className="break-all whitespace-pre-wrap">{props.code}</code>
                 </pre>
+                <Button
+                    variant="ghost"
+                    size="icon"
+                    className="ml-2 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground opacity-100 sm:opacity-0 sm:group-hover:opacity-100 transition-opacity"
+                    onClick={handleCopy}
+                >
+                    {isCopied ? <Check size={14} className="text-green-500" /> : <Copy size={14} />}
+                    <span className="sr-only">Copy code</span>
+                </Button>
             </div>
         </div>
     );

src/components/wrappers/common/dialog.tsx

@@ -23,7 +23,7 @@ export const AgentRegistrationDialog = (props: agentRegistrationDialogProps) =>
                 <div className="grid gap-4 py-4">
                     <div className="grid grid-cols-4 items-center gap-4">
                         <Label htmlFor="name" className="text-right">
-                            EDGE KEY
+                            CONNECTION KEY
                         </Label>
                         <Input id="name" value="Pedro Duarte" readOnly className="col-span-3" />
                     </div>

src/components/wrappers/common/error-layout.tsx

@@ -0,0 +1,94 @@
+"use client";
+
+import { useSearchParams } from "next/navigation";
+import type React from "react";
+import { useEffect } from "react";
+import { toast } from "sonner";
+export const ErrorLayout = ({ children }: { children: React.ReactNode }) => {
+  const url = useSearchParams();
+
+  useEffect(() => {
+    const error = url.get("error");
+
+    if (!error) return;
+
+    const errorMessages: Record<string, string> = {
+      pending: "Your account is not active.",
+      invalid_or_expired_token: "Password reset invalid token.",
+      account_already_linked_to_different_user:
+        "An account already exists with the same email address but different sign-in credentials. Sign in using a provider associated with this email address.",
+      USER_NOT_FOUND: "User not found",
+      FAILED_TO_CREATE_USER: "Failed to create user",
+      FAILED_TO_CREATE_SESSION: "Failed to create session",
+      FAILED_TO_UPDATE_USER: "Failed to update user",
+      FAILED_TO_GET_SESSION: "Failed to get session",
+      INVALID_PASSWORD: "Invalid password",
+      INVALID_EMAIL: "Invalid email",
+      INVALID_EMAIL_OR_PASSWORD: "Invalid email or password",
+      INVALID_USER: "Invalid user",
+      SOCIAL_ACCOUNT_ALREADY_LINKED: "Social account already linked",
+      PROVIDER_NOT_FOUND: "Provider not found",
+      INVALID_TOKEN: "Invalid token",
+      TOKEN_EXPIRED: "Token expired",
+      ID_TOKEN_NOT_SUPPORTED: "id_token not supported",
+      FAILED_TO_GET_USER_INFO: "Failed to get user info",
+      USER_EMAIL_NOT_FOUND: "User email not found",
+      EMAIL_NOT_VERIFIED: "Email not verified",
+      PASSWORD_TOO_SHORT: "Password too short",
+      PASSWORD_TOO_LONG: "Password too long",
+      USER_ALREADY_EXISTS: "User already exists.",
+      USER_ALREADY_EXISTS_USE_ANOTHER_EMAIL:
+        "User already exists. Use another email.",
+      EMAIL_CAN_NOT_BE_UPDATED: "Email can not be updated",
+      CREDENTIAL_ACCOUNT_NOT_FOUND: "Credential account not found",
+      SESSION_EXPIRED:
+        "Session expired. Re-authenticate to perform this action.",
+      FAILED_TO_UNLINK_LAST_ACCOUNT: "You can't unlink your last account",
+      ACCOUNT_NOT_FOUND: "Account not found",
+      USER_ALREADY_HAS_PASSWORD:
+        "User already has a password. Provide that to delete the account.",
+      CROSS_SITE_NAVIGATION_LOGIN_BLOCKED:
+        "Cross-site navigation login blocked. This request appears to be a CSRF attack.",
+      VERIFICATION_EMAIL_NOT_ENABLED: "Verification email isn't enabled",
+      EMAIL_ALREADY_VERIFIED: "Email is already verified",
+      EMAIL_MISMATCH: "Email mismatch",
+      SESSION_NOT_FRESH: "Session is not fresh",
+      LINKED_ACCOUNT_ALREADY_EXISTS: "Linked account already exists",
+      INVALID_ORIGIN: "Invalid origin",
+      INVALID_CALLBACK_URL: "Invalid callbackURL",
+      INVALID_REDIRECT_URL: "Invalid redirectURL",
+      INVALID_ERROR_CALLBACK_URL: "Invalid errorCallbackURL",
+      INVALID_NEW_USER_CALLBACK_URL: "Invalid newUserCallbackURL",
+      MISSING_OR_NULL_ORIGIN: "Missing or null Origin",
+      CALLBACK_URL_REQUIRED: "callbackURL is required",
+      FAILED_TO_CREATE_VERIFICATION: "Unable to create verification",
+      FIELD_NOT_ALLOWED: "Field not allowed to be set",
+      ASYNC_VALIDATION_NOT_SUPPORTED: "Async validation is not supported",
+      VALIDATION_ERROR: "Validation Error",
+      MISSING_FIELD: "Field is required",
+      METHOD_NOT_ALLOWED_DEFER_SESSION_REQUIRED:
+        "POST method requires deferSessionRefresh to be enabled in session config",
+      BODY_MUST_BE_AN_OBJECT: "Body must be an object",
+      PASSWORD_ALREADY_SET: "User already has a password set",
+      Sign_up_is_disabled: "Sign up is disabled by the administrator",
+    };
+
+    const match = Object.entries(errorMessages).find(([key]) =>
+      error.includes(key),
+    );
+
+    if (!match) return;
+
+    toast.error(match[1]);
+
+    const params = new URLSearchParams(url.toString());
+    params.delete("error");
+    const newUrl =
+      window.location.pathname +
+      (params.toString() ? `?${params.toString()}` : "");
+
+    window.history.replaceState({}, document.title, newUrl);
+  }, [url]);
+
+  return <>{children}</>;
+};

src/components/wrappers/common/github/github-button.tsx

@@ -34,7 +34,7 @@ export const GitHubStarsButtonCustom = () => {
             <GithubButton
                 initialStars={0}
                 targetStars={stars}
-                label="Github Stars"
+                label=""
                 size="sm"
                 separator={true}
                 roundStars={true}

src/components/wrappers/common/pagination/pagination-navigation.tsx

@@ -15,6 +15,8 @@ export type paginationNavigationProps = {
 export const PaginationNavigation = (props: paginationNavigationProps) => {
     const { className, totalPages, currentPage, goToPage, goToPrevPage, goToNextPage, maxVisiblePages = 3 } = props;
 
+    if (totalPages <= 1) return null;
+
     return (
         <Pagination className={cn("", className)}>
             <PaginationContent>

src/components/wrappers/common/table/data-table.tsx

@@ -14,7 +14,7 @@ import {
 import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
 import {Input} from "@/components/ui/input";
 
-import {ReactNode, useEffect, useState} from "react";
+import {ReactNode, useMemo, useState} from "react";
 import {TablePagination} from "./table-pagination";
 import {Checkbox} from "@/components/ui/checkbox";
 import {Button} from "@/components/ui/button";
@@ -63,35 +63,38 @@ export function DataTable<TData, TValue>({
     const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
     const [rowSelection, setRowSelection] = useState({});
 
-    useEffect(() => {
-        setRowSelection({});
-    }, [data]);
-
-    if (enableSelect && data.length > 0) {
+    const finalColumns = useMemo(() => {
         const selectColumnExists = columns.some((column) => column.id === "select");
-
-        if (!selectColumnExists) {
-            columns.unshift({
-                id: "select",
-                header: ({table}) => (
-                    <Checkbox
-                        checked={table.getIsAllPageRowsSelected() || (table.getIsSomePageRowsSelected() && "indeterminate")}
-                        onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-                        aria-label="Select all"
-                    />
-                ),
-                cell: ({row}) => <Checkbox checked={row.getIsSelected()}
-                                           onCheckedChange={(value) => row.toggleSelected(!!value)}
-                                           aria-label="Select row"/>,
-                enableSorting: false,
-                enableHiding: false,
-            });
+        if (enableSelect && data.length > 0 && !selectColumnExists) {
+            return [
+                {
+                    id: "select",
+                    header: ({table}: {table: any}) => (
+                        <Checkbox
+                            checked={table.getIsAllPageRowsSelected() || (table.getIsSomePageRowsSelected() && "indeterminate")}
+                            onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
+                            aria-label="Select all"
+                        />
+                    ),
+                    cell: ({row}: {row: any}) => (
+                        <Checkbox
+                            checked={row.getIsSelected()}
+                            onCheckedChange={(value) => row.toggleSelected(!!value)}
+                            aria-label="Select row"
+                        />
+                    ),
+                    enableSorting: false,
+                    enableHiding: false,
+                },
+                ...columns,
+            ];
         }
-    }
+        return columns;
+    }, [columns, enableSelect, data.length]);
 
     const table = useReactTable({
         data,
-        columns,
+        columns: finalColumns,
         getCoreRowModel: getCoreRowModel(),
         getPaginationRowModel: getPaginationRowModel(),
         onSortingChange: setSorting,
@@ -99,6 +102,10 @@ export function DataTable<TData, TValue>({
         onColumnFiltersChange: setColumnFilters,
         getFilteredRowModel: getFilteredRowModel(),
         onRowSelectionChange: setRowSelection,
+        getRowId: (row: any) => row.id || row.uuid,
+        autoResetPageIndex: false,
+        autoResetExpanded: false,
+        enableRowSelection: true,
         state: {
             sorting,
             columnFilters,

src/components/wrappers/common/table/table-pagination.tsx

@@ -14,6 +14,10 @@ interface tablePaginationProps {
 export function TablePagination(props: tablePaginationProps) {
     const {className, table, maxVisiblePages = 3, pageSizeOptions = [10, 20, 30, 40, 50]} = props;
 
+    const totalPages = table.getPageCount();
+
+    if (totalPages <= 1) return null;
+
     return (
         <div
             className={cn("flex gap-x-4", className)}

src/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal.tsx

@@ -18,6 +18,7 @@ import {
     ChannelOrganisationForm
 } from "@/components/wrappers/dashboard/admin/channels/organization/channels-organization-form";
 
+
 type ChannelAddModalProps = {
     channel?: NotificationChannelWith | StorageChannelWith
     organization?: OrganizationWithMembers;

src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-form.schema.ts

@@ -1,26 +1,69 @@
 import {z} from "zod";
+import {SlackChannelConfigSchema} from "./providers/notifications/forms/slack.schema";
+import {SmtpChannelConfigSchema} from "./providers/notifications/forms/smtp.schema";
+import {DiscordChannelConfigSchema} from "./providers/notifications/forms/discord.schema";
+import {TelegramChannelConfigSchema} from "./providers/notifications/forms/telegram.schema";
+import {GotifyChannelConfigSchema} from "./providers/notifications/forms/gotify.schema";
+import {NtfyChannelConfigSchema} from "./providers/notifications/forms/ntfy.schema";
+import {WebhookChannelConfigSchema} from "./providers/notifications/forms/webhook.schema";
+import {S3ChannelConfigSchema} from "./providers/storages/forms/s3.schema";
+import {GoogleDriveChannelConfigSchema} from "./providers/storages/forms/google-drive.schema";
+import {LocalChannelConfigSchema} from "./providers/storages/forms/local.schema";
 
 
-export const ChannelFormSchema = z.object({
+const BaseChannelFormSchema = z.object({
     name: z
         .string()
         .min(5, "Name must be at least 5 characters long")
         .max(40, "Name must be at most 40 characters long"),
-    config: z.record(z.union([z.string(), z.number(), z.boolean(), z.null(), z.undefined()])).optional(),
     enabled: z.boolean().default(true),
 });
 
+export const NotificationChannelFormSchema = z.discriminatedUnion("provider", [
+    BaseChannelFormSchema.extend({
+        provider: z.literal("slack"),
+        config: SlackChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("smtp"),
+        config: SmtpChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("discord"),
+        config: DiscordChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("telegram"),
+        config: TelegramChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("gotify"),
+        config: GotifyChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("ntfy"),
+        config: NtfyChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("webhook"),
+        config: WebhookChannelConfigSchema,
+    }),
+]);
 
-export const NotificationChannelFormSchema = ChannelFormSchema.extend({
-    provider: z.enum(
-        ["slack", "smtp", "discord", "telegram", "gotify", "ntfy", "webhook"],
-        {required_error: "Provider is required"}
-    ),
-});
-
-export const StorageChannelFormSchema = ChannelFormSchema.extend({
-    provider: z.enum(["local", "s3", "google-drive"], {required_error: "Provider is required"}),
-});
+export const StorageChannelFormSchema = z.discriminatedUnion("provider", [
+    BaseChannelFormSchema.extend({
+        provider: z.literal("s3"),
+        config: S3ChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("google-drive"),
+        config: GoogleDriveChannelConfigSchema,
+    }),
+    BaseChannelFormSchema.extend({
+        provider: z.literal("local"),
+        config: LocalChannelConfigSchema
+    })
+]);
 
 
 export type NotificationChannelFormType = z.infer<typeof NotificationChannelFormSchema>;

src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-form.tsx

@@ -34,6 +34,7 @@ import {
     addNotificationChannelAction, updateNotificationChannelAction
 } from "@/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/action";
 
+
 type NotifierFormProps = {
     onSuccessAction?: () => void;
     organization?: OrganizationWithMembers;
@@ -54,7 +55,7 @@ export const ChannelForm = ({onSuccessAction, organization, defaultValues, kind}
     });
 
     useEffect(() => {
-        form.reset(defaultValues ? {...defaultValues} : {});
+        form.reset(defaultValues ? {...defaultValues} : {enabled: true});
     }, [defaultValues]);
 
     const mutationAddNotificationChannel = useMutation({
@@ -118,7 +119,7 @@ export const ChannelForm = ({onSuccessAction, organization, defaultValues, kind}
                             }}
                         >
 
-                        {type.preview && (
+                            {type.preview && (
                                 <div
                                     className="absolute bottom-0 right-0 overflow-hidden w-20 h-20 pointer-events-none">
                                     <div
@@ -223,11 +224,11 @@ export const ChannelForm = ({onSuccessAction, organization, defaultValues, kind}
 
             <div className="flex justify-between mt-4">
                 <div>
-                    {defaultValues && (
+                    {(!isCreate || kind == "storage") && (
                         <ChannelTestButton
                             kind={kind}
                             organizationId={organization?.id}
-                            channel={defaultValues}
+                            channel={form.getValues()}
                         />
                     )}
                 </div>

src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-test-button.tsx

@@ -1,18 +1,21 @@
 "use client"
-import {Button} from "@/components/ui/button";
-import {NotificationChannel} from "@/db/schema/09_notification-channel";
+
 import {useMutation} from "@tanstack/react-query";
-import {dispatchNotification} from "@/features/notifications/dispatch";
-import {EventPayload} from "@/features/notifications/types";
 import {Send, ShieldCheck} from "lucide-react";
 import {toast} from "sonner";
+
+import {Button} from "@/components/ui/button";
+import {NotificationChannel} from "@/db/schema/09_notification-channel";
+import {dispatchNotification} from "@/features/notifications/dispatch";
+import {EventPayload} from "@/features/notifications/types";
 import {useIsMobile} from "@/hooks/use-mobile";
 import {cn} from "@/lib/utils";
 import {StorageChannel} from "@/db/schema/12_storage-channel";
-import {ChannelKind, getChannelTextBasedOnKind} from "@/components/wrappers/dashboard/admin/channels/helpers/common";
+import {ChannelKind} from "@/components/wrappers/dashboard/admin/channels/helpers/common";
 import type {StorageInput} from "@/features/storages/types";
 import {dispatchStorage} from "@/features/storages/dispatch";
 
+
 type NotifierTestChannelButtonProps = {
     channel: NotificationChannel | StorageChannel;
     organizationId?: string;
@@ -20,8 +23,9 @@ type NotifierTestChannelButtonProps = {
 }
 
 export const ChannelTestButton = ({channel, organizationId, kind}: NotifierTestChannelButtonProps) => {
-    const channelText = getChannelTextBasedOnKind(kind)
+
     const isMobile = useIsMobile()
+
     const mutation = useMutation({
         mutationFn: async () => {
             if (kind === "notification") {
@@ -41,13 +45,14 @@ export const ChannelTestButton = ({channel, organizationId, kind}: NotifierTestC
                 const input: StorageInput = {
                     action: "ping",
                 };
-                const result = await dispatchStorage(input, undefined, channel.id);
+                const result = await dispatchStorage(input, undefined, undefined, channel);
 
                 if (result.success) {
                     toast.success("Successfully connected to storage channel");
                 } else {
                     console.error(result);
-                    toast.error("An error occurred while testing the storage channel, check your configuration");
+                    const responseText = result.response ? `(${result.response})` : "";
+                    toast.error(`An error occurred while testing the storage channel, check your configuration ${responseText}`);
                 }
             } else {
                 toast.error("Not yet supported");

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/discord.schema.ts

@@ -0,0 +1,5 @@
+import {z} from "zod";
+
+export const DiscordChannelConfigSchema = z.object({
+    discordWebhook: z.string().url("Must be a valid URL"),
+});

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/gotify.schema.ts

@@ -0,0 +1,6 @@
+import {z} from "zod";
+
+export const GotifyChannelConfigSchema = z.object({
+    gotifyServerUrl: z.string().url("Must be a valid URL"),
+    gotifyAppToken: z.string().min(1, "App token is required"),
+});

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/ntfy.form.tsx

@@ -2,6 +2,7 @@ import {UseFormReturn} from "react-hook-form";
 import {FormControl, FormField, FormItem, FormLabel, FormMessage} from "@/components/ui/form";
 import {Input} from "@/components/ui/input";
 import {Separator} from "@/components/ui/separator";
+import {PasswordInput} from "@/components/ui/password-input";
 
 type NotifierNtfyFormProps = {
     form: UseFormReturn<any, any, any>
@@ -79,7 +80,7 @@ export const NotifierNtfyForm = ({form}: NotifierNtfyFormProps) => {
                     <FormItem>
                         <FormLabel>Basic Auth Password (Optional)</FormLabel>
                         <FormControl>
-                            <Input {...field} type="password" placeholder="password"/>
+                            <PasswordInput placeholder="password" {...field} />
                         </FormControl>
                         <FormMessage/>
                     </FormItem>

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/ntfy.schema.ts

@@ -0,0 +1,9 @@
+import {z} from "zod";
+
+export const NtfyChannelConfigSchema = z.object({
+    ntfyTopic: z.string().min(1, "Topic is required"),
+    ntfyServerUrl: z.string().url("Must be a valid URL").optional().or(z.literal('')),
+    ntfyToken: z.string().optional(),
+    ntfyUsername: z.string().optional(),
+    ntfyPassword: z.string().optional(),
+});

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/slack.schema.ts

@@ -0,0 +1,5 @@
+import {z} from "zod";
+
+export const SlackChannelConfigSchema = z.object({
+    slackWebhook: z.string().url("Must be a valid URL"),
+});

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/smtp.form.tsx

@@ -47,7 +47,7 @@ export const NotifierSmtpForm = ({form}: NotifierSmtpFormProps) => {
                     <FormItem>
                         <FormLabel>Username</FormLabel>
                         <FormControl>
-                            <Input placeholder="contact@exemple.com" {...field} value={field.value ?? ""}/>
+                            <Input placeholder="contact@example.com" {...field} value={field.value ?? ""}/>
                         </FormControl>
                         <FormMessage/>
                     </FormItem>
@@ -77,7 +77,7 @@ export const NotifierSmtpForm = ({form}: NotifierSmtpFormProps) => {
                     <FormItem>
                         <FormLabel>From Email</FormLabel>
                         <FormControl>
-                            <Input placeholder={`"Portabase" <exemple@portabase.io>`} {...field}
+                            <Input placeholder={`"Portabase" <example@portabase.io>`} {...field}
                                    value={field.value ?? ""}/>
                         </FormControl>
                         <FormMessage/>

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/smtp.schema.ts

@@ -0,0 +1,10 @@
+import {z} from "zod";
+
+export const SmtpChannelConfigSchema = z.object({
+    host: z.string().min(1, "Host is required"),
+    port: z.coerce.number().min(1, "Port is required"),
+    user: z.string().min(1, "User is required"),
+    password: z.string().min(1, "Password is required"),
+    from: z.string().min(1, "From is required"),
+    to: z.string().min(1, "To is required"),
+});

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/telegram.form.tsx

@@ -43,6 +43,22 @@ export const NotifierTelegramForm = ({form}: NotifierTelegramFormProps) => {
                     </FormItem>
                 )}
             />
+            <FormField
+                control={form.control}
+                name="config.telegramTopicId"
+                render={({field}) => (
+                    <FormItem>
+                        <FormLabel>Telegram Topic ID</FormLabel>
+                        <FormControl>
+                            <Input {...field} placeholder="123456"/>
+                        </FormControl>
+                        <p className="text-xs text-muted-foreground">
+                           Unique identifier for the target message thread (topic) of the forum; for forum supergroups only
+                        </p>
+                        <FormMessage/>
+                    </FormItem>
+                )}
+            />
         </>
     )
 }

src/components/wrappers/dashboard/admin/channels/channel/channel-form/providers/notifications/forms/telegram.schema.ts

@@ -0,0 +1,20 @@
+import { z } from "zod";
+
+export const TelegramChannelConfigSchema = z
+  .object({
+    telegramBotToken: z.string().min(1, "Bot token is required"),
+    telegramChatId: z.string().min(1, "Chat ID is required"),
+    telegramTopicId: z.string().optional(),
+  })
+  .refine(
+    (data) => {
+      if (data.telegramTopicId && !data.telegramChatId) {
+        return false;
+      }
+      return true;
+    },
+    {
+      message: "Chat ID is required when a Topic ID is provided",
+      path: ["telegramChatId"],
+    },
+  );