chore: release 1.9.4

* fix: release.yml

* fix: S3ChannelConfigSchema type port mismatch

* chore: package.json

* fix: refactoring logs and adding pino logger for production and dev.

---------

Co-authored-by: charlesgauthereau <charles.gauthereau@soluce-technologies.com>
Co-authored-by: killianlarcher <killian.larcher@soluce-technologies.com>

.env.example

@@ -1,37 +1,60 @@
-# Environnement
+# Environment
-NODE_ENV=production
+NODE_ENV=development
 
-# Base de données
+# Database
-DATABASE_URL=postgresql://devuser:changeme@db:5432/devdb?schema=public
+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
-PROJECT_URL=http://app.portabase.io
 PROJECT_SECRET=
 
 # SMTP (email)
 SMTP_HOST=
-SMTP_PORT=587
+SMTP_PORT=
 SMTP_USER=
 SMTP_PASSWORD=
 SMTP_FROM=
+#SMTP_SECURE="true"
+#Port 587 -> secure: false
+#Port 465 -> secure: true
+#By default : true
 
-# Google
+# OIDC SSO Authentification
-AUTH_GOOGLE_ID=
+AUTH_OIDC_ID=""
-AUTH_GOOGLE_SECRET=
+AUTH_OIDC_TITLE=""
-AUTH_GOOGLE_METHOD=
+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=""
 
-# S3
+AUTH_ALLOW_LINKING=true
-S3_ENDPOINT=http://app.s3.portabase.io
+AUTH_ALLOW_UNLINKING=true
-S3_ACCESS_KEY=
-S3_SECRET_KEY=
-S3_BUCKET_NAME=portabase
-S3_PORT=9000
-S3_USE_SSL=true
 
-# Storage Type (s3, local)
+
-STORAGE_TYPE=local
+# 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/CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-contact@soluce-technologies.com.
+contact@portabase.io.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

.github/CONTRIBUTING.md

@@ -72,7 +72,7 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 3. **Push your branch**
    ```bash
-   git push origin feature/<feature-name>
+   git push origin feat/<feature-name>
    ```
 
 4. **Open a Pull Request (PR)**  
@@ -82,7 +82,7 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 ## Code Style Guidelines
 
-- Follow the [specific coding style guide] (e.g., Prettier, ESLint, PEP8).
+- Follow the [specific coding style guide] (e.g., Prettier, ESLint, PEP8,Biome).
 - Use meaningful variable names and include comments where necessary.
 - Tests before submitting your changes.
 

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: portabase
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/SECURITY.md

@@ -18,7 +18,7 @@ We take security seriously and aim to support the following versions of the proj
 If you discover a security vulnerability in this project, we appreciate your help in disclosing it responsibly.
 
 1. **Contact Us**  
-   Please report the vulnerability by emailing **[contact@soluce-technologies.com](mailto:contact@soluce-technologies.com)**. Include the following details:
+   Please report the vulnerability by emailing **[contact@portabase.io](mailto:contact@portabase.io)**. Include the following details:
     - A detailed description of the issue.
     - Steps to reproduce the vulnerability (if applicable).
     - Any potential impacts or risks.

.github/workflows/discord.yml

@@ -0,0 +1,73 @@
+name: Discord Notification
+
+on:
+  workflow_call:
+    inputs:
+      release_tag:
+        required: true
+        type: string
+      discord_title:
+        required: true
+        type: string
+      discord_color:
+        required: true
+        type: number
+      discord_footer:
+        required: true
+        type: string
+    secrets:
+      DISCORD_WEBHOOK:
+        required: true
+      GH_TOKEN:
+        required: true
+
+jobs:
+  notify-discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Discord Notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: |
+          RELEASE_INFO=$(gh release view "${{ inputs.release_tag }}" -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="${{ inputs.release_tag }}"; 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"
+
+          PAYLOAD=$(jq -n \
+            --arg title "$RELEASE_TITLE" \
+            --arg description "$RELEASE_BODY" \
+            --arg url "$RELEASE_URL" \
+            --arg author "$AUTHOR_NAME" \
+            --arg icon "$AUTHOR_ICON" \
+            --arg discord_title "${{ inputs.discord_title }}" \
+            --arg discord_footer "${{ inputs.discord_footer }}" \
+            --argjson discord_color ${{ inputs.discord_color }} \
+            '{
+              content: $discord_title,
+              embeds: [{
+                title: $title,
+                url: $url,
+                description: $description,
+                color: $discord_color,
+                author: {
+                  name: $author,
+                  icon_url: $icon
+                },
+                footer: {
+                  text: $discord_footer
+                }
+              }]
+            }'
+          )
+
+          curl -H "Content-Type: application/json" \
+               -d "$PAYLOAD" \
+               "$DISCORD_WEBHOOK"

.github/workflows/docker.yml

@@ -3,10 +3,16 @@ name: Docker Publish
 on:
   workflow_call:
     inputs:
+      version:
+        required: true
+        type: string
+      ref:
+        required: true
+        type: string
       image_name:
         required: false
         type: string
-        default: 'solucetechnologies/portabase'
+        default: "portabase/portabase"
       add_latest:
         required: false
         type: boolean
@@ -14,11 +20,11 @@ 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
@@ -26,38 +32,111 @@ on:
         required: true
 
 jobs:
-  build-and-push:
+  build:
-    runs-on: ubuntu-latest
+    name: Build architectures
-    permissions:
+    runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'ubuntu-24.04-arm' }}
-      packages: write
+    strategy:
-      contents: read
+      fail-fast: false
+      matrix:
+        platform: [ linux/amd64, linux/arm64 ]
     steps:
-      - name: Check out the repo
+      - name: Checkout
         uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.ref }}
           fetch-depth: 0
 
-      - name: Log in to Docker Hub
+      - name: Set up Docker Buildx
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Set tags
+      - name: Prepare Image Tags
-        id: set-tags
+        id: prep
         run: |
-          REF_NAME=${GITHUB_REF#refs/tags/}
+          ARCH=${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
-          TAGS="${{ inputs.image_name }}:$REF_NAME"
+          echo "image=${{ inputs.image_name }}:${{inputs.version}}-$ARCH" >> $GITHUB_OUTPUT
-          if [[ "${{ inputs.add_latest }}" == "true" ]]; then
+          echo "safe_platform=${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}" >> $GITHUB_OUTPUT
-            TAGS="$TAGS,${{ inputs.image_name }}:latest"
-          fi
-          echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
-      - name: Build and push Docker image
+
+      - name: Build and push image
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ${{ inputs.dockerfile }}
+          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: Save image name for manifest
+        run: echo "${{ steps.prep.outputs.image }}" > image.txt
+
+      - uses: actions/upload-artifact@v4
+        with:
+          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: Generate semantic tags
+        id: tags
+        run: |
+          VERSION="${{ inputs.version }}"
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION"
+          
+          echo "VERSION_TAG=$VERSION" >> $GITHUB_OUTPUT
+          if [ -n "$MINOR" ]; then
+            echo "MINOR_TAG=$MAJOR.$MINOR" >> $GITHUB_OUTPUT
+          fi
+          if [ -n "$MAJOR" ]; then
+            echo "MAJOR_TAG=$MAJOR" >> $GITHUB_OUTPUT
+          fi
+          if [ "${{ inputs.add_latest }}" = "true" ]; then
+            echo "LATEST_TAG=latest" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ inputs.image_name }}
+          tags: |
+            type=raw,value=${{ steps.tags.outputs.VERSION_TAG }}
+            type=raw,value=${{ steps.tags.outputs.MINOR_TAG }}
+            type=raw,value=${{ steps.tags.outputs.MAJOR_TAG }}
+            type=raw,value=${{ steps.tags.outputs.LATEST_TAG }}
+
+      - 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")
+          echo $TAG_ARGS
+          docker buildx imagetools create $TAG_ARGS $DOCKER_IMAGES

.github/workflows/e2e.yml

@@ -0,0 +1,77 @@
+name: End-to-end testing
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/dockerfile/Dockerfile
+          push: false
+          load: true
+          tags: portabase/portabase:test
+
+      - name: Run app container
+        run: |
+          docker run -d --name myapp \
+            -p 8887:80 \
+            -e NODE_ENV=production \
+            -e PROJECT_URL=http://localhost:8887 \
+            -e PROJECT_SECRET=80af5e4c875dfded3a6ba511c6ed8b0160cad723f848ee0851403ed6141f6ba1 \
+            portabase/portabase:test
+
+      - name: Wait for app port to be listening
+        run: |
+          for i in {1..40}; do
+          
+            if curl -fsS http://localhost:8887/ >/dev/null; then
+              echo "App is responding on port 8887"
+              exit 0
+            fi
+            echo "Waiting for app readiness... ($i/40)"
+            sleep 2
+          done
+          echo "Timeout: app never became ready"
+          docker logs myapp
+          exit 1
+
+      - name: Install Playwright browsers
+        run: pnpm exec playwright install --with-deps chromium firefox webkit
+
+      - name: Run Playwright tests
+        run: pnpm exec playwright test --project chromium
+        env:
+          PROJECT_URL: http://localhost:8887
+
+      - name: Upload report if failed
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 7
+
+      - name: Cleanup
+        if: always()
+        run: docker stop myapp && docker rm myapp || true

.github/workflows/github.yml

@@ -1,128 +0,0 @@
-name: GitHub Release
-
-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
-      discord_color:
-        required: true
-        type: number
-      discord_footer:
-        required: true
-        type: string
-    secrets:
-      DISCORD_WEBHOOK:
-        required: true
-      GH_TOKEN:
-        required: true
-
-jobs:
-  create-release:
-    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" 
-
-          PAYLOAD=$(jq -n \
-            --arg title "$RELEASE_TITLE" \
-            --arg description "$RELEASE_BODY" \
-            --arg url "$RELEASE_URL" \
-            --arg author "$AUTHOR_NAME" \
-            --arg icon "$AUTHOR_ICON" \
-            --arg discord_title "${{ inputs.discord_title }}" \
-            --arg discord_footer "${{ inputs.discord_footer }}" \
-            --argjson discord_color ${{ inputs.discord_color }} \
-            '{ 
-              content: $discord_title,
-              embeds: [{
-                title: $title,
-                url: $url,
-                description: $description,
-                color: $discord_color,
-                author: {
-                  name: $author,
-                  icon_url: $icon
-                },
-                footer: {
-                  text: $discord_footer
-                }
-              }]
-            }'
-          ) 
-          
-          curl -H "Content-Type: application/json" \
-               -d "$PAYLOAD" \
-               "$DISCORD_WEBHOOK"

.github/workflows/helm.yml

@@ -0,0 +1,37 @@
+name: Publish Helm Chart
+on:
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
+    secrets:
+      GH_TOKEN:
+        required: true
+
+jobs:
+  publish-helm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+
+      - name: Package Helm chart
+        run: |
+          mkdir -p ./helm-packages
+          helm package helm \
+            --version ${{ inputs.version }} \
+            --app-version ${{ inputs.version }} \
+            --destination ./helm-packages
+
+      - name: Authenticate to GitHub Packages
+        run: |
+          echo "${{ secrets.GH_TOKEN }}" | helm registry login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push Helm chart to GitHub Packages (OCI)
+        run: |
+          helm push ./helm-packages/portabase-${{ inputs.version }}.tgz oci://ghcr.io/portabase/charts

.github/workflows/release-candidate.yml

@@ -3,29 +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_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      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
+      discord_title: "New Release Candidate: ${{ github.ref_name }}"
-      make_latest: false
+      discord_color: 2044800
-      discord_title: "||@release-dashboard|| New release candidate published"
-      discord_color: 16776960
       discord_footer: "Portabase"
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/release.yml

@@ -1,32 +1,142 @@
-name: Publish Docker image for release
+name: Auto Release & Publish
 
 on:
-  push:
+  pull_request:
-    tags:
+    types: [ closed ]
-      - '*.*.*'
+    branches:
-      - '!*-*'
+      - main
 
 permissions:
   contents: write
   packages: write
 
 jobs:
-  docker_publish:
+
+  check-skip:
+    runs-on: ubuntu-latest
+    outputs:
+      skip: ${{ steps.set-skip.outputs.skip }}
+    steps:
+      - name: Determine if release should be skipped
+        id: set-skip
+        run: |
+          TITLE="${{ github.event.pull_request.title }}"
+          echo "PR title: $TITLE"
+
+          if [[ "$TITLE" == *"[skip-release]"* ]]; then
+            echo "PR title contains [skip-release], skipping release jobs."
+            echo "skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
+
+  create-release:
+    needs: check-skip
+    if: ${{ needs.check-skip.outputs.skip == 'false' }}
+    runs-on: ubuntu-latest
+    outputs:
+      draft_tag: ${{ steps.release_step.outputs.draft_tag }}
+      version: ${{ steps.release_step.outputs.version }}
+    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: main
+
+      - 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]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+
+      - name: Run release-it
+        id: release_step
+        run: |
+          git pull origin main
+          
+          VERSION=$(pnpm exec release-it --ci --release-version)
+          echo $VERSION
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          
+          OUTPUT=$(pnpm exec release-it --ci)
+          echo "$OUTPUT"
+          
+          DRAFT_TAG=$(echo "$OUTPUT" | grep -oE 'untagged-[a-z0-9]+')
+          echo $DRAFT_TAG
+          echo "draft_tag=$DRAFT_TAG" >> $GITHUB_OUTPUT
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+
+
+  publish-docker:
+    needs: create-release
+    if: ${{ needs.create-release.result == 'success' }}
     uses: ./.github/workflows/docker.yml
     with:
+      version: ${{ needs.create-release.outputs.version }}
+      ref: ${{ needs.create-release.outputs.version }}
       add_latest: true
     secrets:
-      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
 
-  github_release:
+  publish-helm:
-    needs: docker_publish
+    needs: create-release
-    uses: ./.github/workflows/github.yml
+    if: ${{ needs.create-release.result == 'success' }}
+    uses: ./.github/workflows/helm.yml
     with:
-      prerelease: false
+      version: ${{ needs.create-release.outputs.version }}
-      make_latest: true
+    secrets:
-      discord_title: "||@release-dashboard|| New release published"
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      discord_color: 5814783
+
+  finalize-release:
+    needs:
+      - create-release
+      - publish-docker
+      - publish-helm
+    runs-on: ubuntu-latest
+    outputs:
+      release_tag: ${{ steps.publish_release_step.outputs.release_tag }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Publish GitHub Release
+        id: publish_release_step
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          OUTPUT=$(gh release edit ${{ needs.create-release.outputs.draft_tag }} --draft=false)
+          echo "$OUTPUT"
+          RELEASE_TAG=$(echo "$OUTPUT" | sed -E 's|.*/releases/tag/||')
+          echo "release_tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
+
+  notify-discord:
+    needs:
+      - publish-docker
+      - publish-helm
+      - create-release
+      - finalize-release
+    uses: ./.github/workflows/discord.yml
+    with:
+      release_tag: ${{ needs.create-release.outputs.version }}
+      discord_title: "New Release"
+      discord_color: 3066993
       discord_footer: "Portabase"
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/security.yml

@@ -5,27 +5,27 @@ on:
     branches: [ main ]
 
 jobs:
-  sca-deps: # Dependency & container scan
+  sca-deps:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: aquasecurity/trivy-action@0.20.0
+      - uses: aquasecurity/trivy-action@0.35.0
         with:
           scan-type: 'fs'
           format: 'table'
           severity: 'CRITICAL,HIGH'
           ignore-unfixed: true
 
-
+  secrets-gitleaks:
-  secrets-gitleaks: # Secrets exposure
+    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

@@ -1,5 +1,6 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 .idea
+.vscode
 # dependencies
 /node_modules
 /.pnp
@@ -39,5 +40,17 @@ public/uploads/*
 !public/uploads/
 
 private/uploads/*
+private/keys/*
 
 /.env
+
+seeds/pocket-id/*.db
+
+certificates
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+/playwright/.auth/

.gitleaks.toml

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

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/portabase.iml" filepath="$PROJECT_DIR$/.idea/portabase.iml" />
-    </modules>
-  </component>
-</project>

.idea/portabase.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/backend" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/venv" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.release-it.json

@@ -0,0 +1,57 @@
+{
+  "github": {
+    "release": true,
+    "draft": true,
+    "tokenRef": "GITHUB_TOKEN"
+  },
+  "git": {
+    "commit": true,
+    "commitMessage": "chore: release ${version}",
+    "requireCleanWorkingDir": true,
+    "tag": true,
+    "tagName": "${version}",
+    "push": true
+  },
+  "plugins": {
+    "@release-it/conventional-changelog": {
+      "preset": {
+        "name": "conventionalcommits",
+        "types": [
+          {
+            "type": "feat",
+            "section": "✨ Features"
+          },
+          {
+            "type": "fix",
+            "section": "🐛 Bug Fixes"
+          },
+          {
+            "type": "perf",
+            "section": "⚡️ Performance Improvements"
+          },
+          {
+            "type": "revert",
+            "section": "⏪️ Reverts"
+          },
+          {
+            "type": "docs",
+            "section": "📝 Documentation",
+            "hidden": true
+          },
+          {
+            "type": "chore",
+            "section": "🔧 Chores",
+            "hidden": true
+          }
+        ]
+      }
+    },
+    "@release-it/bumper": {
+      "out": {
+        "file": "CITATION.cff",
+        "path": "version",
+        "type": "text/yaml"
+      }
+    }
+  }
+}

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "WillLuke.nextjs.hasPrompted": true
-}

CITATION.cff

@@ -1,6 +1,6 @@
 cff-version: 1.2.0
 title: Portabase
-message: "If you use this software, please cite it as below."
+message: If you use this software, please cite it as below.
 type: software
 authors:
   - family-names: Gauthereau
@@ -9,7 +9,12 @@ authors:
     given-names: Killian
 repository-code: https://github.com/Portabase/portabase
 url: https://portabase.io
-abstract: "Portabase is a free, open-source, self-hosted solution for database administration, providing backup and restore capabilities, scheduling, retention policies, notifications, and support for multiple storage backends. Its headless agent architecture enables connection to multiple database instances securely and efficiently."
+abstract: >-
+  Portabase is a free, open-source, self-hosted solution for database
+  administration, providing backup and restore capabilities, scheduling,
+  retention policies, notifications, and support for multiple storage backends.
+  Its headless agent architecture enables connection to multiple database
+  instances securely and efficiently.
 keywords:
   - docker
   - kubernetes
@@ -26,5 +31,5 @@ keywords:
   - web-ui
   - agent
 license: Apache-2.0
-version: 1.1.10-rc.2
+version: 1.9.4
-date-released: "2026-01-07"
+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

@@ -2,3 +2,47 @@ CLUSTER_SCRIPT=docker/entrypoints/app-dev-entrypoint.sh
 
 up:
 	@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,21 +7,25 @@
 <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>
 
 
 [![License: Apache](https://img.shields.io/badge/License-apache-yellow.svg)](LICENSE)
-[![Docker Pulls](https://img.shields.io/docker/pulls/solucetechnologies/portabase?color=brightgreen)](https://hub.docker.com/r/solucetechnologies/portabase)
+[![Docker Pulls](https://img.shields.io/docker/pulls/portabase/portabase?color=brightgreen)](https://hub.docker.com/r/portabase/portabase)
 [![Platform](https://img.shields.io/badge/platform-linux%20%7C%20macos%20%7C%20windows-lightgrey)](https://github.com/Portabase/portabase)
+[![Support Portabase](https://img.shields.io/badge/Support-Portabase-orange)](https://www.buymeacoffee.com/portabase)
 
 [![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/)
+[![Redis](https://img.shields.io/badge/Redis-DC382D?style=flat&logo=Redis&logoColor=white)](https://redis.io/)
+[![Valkey](https://img.shields.io/badge/Valkey-6284fc?style=flat&logo=Valkey&logoColor=white)](https://valkey.io/)
+[![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]
@@ -32,14 +36,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>
@@ -49,18 +53,33 @@
 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)
-- Kubernetes with Helm (soon)
+- Docker Compose setup - [details](https://portabase.io/docs/dashboard/setup#docker-compose)
+- Kubernetes with Helm [details](https://portabase.io/docs/dashboard/setup#helm)
 - Development setup - [details](https://portabase.io/docs/dashboard/setup#development)
 
 **Ensure Docker is installed on your machine before getting started.**
 
+## Supported databases
 
+| Engine             | Support   | Supported Versions                | Restore |
+|:-------------------|:----------|:----------------------------------|:--------|
+| **PostgreSQL**     | ✅ Stable  | 12, 13, 14, 15, 16, 17 et 18      | Yes     |
+| **MySQL**          | ✅ Stable  | 5.7, 8 et 9                       | Yes     |
+| **MariaDB**        | ✅ Stable  | 10 et 11                          | Yes     |
+| **MongoDB**        | ✅ Stable  | 4, 5, 6, 7 et 8                   | Yes     |
+| **SQLite**         | ✅ Stable  | 3.x                               | Yes     |
+| **Redis**          | ✅ Stable  | 2.8+                              | No      |
+| **Valkey**         | ✅ Stable  | 7.2+                              | No      |
+| **MSSQL Server**   | ❌ Ongoing | -                                 | Yes     |
+
+See the [Database Servers documentation](https://portabase.io/docs/agent/db) for version-specific backup and restore details.
 
 ## Contributors
 
 [![Contributors](https://contrib.rocks/image?repo=Portabase/portabase)](https://github.com/Portabase/portabase/graphs/contributors)
 
+[!["Support Portabase"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/portabase)
 
 ## License
 
@@ -86,4 +105,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

@@ -2,9 +2,14 @@ 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 { 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,8 +17,7 @@ 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
+                        <p className="text-balance text-muted-foreground">Enter your email address and we'll send you a link to reset your password.</p>
-                            link to reset your password.</p>
                     </div>
                 </CardHeader>
                 <CardContent>

app/(auth)/guard/page.tsx

@@ -8,7 +8,7 @@ import {CardAuth} from "@/features/layout/card-auth";
 export default async function GuardPage() {
 
     const cookieStore = await cookies();
-    const token = cookieStore.get("better-auth.two_factor")?.value;
+    const token = cookieStore.get("better-auth.two_factor")?.value || cookieStore.get("__Secure-better-auth.two_factor")?.value;
     
     if (!token) {
         redirect("/login");
@@ -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

@@ -2,9 +2,13 @@ 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 { Heart } from "lucide-react";
 
-export default async function Layout({children}: { children: React.ReactNode }) {
+export default async function Layout({
-
+  children,
+}: {
+  children: React.ReactNode;
+}) {
   const user = await currentUser();
 
   if (user && !user.banned && user.role !== "pending") {
@@ -12,14 +16,20 @@ export default async function Layout({children}: { children: React.ReactNode })
   }
 
   return (
-        <div className="flex min-h-full flex-1 flex-col justify-center py-12 sm:px-6 lg:px-8 ">
+    <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>{children}</div>
+          <div className="mt-4">{children}</div>
         </div>
-            <footer className="py-4 text-center text-xs justify-items-end text-muted-foreground">
+      </div>
-                Powered by <span className="font-medium">Soluce Technologies</span>
+      <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>
       </footer>
     </div>
-    )
+  );
 }

app/(auth)/login/page.tsx

@@ -1,52 +1,59 @@
 import { LoginForm } from "@/components/wrappers/auth/login/login-form/login-form";
 import { Metadata } from "next";
-import {SUPPORTED_PROVIDERS} from "../../../portabase.config";
+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 { env } from "@/env.mjs";
 
 export const metadata: Metadata = {
   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>
+            <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" && (
+            <LoginForm isPasskeyEnabled={env.AUTH_PASSKEY_ENABLED === "true"} />
+          )}
 
-                    {SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive).length > 0 && (
+          {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>
-                            <SocialAuthButtons providers={SUPPORTED_PROVIDERS}/>
-                        </>
             )}
 
+          {SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive).length >
+            0 && <SocialAuthButtons providers={SUPPORTED_PROVIDERS} />}
+
+          {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 { redirect } from "next/navigation";
+import { env } from "@/env.mjs";
 
 export const metadata: Metadata = {
   title: "Register",
 };
 
 export default async function RoutePage(props: PageParams<{}>) {
+  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/page.tsx

@@ -0,0 +1,52 @@
+import {PageParams} from "@/types/next";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {db} from "@/db";
+import {notFound} from "next/navigation";
+import {SettingsTabs} from "@/components/wrappers/dashboard/admin/settings/settings-tabs";
+import {desc, isNull} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {StorageChannelWith} from "@/db/schema/12_storage-channel";
+import {NotificationChannelWith} from "@/db/schema/09_notification-channel";
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const settings = await db.query.setting.findFirst({
+        where: (fields, {eq}) => eq(fields.name, "system"),
+    });
+
+    console.log(settings)
+
+    const storageChannels = await db.query.storageChannel.findMany({
+        with: {
+            organizations: true
+        },
+        where: isNull(drizzleDb.schemas.storageChannel.organizationId),
+        orderBy: desc(drizzleDb.schemas.storageChannel.createdAt)
+    }) as StorageChannelWith[]
+
+    const notificationChannels = await db.query.notificationChannel.findMany({
+        with: {
+            organizations: true
+        },
+        where: isNull(drizzleDb.schemas.notificationChannel.organizationId),
+        orderBy: desc(drizzleDb.schemas.notificationChannel.createdAt)
+    }) as NotificationChannelWith[]
+
+
+    if (!settings || !storageChannels || !notificationChannels ) {
+        notFound()
+    }
+
+    return (
+        <Page>
+            <PageHeader className="flex flex-col">
+                <div className="flex justify-between">
+                    <PageTitle className="mb-3">System settings</PageTitle>
+                </div>
+            </PageHeader>
+            <PageContent className="flex flex-col gap-5">
+                <SettingsTabs storageChannels={storageChannels} notificationChannels={notificationChannels} 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]/edit/page.tsx

@@ -1,32 +0,0 @@
-import { PageParams } from "@/types/next";
-import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { AgentForm } from "@/components/wrappers/dashboard/agent/agent-form/agent-form";
-import { notFound } from "next/navigation";
-import { db } from "@/db";
-
-export default async function RoutePage(
-    props: PageParams<{
-        agentId: string;
-    }>
-) {
-    const { agentId } = await props.params;
-
-    const agent = await db.query.agent.findFirst({
-        where: (fields, { eq }) => eq(fields.id, agentId),
-    });
-
-    if (!agent) {
-        notFound();
-    }
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Edit {agent.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <AgentForm defaultValues={agent} agentId={agent.id} />
-            </PageContent>
-        </Page>
-    );
-}

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

@@ -1,8 +1,10 @@
-import Link from "next/link";
-import {GearIcon} from "@radix-ui/react-icons";
 import { PageParams } from "@/types/next";
-import {Page, PageActions, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
+import {
-import {buttonVariants} from "@/components/ui/button";
+  Page,
+  PageContent,
+  PageDescription,
+  PageTitle,
+} from "@/features/layout/page";
 import { db } from "@/db";
 import * as drizzleDb from "@/db";
 import { eq } from "drizzle-orm";
@@ -12,20 +14,23 @@ 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
+      databases: true,
-        }
+    },
-    })
+  });
 
   if (!agent) {
-        notFound()
+    notFound();
   }
 
   const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
@@ -33,27 +38,32 @@ export default async function RoutePage(props: PageParams<{ agentId: string }>)
   return (
     <Page>
       <div className="justify-between gap-2 sm:flex">
-                <PageTitle className="flex items-center">
+        <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)}
-                    <Link className={buttonVariants({variant: "outline"})}
+          </div>
-                          href={`/dashboard/agents/${agent.id}/edit`}>
+          <div className="flex items-center gap-2 md:justify-between w-full ">
-                        <GearIcon className="w-7 h-7"/>
+            <div className="flex items-center gap-2">
-                    </Link>
+              <AgentDialog
-                </PageTitle>
+                agent={agent as AgentType & { id: string }}
-                <PageActions className="justify-between">
+                typeTrigger={"edit"}
+              />
+            </div>
+            <div className="flex items-center gap-2">
               <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"} />
-                </PageActions>
+            </div>
+          </div>
+        </PageTitle>
       </div>
 
       {agent.description && (
-                <PageDescription className="mt-5 sm:mt-0">{agent.description}</PageDescription>
+        <PageDescription className="mt-5 sm:mt-0">
+          {agent.description}
+        </PageDescription>
       )}
       <PageContent className="flex flex-col w-full h-full justify-between gap-6">
-                <AgentContentPage
+        <AgentContentPage agent={agent} edgeKey={edgeKey} />
-                    agent={agent}
-                    edgeKey={edgeKey}
-                />
       </PageContent>
     </Page>
-    )
+  );
 }

app/(customer)/dashboard/(admin)/agents/new/page.tsx

@@ -1,21 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {AgentForm} from "@/components/wrappers/dashboard/agent/agent-form/agent-form";
-import {Metadata} from "next";
-
-export const metadata: Metadata = {
-    title: "Create Agent",
-};
-
-export default async function RoutePage(props: PageParams<{}>) {
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Create new agent</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <AgentForm/>
-            </PageContent>
-        </Page>
-    );
-}

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

@@ -1,15 +1,13 @@
 import {PageParams} from "@/types/next";
 import {AgentCard} from "@/components/wrappers/dashboard/agent/agent-card/agent-card";
 import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {Button} from "@/components/ui/button";
-import Link from "next/link";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
 import {desc, eq, not} from "drizzle-orm";
-import {EmptyStatePlaceholder} from "@/components/wrappers/common/empty-state-placeholder";
 import {Metadata} from "next";
+import {AgentDialog} from "@/features/agents/components/agent.dialog";
 
 export const metadata: Metadata = {
     title: "Agents",
@@ -22,10 +20,9 @@ export default async function RoutePage(props: PageParams<{}>) {
         with: {
             databases: true
         },
-        orderBy: (fields) => desc(fields.createdAt),
+        orderBy: (fields) => desc(fields.lastContact),
     });
 
-
     if (!agents) {
         notFound();
     }
@@ -36,9 +33,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 <PageTitle>Agents</PageTitle>
                 {agents.length > 0 && (
                     <PageActions>
-                        <Link href={"/dashboard/agents/new"}>
+                         <AgentDialog typeTrigger={"create"} />
-                            <Button>+ Create Agent</Button>
-                        </Link>
                     </PageActions>
                 )}
             </PageHeader>
@@ -46,10 +41,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 {agents.length > 0 ? (
                     <CardsWithPagination data={agents} cardItem={AgentCard} cardsPerPage={4} numberOfColumns={1}/>
                 ) : (
-                    <EmptyStatePlaceholder
+                     <AgentDialog typeTrigger="empty"/>
-                        url={"/dashboard/agents/new"}
-                        text={"Create new Agent"}
-                    />
                 )}
             </PageContent>
         </Page>

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

@@ -1,13 +1,12 @@
 import {PageParams} from "@/types/next";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {Metadata} from "next";
-import {
-    NotificationChannelsSection
-} from "@/components/wrappers/dashboard/admin/notifications/channels/notification-channels-section";
 import {db} from "@/db";
-import {notificationChannel, NotificationChannel, NotificationChannelWith} from "@/db/schema/09_notification-channel";
+import {notificationChannel, NotificationChannelWith} from "@/db/schema/09_notification-channel";
-import {NotifierAddEditModal} from "@/components/wrappers/dashboard/common/notifier/notifier-add-edit-modal";
 import {desc, isNull} from "drizzle-orm";
+import {ChannelsSection} from "@/components/wrappers/dashboard/admin/channels/channels-section";
+import {ChannelAddEditModal} from "@/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal";
+import * as drizzleDb from "@/db";
 
 export const metadata: Metadata = {
     title: "Notification Channels",
@@ -19,6 +18,7 @@ export default async function RoutePage(props: PageParams<{}>) {
         with: {
             organizations: true
         },
+        where: isNull(drizzleDb.schemas.notificationChannel.organizationId),
         orderBy: desc(notificationChannel.createdAt)
     }) as NotificationChannelWith[]
 
@@ -35,11 +35,12 @@ 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>
         </Page>
     );

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

@@ -0,0 +1,50 @@
+import {PageParams} from "@/types/next";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Metadata} from "next";
+import {ChannelsSection} from "@/components/wrappers/dashboard/admin/channels/channels-section";
+import {db} from "@/db";
+import {desc, eq, isNull} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {StorageChannelWith} from "@/db/schema/12_storage-channel";
+import {ChannelAddEditModal} from "@/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal";
+
+export const metadata: Metadata = {
+    title: "Storage Channels",
+};
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const storageChannels = await db.query.storageChannel.findMany({
+        with: {
+            organizations: true
+        },
+        where: isNull(drizzleDb.schemas.storageChannel.organizationId),
+        orderBy: desc(drizzleDb.schemas.storageChannel.createdAt)
+    }) as StorageChannelWith[]
+
+    const organizations = await db.query.organization.findMany({
+        where: (fields) => isNull(fields.deletedAt),
+        with: {
+            members: true,
+        },
+    });
+
+    const settings = await db.query.setting.findFirst({
+        where: eq(drizzleDb.schemas.setting.name, "system"),
+    });
+
+
+    return (
+        <Page>
+            <PageHeader>
+                <PageTitle>Storage channels</PageTitle>
+                <PageActions>
+                    <ChannelAddEditModal kind={"storage"} adminView={false}/>
+                </PageActions>
+            </PageHeader>
+            <PageContent>
+                <ChannelsSection defaultStorageChannelId={settings?.defaultStorageChannelId} kind={"storage"} organizations={organizations} channels={storageChannels}/>
+            </PageContent>
+        </Page>
+    );
+}

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,20 +1,14 @@
 import {PageParams} from "@/types/next";
 import {notFound, redirect} from "next/navigation";
-import {Page, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
+import {Page} from "@/features/layout/page";
-import {BackupButton} from "@/components/wrappers/dashboard/backup/backup-button/backup-button";
-import {DatabaseTabs} from "@/components/wrappers/dashboard/projects/database/database-tabs";
-import {DatabaseKpi} from "@/components/wrappers/dashboard/projects/database/database-kpi";
-import {CronButton} from "@/components/wrappers/dashboard/database/cron-button/cron-button";
 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 {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
-import {capitalizeFirstLetter} from "@/utils/text";
+import {DatabaseContent} from "@/components/wrappers/dashboard/projects/database/database-content";
-import {AlertPolicyModal} from "@/components/wrappers/dashboard/database/alert-policy/alert-policy-modal";
+import {getHealthLast12hLogs} from "@/db/services/healthcheck";
-import {getOrganizationChannels} from "@/db/services/notification-channel";
-import {ImportModal} from "@/components/wrappers/dashboard/database/import/import-modal";
 
 export default async function RoutePage(props: PageParams<{
     projectId: string;
@@ -39,7 +33,8 @@ export default async function RoutePage(props: PageParams<{
         with: {
             project: true,
             retentionPolicy: true,
-            alertPolicies: true
+            alertPolicies: true,
+            storagePolicies: true
         }
     });
 
@@ -51,6 +46,11 @@ export default async function RoutePage(props: PageParams<{
         where: eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
         with: {
             restorations: true,
+            storages: {
+                with: {
+                    storageChannel: true
+                }
+            }
         },
         orderBy: (b, {desc}) => [desc(b.createdAt)],
     });
@@ -60,7 +60,7 @@ export default async function RoutePage(props: PageParams<{
         orderBy: (r, {desc}) => [desc(r.createdAt)],
     });
 
-    const isAlreadyBackup = backups.some((b) => b.status === "waiting");
+    const isAlreadyBackup = backups.some((b) => b.status === "waiting" || b.status === "ongoing");
     const isAlreadyRestore = restorations.some((r) => r.status === "waiting");
 
     const totalBackups = await db.select({count: drizzleDb.schemas.backup.id})
@@ -84,8 +84,8 @@ export default async function RoutePage(props: PageParams<{
         notFound();
     }
 
-    const organizationChannels = await getOrganizationChannels(organization.id);
+    const databaseHealthLogs = dbItem ? await getHealthLast12hLogs({ id: dbItem.id }) : []
-    const activeOrganizationChannels = organizationChannels.filter(channel => channel.enabled);
+
 
     const successRate = totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null;
 
@@ -93,44 +93,23 @@ export default async function RoutePage(props: PageParams<{
 
     return (
         <Page>
-
+            <BackupModalProvider>
-            <div className="justify-between gap-2 sm:flex">
+                <DatabaseContent
-                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+                    activeMember={activeMember}
-                    <div className="min-w-full md:min-w-fit ">
+                    settings={settings}
-                        {capitalizeFirstLetter(dbItem.name)}
+                    database={dbItem}
-                    </div>
+                    databaseHealthLogs={databaseHealthLogs}
-                    {!isMember && (
-                        <div className="flex items-center gap-2 md:justify-between w-full ">
-                            <div className="flex items-center gap-2">
-                                {/* Do not delete*/}
-                                {/*<EditButton/>*/}
-                                <RetentionPolicySheet database={dbItem}/>
-                                <CronButton database={dbItem}/>
-                                <AlertPolicyModal database={dbItem} notificationChannels={activeOrganizationChannels}
-                                                  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}/>
-                <DatabaseTabs activeMember={activeMember} settings={settings} database={dbItem}
                     isAlreadyRestore={isAlreadyRestore}
+                    restorations={restorations}
                     backups={backups}
-                              restorations={restorations}/>
+                    totalBackups={totalBackups}
-            </PageContent>
+                    availableBackups={availableBackups}
+                    successRate={successRate}
+                    organizationId={organization.id}
+                    activeOrganizationChannels={[]}
+                    activeOrganizationStorageChannels={[]}
+                />
+            </BackupModalProvider>
         </Page>
     );
 }

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

@@ -1,65 +0,0 @@
-import {notFound} from "next/navigation";
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectForm} from "@/components/wrappers/dashboard/projects/project-form/project-form";
-import * as drizzleDb from "@/db";
-
-import {db} from "@/db";
-import {eq} from "drizzle-orm";
-import {DatabaseWith} from "@/db/schema/07_database";
-
-export default async function RoutePage(props: PageParams<{ projectId: string }>) {
-    const {projectId} = await props.params;
-
-    const proj = await db.query.project.findFirst({
-        where: eq(drizzleDb.schemas.project.id, projectId),
-        with: {
-            databases: true,
-        },
-    });
-
-    if (!proj) {
-        notFound();
-    }
-
-
-    const org = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.slug, "default"),
-    });
-
-    if (!org) {
-        notFound();
-    }
-
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {or, eq, isNull}) => or(isNull(db.projectId), eq(db.projectId, proj.id)),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    )
-        // .filter((db) => db.project !== null) as DatabaseWith[];
-
-
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Edit {proj.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <ProjectForm
-                    organization={org}
-                    databases={availableDatabases as DatabaseWith[]}
-                    defaultValues={{...proj, databases: proj.databases.map((db) => db.id)}}
-                    projectId={proj.id}
-                />
-            </PageContent>
-        </Page>
-    );
-}

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

@@ -1,8 +1,5 @@
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
+import {Page, PageContent, PageTitle} from "@/features/layout/page";
-import {buttonVariants} from "@/components/ui/button";
-import {GearIcon} from "@radix-ui/react-icons";
-import Link from "next/link";
 import {
     ButtonDeleteProject
 } from "@/components/wrappers/dashboard/projects/button-delete-project/button-delete-project";
@@ -15,6 +12,11 @@ import {eq} from "drizzle-orm";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
 import * as drizzleDb from "@/db";
 import {capitalizeFirstLetter} from "@/utils/text";
+import {ProjectDialog} from "@/features/projects/components/project.dialog";
+import {DatabaseWith} from "@/db/schema/07_database";
+import {ProjectWith} from "@/db/schema/06_project";
+import {isUuidv4} from "@/utils/verify-uuid";
+
 
 export default async function RoutePage(props: PageParams<{
     projectId: string
@@ -23,6 +25,10 @@ export default async function RoutePage(props: PageParams<{
         projectId
     } = await props.params;
 
+    if (!isUuidv4(projectId)) {
+        notFound()
+    }
+
     const organization = await getOrganization({});
     const activeMember = await getActiveMember()
 
@@ -50,27 +56,45 @@ export default async function RoutePage(props: PageParams<{
         redirect("/dashboard/projects");
     }
 
+    const availableDatabases = (
+        await db.query.database.findMany({
+            where: (db, {or, eq, isNull}) => or(isNull(db.projectId), eq(db.projectId, proj.id)),
+            with: {
+                agent: true,
+                project: true,
+                backups: true,
+                restorations: true,
+            },
+            orderBy: (db, {desc}) => [desc(db.createdAt)],
+        })
+    ) as DatabaseWith[];
+
     const isMember = activeMember?.role === "member";
 
     return (
         <Page>
             <div className="justify-between gap-2 sm:flex">
-                <PageTitle className="flex items-center">
+                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+                    <div className="min-w-full md:min-w-fit ">
                         {capitalizeFirstLetter(proj.name)}
+                    </div>
                     {!isMember && (
-                        <Link className={buttonVariants({variant: "outline"})}
+                        <div className="flex items-center gap-2 md:justify-between w-full ">
-                              href={`/dashboard/projects/${proj.id}/edit`}>
+                            <div className="flex items-center gap-2">
-                            <GearIcon className="w-7 h-7"/>
+                                <ProjectDialog
-                        </Link>
+                                    databases={availableDatabases}
+                                    organization={org}
+                                    project={proj as ProjectWith}
+                                    isEdit={true}
+                                />
+                            </div>
+                            <div className="flex items-center gap-2">
+                                <ButtonDeleteProject projectId={projectId} text={"Delete Project"}/>
+                            </div>
+                        </div>
                     )}
                 </PageTitle>
-                {!isMember && (
-                    <PageActions className="justify-between">
-                        <ButtonDeleteProject projectId={projectId} text={"Delete Project"}/>
-                    </PageActions>
-                )}
             </div>
-            <PageDescription>The list of associated databases</PageDescription>
             <PageContent className="flex flex-col w-full h-full">
                 {proj.databases.length > 0 ? (
                     <CardsWithPagination

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

@@ -1,50 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectForm} from "@/components/wrappers/dashboard/projects/project-form/project-form";
-import {notFound} from "next/navigation";
-import {db} from "@/db";
-import {eq} from "drizzle-orm";
-import {getOrganization} from "@/lib/auth/auth";
-import * as drizzleDb from "@/db";
-import {DatabaseWith} from "@/db/schema/07_database";
-
-
-export default async function RoutePage(props: PageParams<{}>) {
-
-    const organization = await getOrganization({});
-
-    if (!organization) {
-        notFound();
-    }
-
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {isNull}) => isNull(db.projectId),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    ).filter((db) => db.project == null) as DatabaseWith[];
-
-    const org = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.slug, organization.slug),
-    });
-
-    if (!org) notFound();
-
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Create new project</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <ProjectForm databases={availableDatabases} organization={org}/>
-            </PageContent>
-        </Page>
-    );
-}

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

@@ -1,8 +1,5 @@
-import Link from "next/link";
-
 import {PageParams} from "@/types/next";
 import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {Button} from "@/components/ui/button";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
 import {ProjectCard} from "@/components/wrappers/dashboard/projects/project-card/project-card";
 import {db} from "@/db";
@@ -10,6 +7,8 @@ import {notFound} from "next/navigation";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
 import {EmptyStatePlaceholder} from "@/components/wrappers/common/empty-state-placeholder";
 import {Metadata} from "next";
+import {ProjectDialog} from "@/features/projects/components/project.dialog";
+import {DatabaseWith} from "@/db/schema/07_database";
 
 export const metadata: Metadata = {
     title: "Projects",
@@ -36,6 +35,19 @@ export default async function RoutePage(props: PageParams<{}>) {
     });
     const isMember = activeMember?.role === "member";
 
+    const availableDatabases = (
+        await db.query.database.findMany({
+            where: (db, {isNull}) => isNull(db.projectId),
+            with: {
+                agent: true,
+                project: true,
+                backups: true,
+                restorations: true,
+            },
+            orderBy: (db, {desc}) => [desc(db.createdAt)],
+        })
+    ).filter((db) => db.project == null) as DatabaseWith[];
+
 
     return (
         <Page>
@@ -43,9 +55,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 <PageTitle>Projects</PageTitle>
                 {(projects.length > 0 && !isMember) && (
                     <PageActions>
-                        <Link href={`/dashboard/projects/new`}>
+                        <ProjectDialog databases={availableDatabases} organization={organization}/>
-                            <Button>+ Create Project</Button>
-                        </Link>
                     </PageActions>
                 )}
             </PageHeader>
@@ -56,13 +66,13 @@ export default async function RoutePage(props: PageParams<{}>) {
                         organizationSlug={organization.slug}
                         data={projects}
                         cardItem={ProjectCard}
-                        cardsPerPage={6}
+                        cardsPerPage={9}
                         numberOfColumns={3}
                     />
                 ) : isMember ? (
                     <EmptyStatePlaceholder text="No project available"/>
                 ) : (
-                    <EmptyStatePlaceholder url="/dashboard/projects/new" text="Create new Project"/>
+                    <ProjectDialog databases={availableDatabases} organization={organization} isEmpty={true}/>
                 )}
             </PageContent>
         </Page>

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

@@ -1,37 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {notFound} from "next/navigation";
-import {OrganizationForm} from "@/components/wrappers/dashboard/organization/organization-form/organization-form";
-import {getOrganization} from "@/lib/auth/auth";
-import {db} from "@/db";
-import {isNull} from "drizzle-orm";
-import {currentUser} from "@/lib/auth/current-user";
-
-export default async function RoutePage(props: PageParams<{
-
-}>) {
-    const user = await currentUser();
-
-    const organization = await getOrganization({});
-
-    const users = await db.query.user.findMany({
-        where: (fields) => isNull(fields.deletedAt)
-    });
-
-    if (!user || !users || !organization || organization.slug == "default") {
-        notFound();
-    }
-
-    return(
-        <Page>
-            <PageHeader>
-                <PageTitle>
-                    Edit {organization.name}
-                </PageTitle>
-            </PageHeader>
-            <PageContent>
-                <OrganizationForm currentUser={user} users={users} defaultValues={organization}/>
-            </PageContent>
-        </Page>
-    )
-}

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

@@ -1,16 +1,25 @@
 import { PageParams } from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+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 {
-    DeleteOrganizationButton
-} from "@/components/wrappers/dashboard/organization/delete-organization/delete-organization-button";
-import {EditButtonSettings} from "@/components/wrappers/dashboard/settings/edit-button-settings/edit-button-settings";
 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";
 
 export const metadata: Metadata = {
   title: "Settings",
@@ -19,40 +28,68 @@ export const metadata: Metadata = {
 export default async function RoutePage(props: PageParams<{ slug: string }>) {
   const organization = await getOrganization({});
   const user = await currentUser();
-    const activeMember = await getActiveMember()
+  const activeMember = await getActiveMember();
 
-    if (!organization || !activeMember) {
+  if (!organization || !activeMember || !user) {
     notFound();
   }
 
-    const notificationChannels = await getOrganizationChannels(organization.id)
+  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 organizationWithMembers = await db.query.organization.findFirst({
+    where: eq(drizzleDb.schemas.organization.id, organization.id),
+    with: {
+      members: {
+        with: {
+          user: true,
+        },
+      },
+    },
+  });
+
+  if (!organizationWithMembers) notFound();
 
   return (
     <Page>
       <PageHeader>
-                <PageTitle className="flex items-center">
+        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-                    Organization settings
+          <div className="min-w-full md:min-w-fit ">Organization settings</div>
-                    {permissions.canManageSettings && organization.slug !== "default" && (
+          <div className="flex items-center gap-2 md:justify-between w-full ">
-                        <EditButtonSettings/>
+            <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>
-
-                <PageActions>
-                    {permissions.canManageDangerZone && organization.slug !== "default" && (
-                        <DeleteOrganizationButton organizationSlug={organization.slug}/>
-                    )}
-                </PageActions>
       </PageHeader>
       <PageContent>
         <OrganizationTabs
           activeMember={activeMember}
           organization={organization}
           notificationChannels={notificationChannels}
+          storageChannels={storageChannels}
         />
       </PageContent>
     </Page>
-    )
+  );
 }

app/(customer)/dashboard/layout.tsx

@@ -1,4 +1,4 @@
-import React, {ReactNode} from "react";
+import { ReactNode } from "react";
 import { redirect } from "next/navigation";
 
 import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";

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

@@ -1,56 +1,54 @@
-import fs from "node:fs";
+import {NextResponse} from "next/server";
-import forge from "node-forge";
+import {eq} from "drizzle-orm";
-import {EventPayload} from "@/features/notifications/types";
+import {db} from "@/db";
-import {dispatchNotification} from "@/features/notifications/dispatch";
+import * as drizzleDb from "@/db";
-import {Database, DatabaseWith} from "@/db/schema/07_database";
+import {logger} from "@/lib/logger";
 
+const log = logger.child({module: "api/agent/backup/helpers"});
 
-export async function decryptedDump(file: File, aesKeyHex: string, ivHex: string, fileExtension: string): Promise<File> {
+export function withAgentCheck(handler: Function) {
-    const privateKeyPem = fs.readFileSync("private/keys/server_private.pem", "utf8");
+    return async (request: Request, context: { params: Promise<{ agentId: string }> }) => {
-    const privateKey = forge.pki.privateKeyFromPem(privateKeyPem);
+        try {
+            const agentId = (await context.params).agentId;
 
-    // Decrypt AES key with RSA-OAEP
+            const agent = await db.query.agent.findFirst({
-    const encryptedAesKey = forge.util.hexToBytes(aesKeyHex);
+                where: eq(drizzleDb.schemas.agent.id, agentId),
-    const aesKey = privateKey.decrypt(encryptedAesKey, "RSA-OAEP", {
-        md: forge.md.sha256.create(),
-        mgf1: {md: forge.md.sha256.create()},
             });
 
-    // Read encrypted file content
+            if (!agent) {
-    const encryptedBuffer = Buffer.from(await file.arrayBuffer());
+                return NextResponse.json(
-    const iv = forge.util.hexToBytes(ivHex);
+                    {error: "Agent not found"},
-
+                    {status: 404}
-    // 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");
-    }
-
-    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"}
                 );
             }
 
-
+            return handler(request, {...context, agent});
-export function getFileExtension(dbType: string) {
+        } catch (err) {
-    switch (dbType) {
+            log.error({error: err, name: "withAgentCheck"}, "Error in agent middleware");
-        case "postgresql":
+            return NextResponse.json(
-            return ".dump";
+                {error: "Internal server error"},
-        case "mysql":
+                {status: 500}
-            return ".sql";
+            );
-        default:
-            return ".dump";
         }
+    };
 }
 
+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
+        }
+    });
 
+    if (!database) {
+        throw NextResponse.json(
+            {error: "Database associated with generatedId not found"},
+            {status: 404}
+        );
+    }
+
+    return database;
+}

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

@@ -1,75 +1,50 @@
 import {NextResponse} from "next/server";
-import {isUuidv4} from "@/utils/verify-uuid";
-import {uploadLocalPrivate, uploadS3Private} from "@/features/upload/private/upload.action";
-import {v4 as uuidv4} from "uuid";
-import {eventEmitter} from "../../../events/route";
-import * as drizzleDb from "@/db";
-import {db} from "@/db";
-import {Backup} from "@/db/schema/07_database";
 import {and, eq} from "drizzle-orm";
-import {env} from "@/env.mjs";
+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 {eventEmitter} from "@/features/shared/event";
 import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
+import {EventKind} from "@/features/notifications/types";
+import {logger} from "@/lib/logger";
 
-export async function POST(
+const log = logger.child({module: "api/agent/backup/route"});
-    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");
+        const body: BodyPost = await request.json();
-
+        const method = body.method
-        if (!contentType || !contentType.includes("multipart/form-data")) {
+        const database = await getDatabaseOrThrow(body.generatedId);
-            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
-            }
-        });
-
-        if (!database) {
-            return NextResponse.json(
-                {error: "Database associated with generatedId not found"},
-                {status: 404}
-            );
-        }
 
         let backup: Backup | null | undefined = null;
 
         if (method === "automatic") {
+
+            const ongoingBackup = await db.query.backup.findFirst({
+                where: and(
+                    eq(drizzleDb.schemas.backup.status, 'ongoing'),
+                    eq(drizzleDb.schemas.backup.databaseId, database.id),
+                ),
+            });
+
+            if (!ongoingBackup) {
                 [backup] = await db
                     .insert(drizzleDb.schemas.backup)
                     .values({
@@ -77,14 +52,18 @@ export async function POST(
                         databaseId: database.id,
                     })
                     .returning();
-
-
                 if (!backup) {
                     return NextResponse.json(
                         {error: "Unable to create an automatic backup"},
                         {status: 500}
                     );
                 }
+            } else {
+                return NextResponse.json(
+                    {error: "A backup is already ongoing"},
+                    {status: 500}
+                );
+            }
         } else {
             backup = await db.query.backup.findFirst({
                 where: and(
@@ -93,7 +72,6 @@ export async function POST(
                 ),
             });
 
-
             if (!backup) {
                 return NextResponse.json(
                     {error: "Unable to find the corresponding backup"},
@@ -102,94 +80,75 @@ 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});
-            }
-
-
-            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 [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
-            if (!settings) {
-                throw new Error("System settings not found.");
-            }
-
-            let success: boolean, message: string, filePath: string;
-
-            const result =
-                settings.storage === "local"
-                    ? await uploadLocalPrivate(fileName, buffer)
-                    : await uploadS3Private(`${database.project?.slug}/${fileName}`, buffer, env.S3_BUCKET_NAME!);
-
-            ({success, message, filePath} = result);
-
-            if (!success) {
-                return NextResponse.json(
-                    {error: message},
-                    {status: 500}
-                );
-            }
-
-            await db
-                .update(drizzleDb.schemas.backup)
-                .set(withUpdatedAt({
-                    file: fileName,
-                    fileSize: fileSizeBytes,
-                    status: 'success',
-                }))
-                .where(eq(drizzleDb.schemas.backup.id, backup.id));
-
         eventEmitter.emit('modification', {update: true});
 
-            await sendNotificationsBackupRestore(database, "success_backup");
-
         return NextResponse.json(
             {
-                    message: "Backup successfully uploaded",
+                message: "Init backup success",
+                backup: backup,
             },
             {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}
-            );
-        }
     } catch (error) {
-        console.error("Error in POST handler:", error);
+        log.error({error: error}, "Error in POST for INIT backup");
         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();
+        log.info({data: body}, "Body from PATH in backup route");
+
+        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) {
+        log.error({error: error}, "Error in PATCH backup")
+        return NextResponse.json(
+            {error: "Internal server error"},
+            {status: 500}
+        );
+    }
+});
+

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

@@ -0,0 +1,79 @@
+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";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/backup/upload/init"});
+
+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();
+
+        log.info({data: body}, "Body for backup upload init");
+
+        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) {
+        log.error({error: error}, "Error in POST for INIT backup");
+        return NextResponse.json(
+            {error: "Internal server error"},
+            {status: 500}
+        );
+    }
+});
+

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

@@ -0,0 +1,97 @@
+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";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/backup/upload/status"});
+
+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;
+
+        log.info({data: body}, "Body for backup upload status");
+
+        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) {
+        log.error({error: error},"Error in POST for INIT backup");
+        return NextResponse.json(
+            {error: "Internal server error"},
+            {status: 500}
+        );
+    }
+});
+

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

@@ -1,10 +1,12 @@
 import {NextResponse} from "next/server";
 import {isUuidv4} from "@/utils/verify-uuid";
-import {eventEmitter} from "../../../events/route";
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {and, eq} from "drizzle-orm";
 import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/restore"});
 
 export type BodyResultRestore = {
     generatedId: string
@@ -19,7 +21,6 @@ export async function POST(
 ) {
 
     try {
-        eventEmitter.emit('modification', {update: true});
 
         const agentId = (await params).agentId
         const body: BodyResultRestore = await request.json();
@@ -64,19 +65,16 @@ export async function POST(
             .set({status: body.status as RestorationStatus})
             .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
 
-
+        await sendNotificationsBackupRestore(database, body.status == "failed" ? "error_restore" : "success_restore");
-        await sendNotificationsBackupRestore(database, body.status == "error" ? "error_restore" : "success_restore");
 
         const response = {
-            message: true,
+            status: true,
-            details: "Restoration successfully updated"
+            message: "Restoration successfully updated"
         }
 
-        eventEmitter.emit('modification', {update: true});
-
         return Response.json(response, {status: 200})
     } catch (error) {
-        console.error('Error in POST handler:', error);
+        log.error({error: error}, "Error in POST handler")
         return NextResponse.json(
             {error: 'Internal server error'},
             {status: 500}

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

@@ -1,24 +1,28 @@
 import {NextResponse} from "next/server";
 import {Body} from "./route";
 import {isUuidv4} from "@/utils/verify-uuid";
-import {getFileUrlPresignedLocal, getFileUrlPreSignedS3Action} from "@/features/upload/private/upload.action";
 import {Agent} from "@/db/schema/08_agent";
-import {Database} from "@/db/schema/07_database";
+import {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} from "drizzle-orm";
+import {and, eq, inArray} from "drizzle-orm";
-import {EDbmsSchema} from "@/db/schema/types";
+import {dbmsEnumSchema, EDbmsSchema} from "@/db/schema/types";
-import {ServerActionResult} from "@/types/action-type";
-import {SafeActionResult} from "next-safe-action";
-import {ZodString} from "zod";
 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";
+import {logger} from "@/lib/logger";
 
-export async function handleDatabases(body: Body, agent: Agent, lastContact: Date) {
+const log = logger.child({module: "api/agent/status/helpers"});
+
+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,
@@ -27,6 +31,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
             restore: {
                 action: restoreAction,
                 file: UrlBackup,
+                metaFile: urlMeta
             },
         },
     });
@@ -34,12 +39,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)) {
@@ -48,6 +57,12 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                     {status: 500}
                 );
             }
+
+            if (!dbmsEnumSchema.safeParse(db.dbms).success) {
+                log.error({name: "handleDatabases"},`Database type not available: ${db.dbms}`);
+                continue;
+            }
+
             const [databaseCreated] = await dbClient
                 .insert(drizzleDb.schemas.database)
                 .values({
@@ -55,12 +70,27 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                     name: db.name,
                     dbms: db.dbms as EDbmsSchema,
                     agentDatabaseId: db.generatedId,
-                    lastContact: lastContact,
+                    lastContact: db.pingStatus ? lastContact : null,
+                    healthErrorCount: null
                 })
                 .returning();
 
+
             if (databaseCreated) {
-                databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup));
+
+
+                await dbClient
+                    .insert(drizzleDb.schemas.healthcheckLog)
+                    .values({
+                        kind: "database",
+                        status: db.pingStatus ? "success" : "failed",
+                        objectId: databaseCreated.id,
+                        date: lastContact
+                    })
+
+                const storages = await getDatabaseStorageChannels(databaseCreated.id)
+
+                databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null));
             }
         } else {
 
@@ -69,101 +99,177 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 .set(withUpdatedAt({
                     name: db.name,
                     agentId: agent.id,
-                    lastContact: lastContact
+                    dbms: db.dbms as EDbmsSchema,
+                    lastContact: db.pingStatus ? lastContact : existingDatabase.lastContact,
+                    healthErrorCount: db.pingStatus ? null : existingDatabase.healthErrorCount,
                 }))
                 .where(eq(drizzleDb.schemas.database.id, existingDatabase.id))
                 .returning();
 
 
-            const backup = await dbClient.query.backup.findFirst({
+            await dbClient
-                where: and(eq(drizzleDb.schemas.backup.databaseId, databaseUpdated.id), eq(drizzleDb.schemas.backup.status, "waiting"))
+                .insert(drizzleDb.schemas.healthcheckLog)
+                .values({
+                    kind: "database",
+                    status: db.pingStatus ? "success" : "failed",
+                    objectId: databaseUpdated.id,
+                    date: lastContact
                 })
 
 
+            const activeBackup = await dbClient.query.backup.findFirst({
+                where: and(
+                    eq(drizzleDb.schemas.backup.databaseId, databaseUpdated.id),
+                    inArray(drizzleDb.schemas.backup.status, ["waiting", "ongoing"])
+                )
+            })
+
             const restoration = await dbClient.query.restoration.findFirst({
-                where: and(eq(drizzleDb.schemas.restoration.databaseId, databaseUpdated.id), eq(drizzleDb.schemas.restoration.status, "waiting"))
+                where: and(eq(drizzleDb.schemas.restoration.databaseId, databaseUpdated.id), eq(drizzleDb.schemas.restoration.status, "waiting")),
+                with: {
+                    backupStorage: true
+                }
             })
 
-
+            if (activeBackup && activeBackup.status == "waiting") {
-            if (backup) {
                 backupAction = true
 
                 await dbClient
                     .update(drizzleDb.schemas.backup)
                     .set(withUpdatedAt({status: "ongoing"}))
-                    .where(eq(drizzleDb.schemas.backup.id, backup.id));
+                    .where(eq(drizzleDb.schemas.backup.id, activeBackup.id));
             }
 
             if (restoration) {
                 restoreAction = true
 
-
+                if (!restoration.backupStorage || restoration.backupStorage.status != "success" || !restoration.backupStorage.path) {
-                const backupToRestore = await dbClient.query.backup.findFirst({
+                    restoreAction = false
-                    where: eq(drizzleDb.schemas.backup.id, restoration.backupId),
+                    continue;
-                    with: {
-                        database: {
-                            with: {
-                                project: true
-                            }
-                        }
-                    }
-                })
-
-                const [settings] = await dbClient.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
-                if (!settings) {
-                    return NextResponse.json(
-                        {error: "Unable to find settings"},
-                        {status: 500}
-                    );
                 }
 
+                const input: StorageInput = {
+                    action: "get",
+                    data: {
+                        path: restoration.backupStorage.path,
+                        signedUrl: true,
+                    },
+                    metadata: {
+                        storageId: restoration.backupStorage.storageChannelId,
+                        fileKind: "backups"
+                    }
+                };
 
-                const fileName = backupToRestore?.file
+                const inputMeta: StorageInput = {
+                    action: "get",
+                    data: {
+                        path: `${restoration.backupStorage.path}.meta`,
+                        signedUrl: true,
+                    },
+                    metadata: {
+                        storageId: restoration.backupStorage.storageChannelId,
+                        fileKind: "backups"
+                    }
+                };
 
-                let data: SafeActionResult<string, ZodString, readonly [], {
-                    _errors?: string[] | undefined;
-                }, readonly [], ServerActionResult<string>, object> | undefined
 
                 try {
+                    const result = await dispatchStorage(input, undefined, restoration.backupStorage.storageChannelId);
+                    const resultMeta = await dispatchStorage(inputMeta, undefined, restoration.backupStorage.storageChannelId);
 
-                    if (settings.storage == "local") {
+                    if (result.success) {
-                        data = await getFileUrlPresignedLocal({fileName: fileName!})
+                        urlBackup = result.url ?? null;
-                    } else if (settings.storage == "s3") {
+                        urlMeta = resultMeta.url ?? null
-
-                        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 = "Failed to get backup URL";
-                        const errorMessage = data?.data?.actionError?.message || "Failed to get presigned URL";
+                        log.error({error: errorMessage, name: "handleDatabases"}, "Restoration failed");
-                        console.error("Restoration failed: ", errorMessage);
-
                         continue;
                     }
                 } catch (err) {
-                    console.error("Restoration crashed unexpectedly:", err);
+                    log.error({error: err, name: "handleDatabases"}, "Restoration crashed unexpectedly");
                     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

@@ -1,18 +1,22 @@
 import {NextResponse} from "next/server";
-import {getFileUrlPresignedLocal} from "@/features/upload/private/upload.action";
 import {handleDatabases} from "./helpers";
-import {eventEmitter} from "../../../events/route";
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {EDbmsSchema} from "@/db/schema/types";
 import {eq} from "drizzle-orm";
 import {isUuidv4} from "@/utils/verify-uuid";
 import {withUpdatedAt} from "@/db/utils";
+import {logger} from "@/lib/logger";
+
+
+const log = logger.child({module: "api/agent/status/route"});
+
 
 export type databaseAgent = {
     name: string,
     dbms: EDbmsSchema,
     generatedId: string
+    pingStatus: boolean
 }
 
 export type Body = {
@@ -20,13 +24,6 @@ export type Body = {
     databases: databaseAgent[]
 }
 
-// Function to test the get file url presigned local
-export async function GET(request: Request) {
-    const url = await getFileUrlPresignedLocal({fileName: "d4a7fa35-2506-4d01-a612-a8ef2e2cc1c5.dump"})
-    return Response.json({
-        message: url
-    })
-}
 
 export async function POST(
     request: Request,
@@ -34,13 +31,14 @@ export async function POST(
 ) {
     try {
         const agentId = (await params).agentId
+        log.info(`Agent ID: ${agentId}`)
         const body: Body = await request.json();
         const lastContact = new Date();
         let message: string
 
-
         if (!isUuidv4(agentId)) {
             message = "agentId is not a valid uuid"
+            log.error({error: message}, "An error occurred")
             return NextResponse.json(
                 {error: "agentId is not a valid uuid"},
                 {status: 500}
@@ -55,18 +53,31 @@ 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)
             .set(withUpdatedAt({
                 version: body.version,
-                lastContact: lastContact
+                lastContact: lastContact,
+                healthErrorCount: null
             }))
             .where(eq(drizzleDb.schemas.agent.id, agentId));
 
-        eventEmitter.emit('modification', {update: true});
+        await db
+            .insert(drizzleDb.schemas.healthcheckLog)
+            .values({
+                kind: "agent",
+                status: "success",
+                objectId: agentId,
+                date: lastContact
+            })
 
         const response = {
             agent: {
@@ -78,7 +89,7 @@ export async function POST(
 
         return Response.json(response)
     } catch (error) {
-        console.error('Error in POST handler:', error);
+        log.error({error: error}, "Error in POST handler")
         return NextResponse.json(
             {error: 'Internal server error'},
             {status: 500}

app/api/events/route.ts

@@ -1,9 +1,10 @@
-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";
+import {logger} from "@/lib/logger";
 
-export const eventEmitter = new EventEmitter();
+const log = logger.child({module: "api/events"});
 
 export async function GET(request: Request) {
 
@@ -18,18 +19,17 @@ export async function GET(request: Request) {
     return new Response(
         new ReadableStream({
             start(controller) {
-                console.log('Stream started');
+                log.info("Stream started");
                 const handleModification = (data: any) => {
-                    console.log('Modification event triggered:', data);
+                    log.info({data: data},"Modification event triggered");
                     controller.enqueue(`event: modification\n`);
                     controller.enqueue(`data: ${JSON.stringify(data)}\n\n`);
                 };
 
                 eventEmitter.on('modification', handleModification);
 
-                // Handle client disconnect
                 request.signal.addEventListener('abort', () => {
-                    console.log('Client disconnected');
+                    log.info("Client disconnected");
                     controller.close();
                     eventEmitter.off('modification', handleModification);
                 });

app/api/files/[fileName]/route.ts

@@ -1,60 +0,0 @@
-import * as fs from "node:fs";
-import {NextResponse} from "next/server";
-import path from "path";
-
-export async function GET(
-    request: Request,
-    {params}: { params: Promise<{ fileName: string }> }
-) {
-
-    const {searchParams} = new URL(request.url);
-    const token = searchParams.get('token');
-    const expires = searchParams.get('expires');
-    const fileName = (await params).fileName
-
-    const uploadsDir = "private/uploads/files/";
-    const uploadPath = path.join(uploadsDir, fileName);
-
-    const crypto = require('crypto');
-
-    let filePath = null;
-    if (fs.existsSync(uploadPath)) {
-        filePath = uploadPath;
-    } else {
-        return NextResponse.json({error: "File not found"}, {status: 404})
-    }
-
-    const expectedToken = crypto.createHash('sha256').update(`${fileName}${expires}`).digest('hex');
-    if (token !== expectedToken) {
-        return NextResponse.json(
-            {error: 'Invalid signed token'},
-            {status: 403}
-        );
-    }
-
-    const expiresAt = parseInt(expires!, 10);
-    if (Date.now() > expiresAt) {
-        return NextResponse.json(
-            {error: 'Signed token expired'},
-            {status: 403}
-        );
-    }
-
-    const fileStream = fs.createReadStream(filePath);
-    const stream = new ReadableStream({
-        start(controller) {
-            fileStream.on('data', (chunk) => controller.enqueue(chunk));
-            fileStream.on('end', () => controller.close());
-            fileStream.on('error', (err) => controller.error(err));
-        },
-    });
-
-    return new NextResponse(stream, {
-        headers: {
-            'Content-Disposition': `attachment; filename="${fileName}"`,
-            'Content-Type': 'application/octet-stream',
-        },
-    });
-}
-
-

app/api/files/backups/route.ts

@@ -0,0 +1,88 @@
+import {NextResponse} from "next/server";
+import path from "path";
+import type {StorageInput} from "@/features/storages/types";
+import {dispatchStorage} from "@/features/storages/dispatch";
+import {Readable} from "node:stream";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/files/backups"});
+
+export async function GET(
+    request: Request,
+) {
+
+    const {searchParams} = new URL(request.url);
+    const token = searchParams.get('token');
+    const expires = searchParams.get('expires');
+    const pathFromUrl = searchParams.get('path');
+    const storageId = searchParams.get('storageId');
+
+    if (!pathFromUrl || !storageId) {
+        return NextResponse.json({error: "Missing search params"}, {status: 404})
+    }
+
+    const input: StorageInput = {
+        action: "get",
+        data: {
+            path: pathFromUrl,
+            signedUrl: true,
+        },
+        metadata: {
+            storageId: storageId,
+            fileKind: "backups",
+        }
+    };
+
+    log.info({input: input}, "Dispatch Storage");
+
+    const result = await dispatchStorage(input, undefined, storageId);
+
+    if (!result.success) {
+        return NextResponse.json({error: "Enable to get file from provided storage channel, an error occurred !"})
+    }
+
+    const fileName = path.basename(pathFromUrl);
+
+    const crypto = require('crypto');
+    const expectedToken = crypto.createHash('sha256').update(`${fileName}${expires}`).digest('hex');
+    if (token !== expectedToken) {
+        return NextResponse.json(
+            {error: 'Invalid signed token'},
+            {status: 403}
+        );
+    }
+
+    const expiresAt = parseInt(expires!, 10);
+    if (Date.now() > expiresAt) {
+        return NextResponse.json(
+            {error: 'Signed token expired'},
+            {status: 403}
+        );
+    }
+
+    if (!result.file || !(result.file instanceof Readable)) {
+        return NextResponse.json(
+            {error: "Invalid file payload"},
+            {status: 500}
+        );
+    }
+
+    const fileStream = Readable.from(result.file as Readable);
+
+    const stream = new ReadableStream({
+        start(controller) {
+            fileStream.on('data', (chunk) => controller.enqueue(chunk));
+            fileStream.on('end', () => controller.close());
+            fileStream.on('error', (err) => controller.error(err));
+        },
+    });
+
+    return new NextResponse(stream, {
+        headers: {
+            'Content-Disposition': `attachment; filename="${fileName}"`,
+            'Content-Type': 'application/octet-stream',
+        },
+    });
+}
+
+

app/api/files/images/[fileName]/route.ts

@@ -0,0 +1,88 @@
+import {NextResponse} from "next/server";
+import {auth} from "@/lib/auth/auth";
+import {headers} from "next/headers";
+import {StorageInput} from "@/features/storages/types";
+import {dispatchStorage} from "@/features/storages/dispatch";
+import {Readable} from "node:stream";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/files/images"});
+
+export async function GET(
+    req: Request,
+    {params}: { params: Promise<{ fileName: string }> }
+) {
+    const {searchParams} = new URL(req.url);
+    const fileName = (await params).fileName;
+    const storageId = searchParams.get('storageId');
+
+    if (!fileName) return NextResponse.json({error: "Missing file parameter"}, {status: 400});
+
+    const session = await auth.api.getSession({headers: await headers()});
+    if (!session) return NextResponse.json({error: "Unauthorized"}, {status: 403});
+
+
+    if (!storageId) {
+        return NextResponse.json({error: "Missing storageId in search params"}, {status: 404})
+    }
+
+    const ext = fileName.split(".").pop()?.toLowerCase();
+    const contentType =
+        ext === "png"
+            ? "image/png"
+            : ext === "jpg" || ext === "jpeg"
+                ? "image/jpeg"
+                : ext === "gif"
+                    ? "image/gif"
+                    : ext === "webp"
+                        ? "image/webp"
+                        : "application/octet-stream";
+
+    try {
+
+        const path = `images/${fileName}`;
+
+        const input: StorageInput = {
+            action: "get",
+            data: {
+                path: path,
+            },
+            metadata: {
+                storageId: storageId,
+                fileKind: "images"
+            }
+        }
+
+        const result = await dispatchStorage(input, undefined, storageId);
+
+        if (!result.file || !(result.file instanceof Readable)) {
+            log.error({error: result}, `An error occurred while getting file`);
+            return NextResponse.json(
+                {error: "Invalid file payload"},
+                {status: 500}
+            );
+        }
+
+        const fileStream = Readable.from(result.file as Readable);
+
+        const stream = new ReadableStream({
+            start(controller) {
+                fileStream.on('data', (chunk) => controller.enqueue(chunk));
+                fileStream.on('end', () => controller.close());
+                fileStream.on('error', (err) => controller.error(err));
+            },
+        });
+
+        return new NextResponse(stream, {
+            headers: {
+                'Content-Disposition': `inline; filename="${fileName}"`,
+                "Cache-Control": "no-store",
+                "Content-Type": contentType,
+            },
+        });
+
+    } catch (err) {
+        log.error({error: err}, `Error streaming image`);
+        return NextResponse.json({error: "Error fetching file"}, {status: 500});
+    }
+}

app/api/google/drive/callback/route.ts

@@ -0,0 +1,23 @@
+export async function GET(request: Request) {
+    const url = new URL(request.url);
+    const code = url.searchParams.get("code");
+
+    const success = Boolean(code);
+
+    return new Response(
+        `
+        <!DOCTYPE html>
+        <html>
+            <body>
+                <h1>${success ? "Success" : "Failed"}</h1>
+            </body>
+        </html>
+        `,
+        {
+            status: success ? 200 : 400,
+            headers: {
+                "Content-Type": "text/html; charset=utf-8",
+            },
+        }
+    );
+}

app/api/images/[fileName]/route.ts

@@ -1,103 +0,0 @@
-import {NextResponse} from "next/server";
-import {auth} from "@/lib/auth/auth";
-import {headers} from "next/headers";
-import {checkFileExistsInBucket, getObjectFromClient} from "@/utils/s3-file-management";
-import {env} from "@/env.mjs";
-import * as stream from "node:stream";
-import path from "path";
-import {db} from "@/db";
-import * as drizzleDb from "@/db";
-import {eq} from "drizzle-orm";
-import fs from "fs/promises";
-
-function nodeStreamToWebStream(nodeStream: stream.Readable) {
-    return new ReadableStream({
-        start(controller) {
-            nodeStream.on("data", chunk => controller.enqueue(chunk));
-            nodeStream.on("end", () => controller.close());
-            nodeStream.on("error", err => controller.error(err));
-        },
-        cancel() {
-            nodeStream.destroy();
-        },
-    });
-}
-
-const privateS3ImageDir = "images/";
-
-
-export async function GET(
-    req: Request,
-    {params}: { params: Promise<{ fileName: string }> }
-) {
-    const fileName = (await params).fileName;
-    if (!fileName) return NextResponse.json({error: "Missing file parameter"}, {status: 400});
-
-    const session = await auth.api.getSession({headers: await headers()});
-    if (!session) return NextResponse.json({error: "Unauthorized"}, {status: 403});
-
-    const [settings] = await db
-        .select()
-        .from(drizzleDb.schemas.setting)
-        .where(eq(drizzleDb.schemas.setting.name, "system"))
-        .limit(1);
-
-    if (!settings) throw new Error("System settings not found.");
-
-    const storageType = settings.storage; // "local" or "s3"
-    const ext = fileName.split(".").pop()?.toLowerCase();
-    const contentType =
-        ext === "png"
-            ? "image/png"
-            : ext === "jpg" || ext === "jpeg"
-                ? "image/jpeg"
-                : ext === "gif"
-                    ? "image/gif"
-                    : ext === "webp"
-                        ? "image/webp"
-                        : "application/octet-stream";
-
-    try {
-        if (storageType === "local") {
-            const filePath = path.join(process.cwd(), "private/uploads/images", fileName);
-
-            try {
-                await fs.access(filePath);
-                const file = await fs.readFile(filePath);
-
-                return new NextResponse(file, {
-                    headers: {
-                        "Content-Type": contentType,
-                        "Cache-Control": "no-store",
-                        "Content-Disposition": `inline; filename="${fileName}"`,
-                    },
-                });
-            } catch {
-                // if not found locally, fallback to S3
-            }
-        }
-
-        const exists = await checkFileExistsInBucket({
-            bucketName: env.S3_BUCKET_NAME!,
-            fileName: `${privateS3ImageDir}${fileName}`,
-        });
-        if (!exists) return NextResponse.json({error: "File not found"}, {status: 404});
-
-        const nodeStream = await getObjectFromClient({
-            bucketName: env.S3_BUCKET_NAME!,
-            fileName: `${privateS3ImageDir}${fileName}`,
-        });
-        const webStream = nodeStreamToWebStream(nodeStream);
-
-        return new NextResponse(webStream, {
-            headers: {
-                "Content-Type": contentType,
-                "Cache-Control": "no-store",
-                "Content-Disposition": `inline; filename="${fileName}"`,
-            },
-        });
-    } catch (err) {
-        console.error("Error streaming image:", err);
-        return NextResponse.json({error: "Error fetching file"}, {status: 500});
-    }
-}

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";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/tus/hooks"});
+
+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];
+
+        log.info(`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(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) {
+        log.error({error: error},"TUS Hook error");
+        return NextResponse.json({error: "Internal server error"}, {status: 500});
+    }
+}

app/error/page.tsx

@@ -1,85 +1,33 @@
-// "use client"
+"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"
 
-import { useSearchParams } from "next/navigation"
+import { Loader2 } from "lucide-react";
-import React, { Suspense } from "react"
+import { useRouter, useSearchParams } from "next/navigation";
+import { useEffect } from "react";
+import { useSession } from "@/lib/auth/auth-client";
 
-enum Error {
+export default function ErrorPage() {
-    Configuration = "Configuration",
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const { data: session, isPending } = useSession();
+
+  useEffect(() => {
+    if (isPending) {
+      return;
     }
 
-const errorMap = {
+    const error = searchParams.get("error");
-    [Error.Configuration]: (
+    const params = new URLSearchParams();
-        <p>
+    if (error) {
-            There was a problem when trying to authenticate. Please contact us if this
+      params.set("error", error);
-            error persists. Unique error code:{" "}
-            <code className="rounded-sm bg-slate-100 p-1 text-xs">Configuration</code>
-        </p>
-    ),
     }
 
-function AuthErrorPageContent() {
+    const destination = session ? "/dashboard/home" : "/login";
-    const search = useSearchParams()
+    router.replace(`${destination}?${params.toString()}`);
-    const error = search.get("error") as Error
+  }, [isPending, session, router, searchParams]);
 
   return (
-        <div className="flex h-screen w-full flex-col items-center justify-center">
+    <div className="flex h-screen w-full items-center justify-center">
-            <a
+      <Loader2 className="h-8 w-8 animate-spin" />
-                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: oklch(0.704 0.191 47.132);
-    --primary-foreground: oklch(0.205 0 0);
+    --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,17 +1,17 @@
-import React from "react";
 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 { author, geistMono, poppins } from "@/fonts/fonts";
+import { cn } from "@/lib/utils";
+import { Providers } from "./providers";
 
-const title = process.env.PROJECT_NAME ?? "App Title";
+const title = process.env.PROJECT_NAME ?? "Portabase";
 
 export const metadata: Metadata = {
   title: {
     default: title,
-        template: `%s - ${title}`
+    template: `%s - ${title}`,
   },
   description: process.env.PROJECT_DESCRIPTION ?? undefined,
 };
@@ -21,17 +21,21 @@ export default async function RootLayout({
 }: 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")}>
+      <body
+        className={cn(
+          poppins.variable,
+          author.variable,
+          geistMono.variable,
+          "font-sans h-full",
+        )}
+      >
         <ConsoleSilencer />
-        <Providers>
+        <Providers>{children}</Providers>
-            {children}
-        </Providers>
       </body>
     </html>
   );

app/not-found.tsx

@@ -5,11 +5,15 @@ export default async function NotFound() {
     <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>
+          <h1 className="scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl">
-                    <p className="leading-7 [&:not(:first-child)]:mt-6">The content you are trying to view is not available.</p>
+            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,12 +1,12 @@
 "use client";
 
-import {PropsWithChildren, Suspense} from "react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import {ThemeProvider} from "@/features/theme/theme-provider";
+import { type PropsWithChildren, Suspense } from "react";
 
 import { Toaster } from "@/components/ui/sonner";
-import {QueryClient, QueryClientProvider} from "@tanstack/react-query";
+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();
@@ -14,15 +14,13 @@ const queryClient = new QueryClient();
 export const Providers = (props: ProviderProps) => {
   return (
     <Suspense fallback={null}>
-            <ThemeProvider
+      <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-                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:1.1.4-rc.2
+    image: portabase/portabase:1.7.1
     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

@@ -2,7 +2,7 @@ name: portabase-dev
 
 services:
   db:
-    image: postgres:16-alpine
+    image: postgres:17-alpine
     ports:
       - "5433:5432"
     volumes:
@@ -17,5 +17,20 @@ services:
       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,51 +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
+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/portabase.config.ts ./
 COPY --from=builder /app/drizzle.config.ts ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=1001:1001 /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+COPY --from=builder --chown=1001:1001 /app/.next/static ./.next/static
-COPY --chown=nextjs:nodejs src/db ./src/db
+COPY --chown=1001:1001 src/db ./src/db
+COPY --from=deps /app/node_modules ./node_modules
+
+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
 
+POSTGRES_BIN=$(ls -d /usr/lib/postgresql/*/bin | head -n 1)
 
-node server.js
+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;
+        }
+    }
+}

e2e/auth.spec.ts

@@ -0,0 +1,135 @@
+import {test, expect, Page} from '@playwright/test';
+
+
+type UserCredentials = {
+    username: string
+    email: string
+    password: string
+}
+
+
+const users: Record<string, UserCredentials> = {
+    admin: {username: 'Admin', email: 'admin@example.com', password: 'testPASS123456!'},
+    normal: {username: 'John Doe', email: 'john.doe@example.com', password: 'testPASS123456!'},
+}
+
+async function register(page: Page, name: string, email: string, password: string, confirmPassword: string) {
+    await page.locator('input[name="name"]').fill(name)
+    await page.locator('input[name="email"]').fill(email)
+    await page.locator('input[name="password"]').fill(password)
+    await page.locator('input[name="confirmPassword"]').fill(confirmPassword)
+
+    await page.click('button[type="submit"]')
+}
+
+async function login(page: Page, email: string, password: string) {
+    await page.locator('input[name="email"]').fill(email)
+    await page.locator('input[name="password"]').fill(password)
+
+    await page.locator('button:has-text("Login")').click()
+}
+
+async function logout() {
+    //TODO
+}
+
+test.describe.serial('User signup and login flows', () => {
+
+    test('Redirect to login if not connected', async ({page}) => {
+        await page.goto('/dashboard/projects');
+        await expect(page).toHaveURL("login?redirect=%2Fdashboard%2Fprojects");
+    });
+
+    test('Password too short', async ({page}) => {
+        await page.goto('')
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        let password = '123456'
+        await register(page, users["admin"].username, users["admin"].email, password, password)
+
+        const toast = page.locator('text=Must have at least 8 character')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Password too simple', async ({page}) => {
+        await page.goto('')
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        let password = '12345678'
+        await register(page, users["admin"].username, users["admin"].email, password, password)
+
+        const toast = page.locator('text=Your password must contain at least one uppercase letter, one lowercase letter, one number, and one special character.')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Password and confirm password mismatch', async ({page}) => {
+        await page.goto('/')
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        let password = 'testPASS123456!'
+        let confirmPassword = 'testPASS123456!!'
+        await register(page, users["admin"].username, users["admin"].email, password, confirmPassword)
+
+        const toast = page.locator('text=The passwords did not match')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Successful register for admin', async ({page}) => {
+        await page.goto('/')
+
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        await register(page, users["admin"].username, users["admin"].email, users["admin"].password, users["admin"].password)
+
+        await expect(page).toHaveURL('/login')
+    })
+
+    test('User already exists.', async ({page}) => {
+        await page.goto('/')
+
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        await register(page, users["admin"].username, users["admin"].email, users["admin"].password, users["admin"].password)
+
+        const toast = page.locator('text=User already exists. Use another email.')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Successful register for normal', async ({page}) => {
+        await page.goto('/')
+
+        await page.click('text=Sign up')
+        await expect(page).toHaveURL('/register')
+
+        await register(page, users["normal"].username, users["normal"].email, users["normal"].password, users["normal"].password)
+
+        await expect(page).toHaveURL('login')
+    })
+
+    test('Failed login because account not active', async ({page}) => {
+        await page.goto('/login')
+        await login(page, users["normal"].email, users["normal"].password)
+
+        const toast = page.locator('text=Your account is not active.')
+        await expect(toast).toBeVisible()
+    })
+
+    test('Successful login', async ({page}) => {
+        await page.goto('login')
+        await login(page, users["admin"].email, users["admin"].password)
+
+        await expect(page).toHaveURL('/dashboard/home')
+    })
+
+})
+
+
+// test('Successful logout', async ({page}) => {
+//     await logout()
+//     await expect(page).toHaveURL('/login')
+// })

helm/.helmignore

@@ -0,0 +1,17 @@
+.DS_Store
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+.project
+.idea/
+*.tmproj
+.vscode/

helm/Chart.yaml

@@ -0,0 +1,28 @@
+apiVersion: v2
+name: portabase
+description: Helm chart for Portabase
+type: application
+version: 0.0.0
+appVersion: "latest"
+keywords:
+  - postgresql
+  - mariadb
+  - mongodb
+  - mysql
+  - sqlite
+  - backup
+  - database
+  - restore
+home: https://github.com/Portabase/portabase
+
+sources:
+  - https://github.com/Portabase/portabase
+  - https://github.com/Portabase/portabase/tree/main/helm
+
+maintainers:
+  - name: Charles Gauthereau
+    url: https://github.com/RambokDev
+  - name: Killian Larcher
+    url: https://github.com/KillianLarcher
+
+icon: https://raw.githubusercontent.com/Portabase/portabase/main/.github/assets/logo.png

helm/README.md

@@ -0,0 +1,32 @@
+# Development Notes
+
+## Check that Kubernetes is reachable locally
+
+```bash
+kubectl get nodes
+```
+
+## Install the local Portabase Helm chart
+
+```bash
+helm install portabase . \
+--set project.secret=$(openssl rand -hex 32)
+```
+
+## Check the pods
+
+```bash
+kubectl get pods
+```
+
+## Check the services
+
+```bash
+kubectl get svc
+```
+
+## If the service type is ClusterIP, expose it locally using port forwarding:
+
+```bash
+kubectl port-forward svc/portabase 8887:80
+```

helm/templates/deployment.yaml

@@ -0,0 +1,33 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: portabase
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: portabase
+  template:
+    metadata:
+      labels:
+        app: portabase
+    spec:
+      containers:
+        - name: portabase
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          ports:
+            - containerPort: 80
+          env:
+            - name: TZ
+              value: {{ .Values.timezone }}
+            - name: PROJECT_URL
+              value: {{ .Values.project.url }}
+            - name: PROJECT_SECRET
+              value: {{ .Values.project.secret }}
+          volumeMounts:
+            - name: data
+              mountPath: /data
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+            claimName: portabase-data

helm/templates/pvc.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: portabase-data
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}

helm/templates/service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: portabase
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    app: portabase
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: 80
+      nodePort: {{ .Values.service.nodePort }}

helm/values.yaml

@@ -0,0 +1,47 @@
+image:
+  repository: portabase/portabase
+  tag: latest
+  pullPolicy: Always
+
+replicaCount: 1
+
+service:
+  type: ClusterIP
+  port: 80
+  targetPort: 80
+
+resources:
+  requests:
+    memory: "1Gi"
+    cpu: "1"
+  limits:
+    memory: "1Gi"
+    cpu: "1"
+
+timezone: Europe/Paris
+
+project:
+  url: http://localhost:8887
+  secret: "change_me_generate_secure_secret"
+
+persistence:
+  enabled: true
+  storageClassName: ""
+  accessMode: ReadWriteOnce
+  size: 10Gi
+  mountPath: /data
+
+ingress:
+  enabled: false
+  className: nginx
+  hosts:
+    - host: portabase.example.com
+      paths:
+        - path: /
+          pathType: Prefix
+  tls: []
+
+updateStrategy:
+  type: RollingUpdate
+  rollingUpdate:
+    partition: 0

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;
@@ -41,13 +43,26 @@ const nextConfig: NextConfig = {
     typescript: {
         ignoreBuildErrors: true,
     },
+    logging: {
+        browserToTerminal: false,
+    },
     experimental: {
         serverActions: {
             bodySizeLimit: "10gb",
         },
         proxyClientMaxBodySize: '10gb',
-
     },
+    async rewrites() {
+        if (!isDev) return [];
+
+        return [
+            {
+                source: "/tus/:path*",
+                destination: "http://localhost:1080/tus/:path*",
+            },
+        ];
+    },
+
     async headers() {
         return [
             {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "portabase",
-  "version": "1.1.10-rc.2",
+  "version": "1.9.4",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack -p 8887",
@@ -11,114 +11,128 @@
     "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",
+    "@better-auth/passkey": "^1.5.6",
-    "@radix-ui/react-accordion": "^1.2.10",
+    "@better-auth/sso": "^1.5.6",
-    "@radix-ui/react-alert-dialog": "^1.1.13",
+    "@hookform/resolvers": "^5.2.2",
-    "@radix-ui/react-aspect-ratio": "^1.1.6",
+    "@radix-ui/react-accordion": "^1.2.12",
-    "@radix-ui/react-avatar": "^1.1.9",
+    "@radix-ui/react-alert-dialog": "^1.1.15",
-    "@radix-ui/react-checkbox": "^1.3.1",
+    "@radix-ui/react-aspect-ratio": "^1.1.8",
-    "@radix-ui/react-collapsible": "^1.1.10",
+    "@radix-ui/react-avatar": "^1.1.11",
-    "@radix-ui/react-context-menu": "^2.2.14",
+    "@radix-ui/react-checkbox": "^1.3.3",
-    "@radix-ui/react-dialog": "^1.1.13",
+    "@radix-ui/react-collapsible": "^1.1.12",
-    "@radix-ui/react-dropdown-menu": "^2.1.14",
+    "@radix-ui/react-context-menu": "^2.2.16",
-    "@radix-ui/react-hover-card": "^1.1.13",
+    "@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-label": "^2.1.8",
-    "@radix-ui/react-menubar": "^1.1.14",
+    "@radix-ui/react-menubar": "^1.1.16",
-    "@radix-ui/react-navigation-menu": "^1.2.12",
+    "@radix-ui/react-navigation-menu": "^1.2.14",
-    "@radix-ui/react-popover": "^1.1.13",
+    "@radix-ui/react-popover": "^1.1.15",
-    "@radix-ui/react-progress": "^1.1.6",
+    "@radix-ui/react-progress": "^1.1.8",
-    "@radix-ui/react-radio-group": "^1.3.6",
+    "@radix-ui/react-radio-group": "^1.3.8",
-    "@radix-ui/react-scroll-area": "^1.2.8",
+    "@radix-ui/react-scroll-area": "^1.2.10",
-    "@radix-ui/react-select": "^2.2.4",
+    "@radix-ui/react-select": "^2.2.6",
-    "@radix-ui/react-separator": "^1.1.6",
+    "@radix-ui/react-separator": "^1.1.8",
-    "@radix-ui/react-slider": "^1.3.4",
+    "@radix-ui/react-slider": "^1.3.6",
-    "@radix-ui/react-slot": "^1.2.2",
+    "@radix-ui/react-slot": "^1.2.4",
-    "@radix-ui/react-switch": "^1.2.4",
+    "@radix-ui/react-switch": "^1.2.6",
-    "@radix-ui/react-tabs": "^1.1.11",
+    "@radix-ui/react-tabs": "^1.1.13",
-    "@radix-ui/react-toast": "^1.2.13",
+    "@radix-ui/react-toast": "^1.2.15",
-    "@radix-ui/react-toggle": "^1.1.8",
+    "@radix-ui/react-toggle": "^1.1.10",
-    "@radix-ui/react-toggle-group": "^1.1.9",
+    "@radix-ui/react-toggle-group": "^1.1.11",
-    "@radix-ui/react-tooltip": "^1.2.6",
+    "@radix-ui/react-tooltip": "^1.2.8",
     "@react-email/components": "^0.0.41",
-    "@t3-oss/env-nextjs": "^0.13.4",
+    "@t3-oss/env-nextjs": "^0.13.11",
-    "@tanstack/react-query": "^5.76.1",
+    "@tanstack/react-query": "^5.95.2",
     "@tanstack/react-table": "^8.21.3",
-    "@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.5.6",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
-    "dockerode": "^4.0.6",
+    "dockerode": "^4.0.10",
-    "dotenv": "^16.5.0",
+    "dotenv": "^16.6.1",
     "drizzle-orm": "^0.43.1",
     "drizzle-zod": "^0.7.1",
     "embla-carousel-react": "^8.6.0",
+    "googleapis": "^170.1.0",
     "input-otp": "^1.4.2",
     "lucide-react": "^0.553.0",
-    "minio": "^8.0.5",
+    "minio": "^8.0.7",
-    "motion": "^12.23.24",
+    "motion": "^12.38.0",
-    "next": "16.0.10",
+    "next": "16.2.1",
     "next-safe-action": "^7.10.8",
     "next-themes": "^0.4.6",
     "node-cron": "^4.2.1",
-    "node-forge": "^1.3.1",
+    "node-forge": "^1.4.0",
-    "nodemailer": "^7.0.3",
+    "nodemailer": "^7.0.13",
-    "npm-check-updates": "^18.0.1",
+    "npm-check-updates": "^18.3.1",
-    "pg": "^8.16.0",
+    "pg": "^8.20.0",
-    "react": "^19.2.0",
+    "pino": "^10.3.1",
+    "pino-pretty": "^13.1.3",
+    "prettier": "^3.8.1",
+    "react": "^19.2.4",
     "react-day-picker": "9.7.0",
-    "react-dom": "^19.2.0",
+    "react-dom": "^19.2.4",
-    "react-dropzone": "^14.3.8",
+    "react-dropzone": "^14.4.1",
-    "react-email": "^4.0.13",
+    "react-email": "^4.3.2",
-    "react-hook-form": "^7.56.3",
+    "react-hook-form": "^7.72.0",
     "react-qr-code": "^2.0.18",
-    "react-resizable-panels": "^3.0.2",
+    "react-resizable-panels": "^3.0.6",
-    "react-twc": "^1.4.2",
+    "react-twc": "^1.5.1",
     "react-use-measure": "^2.1.7",
-    "recharts": "^2.15.3",
+    "recharts": "^2.15.4",
-    "socket.io": "^4.8.1",
+    "sharp": "^0.34.5",
-    "socket.io-client": "^4.8.1",
+    "socket.io": "^4.8.3",
-    "sonner": "^2.0.3",
+    "socket.io-client": "^4.8.3",
-    "tailwind-merge": "^3.3.0",
+    "sonner": "^2.0.7",
+    "swiper": "^12.1.3",
+    "tailwind-merge": "^3.5.0",
     "uuid": "^11.1.0",
     "vaul": "^1.1.2",
-    "ws": "^8.18.2",
+    "ws": "^8.20.0",
-    "zod": "^3.24.4"
+    "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@iconify/react": "^6.0.0",
+    "@iconify/react": "^6.0.2",
+    "@playwright/test": "1.58.2",
     "@react-email/preview-server": "4.3.2",
-    "@react-email/render": "^2.0.1",
+    "@react-email/render": "^2.0.4",
-    "@tailwindcss/postcss": "^4.1.7",
+    "@release-it/bumper": "^7.0.5",
+    "@release-it/conventional-changelog": "^10.0.6",
+    "@tailwindcss/postcss": "^4.2.2",
     "@types/eslint-plugin-tailwindcss": "^3.17.0",
-    "@types/node": "^22.15.18",
+    "@types/node": "^22.19.15",
-    "@types/node-forge": "^1",
+    "@types/node-forge": "^1.3.14",
-    "@types/pg": "^8.15.2",
+    "@types/pg": "^8.20.0",
-    "@types/react": "^19.1.4",
+    "@types/react": "^19.2.14",
-    "@types/react-dom": "^19.1.5",
+    "@types/react-dom": "^19.2.3",
-    "@zenstackhq/openapi": "^2.14.2",
+    "@zenstackhq/openapi": "^2.22.1",
-    "@zenstackhq/tanstack-query": "^2.14.2",
+    "@zenstackhq/tanstack-query": "^2.22.2",
-    "baseline-browser-mapping": "^2.8.32",
+    "baseline-browser-mapping": "^2.10.12",
-    "drizzle-kit": "^0.31.1",
+    "drizzle-kit": "^0.31.10",
-    "eslint": "^9.39.0",
+    "esbuild": "^0.27.4",
-    "eslint-config-next": "^16.0.1",
+    "eslint": "^9.39.4",
-    "eslint-plugin-tailwindcss": "^3.18.0",
+    "eslint-config-next": "^16.2.1",
-    "framer-motion": "^12.24.7",
+    "eslint-plugin-tailwindcss": "^3.18.2",
-    "postcss": "^8.5.3",
+    "framer-motion": "^12.38.0",
-    "tailwindcss": "^4.1.7",
+    "postcss": "^8.5.8",
-    "tsx": "^4.19.4",
+    "release-it": "^19.2.4",
-    "tw-animate-css": "^1.2.9",
+    "tailwindcss": "^4.2.2",
-    "typescript": "^5.8.3",
+    "tsx": "^4.21.0",
+    "tw-animate-css": "^1.4.0",
+    "typescript": "^5.9.3",
     "zenstack": "2.14.2"
   },
-  "packageManager": "pnpm@10.27.0"
+  "packageManager": "pnpm@10.33.0"
 }

playwright.config.ts

@@ -0,0 +1,79 @@
+import { defineConfig, devices } from '@playwright/test';
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// import dotenv from 'dotenv';
+// import path from 'path';
+// dotenv.config({ path: path.resolve(__dirname, '.env') });
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: './e2e',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: 'html',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('')`. */
+    baseURL: process.env.PROJECT_URL,
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
+
+    /* Test against mobile viewports. */
+    {
+      name: 'Mobile Chrome',
+      use: { ...devices['Pixel 5'] },
+    },
+    {
+      name: 'Mobile Safari',
+      use: { ...devices['iPhone 12'] },
+    },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  // webServer: {
+  //   command: 'docker compose up -d && make up',
+  //   url: 'http://localhost:8887',
+  //   reuseExistingServer: !process.env.CI,
+  // },
+});

pnpm-workspace.yaml

@@ -1,2 +1,13 @@
 onlyBuiltDependencies:
+  - '@prisma/client'
+  - '@prisma/engines'
+  - argon2
+  - bcrypt
+  - cpu-features
+  - esbuild
+  - prisma
+  - protobufjs
+  - sharp
+  - ssh2
+  - unrs-resolver
   - zenstack

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

@@ -6,14 +6,16 @@ import {headers} from "next/headers";
 
 export async function proxy(request: NextRequest) {
   const url = request.nextUrl.clone();
-    const redirectUrl = encodeURIComponent(request.nextUrl.pathname)
+  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));
+      return NextResponse.redirect(
+        new URL(`/login?redirect=${redirectUrl}`, request.url),
+      );
     }
     if (session.user.banned) {
       await auth.api.signOut({ headers: await headers() });
@@ -21,7 +23,9 @@ export async function proxy(request: NextRequest) {
     }
     if (session.user.role === "pending") {
       await auth.api.signOut({ headers: await headers() });
-            return NextResponse.redirect(new URL(`/login?error=pending?redirect=${redirectUrl}`, request.url));
+      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));
@@ -36,10 +40,16 @@ export async function proxy(request: NextRequest) {
   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}), {
+      return new NextResponse(
+        JSON.stringify({
+          message: "This API route does not exist.",
+          status: 404,
+        }),
+        {
           status: 404,
           headers: { "Content-Type": "application/json" },
-            });
+        },
+      );
     }
   }
   try {
@@ -53,20 +63,19 @@ function checkRouteExists(pathname: string) {
   const routePatterns = [
     /^\/api\/agent\/[^/]+\/status\/?$/,
     /^\/api\/agent\/[^/]+\/backup\/?$/,
+    /^\/api\/agent\/[^/]+\/backup\/upload\/init\/?$/,
+    /^\/api\/agent\/[^/]+\/backup\/upload\/status\/?$/,
     /^\/api\/agent\/[^/]+\/restore\/?$/,
-        /^\/api\/files\/[^/]+\/?$/,
+    /^\/api\/files\/images\/[^/]+\/?$/,
-        /^\/api\/images\/[^/]+\/?$/,
+    /^\/api\/files\/backups\/?$/,
+    /^\/api\/tus\/hooks\/?$/,
     /^\/api\/events\/?$/,
-        /^\/api\/init\/?$/,
     /^\/api\/config\/?$/,
+    /^\/api\/google\/drive\/callback\/?$/,
   ];
   return routePatterns.some((pattern) => pattern.test(pathname));
 }
 
 export const config = {
-    matcher: [
+  matcher: ["/api/:path*", "/dashboard/:path*", "/dashboard"],
-        "/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!"

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>
 
+            {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/calendar.tsx

@@ -46,7 +46,9 @@ function Calendar({ className, classNames, showOutsideDays = true, ...props }: R
                 ...classNames,
             }}
             components={{
+                // @ts-ignore
                 IconLeft: ({ className, children: _children, ...props }) => <ChevronLeftIcon className={cn("size-4", className)} {...props} />,
+                // @ts-ignore
                 IconRight: ({ className, children: _children, ...props }) => <ChevronRightIcon className={cn("size-4", className)} {...props} />,
             }}
             {...props}